Reorder function implement, and remove duplicated functions

- Rename set_row_outline to set_row_outline_level
- Update unit tests for get_row_height

Author: xuri

excelize.py

@@ -779,7 +779,7 @@ def add_comment(self, sheet: str, opts: Comment) -> None:
 
     def add_form_control(self, sheet: str, opts: FormControl) -> None:
         """
-        Add form control button in a worksheet by given worksheet name and form
+        Add form control object in a worksheet by given worksheet name and form
         control options. Supported form control type: button, check box, group
         box, label, option button, scroll bar and spinner. If set macro for the
         form control, the workbook extension should be XLSM or XLTM. Scroll
@@ -1554,8 +1554,8 @@ def get_app_props(self) -> Optional[AppProperties]:
         Get document application properties.
 
         Returns:
-            Optional[AppProperties]: Return the the app properties if no
-            error occurred, otherwise raise a RuntimeError with the message.
+            Optional[AppProperties]: Return the app properties if no error
+            occurred, otherwise raise a RuntimeError with the message.
         """
         lib.GetAppProps.restype = types_go._GetAppPropsResult
         res = lib.GetAppProps(self.file_index)
@@ -1723,59 +1723,7 @@ def get_row_outline_level(self, sheet: str, row: int) -> int:
             ```
         """
         lib.GetRowOutlineLevel.restype = types_go._IntErrorResult
-        res = lib.GetRowOutlineLevel(
-            self.file_index, sheet.encode(ENCODE), row
-        )
-        err = res.err.decode(ENCODE)
-        if not err:
-            return res.val
-        raise RuntimeError(err)
-
-    def get_row_style(self, sheet: str, row: int) -> int:
-        """
-        Get row style ID by given worksheet name and row number.
-
-        Args:
-            sheet (str): The worksheet name
-            row (int): The row number
-
-        Returns:
-            int: Return the row style ID if no error occurred, otherwise
-            raise a RuntimeError with the message.
-        """
-        lib.GetRowStyle.restype = types_go._IntErrorResult
-        res = lib.GetRowStyle(self.file_index, sheet.encode(ENCODE), row)
-        err = res.err.decode(ENCODE)
-        if not err:
-            return res.val
-        raise RuntimeError(err)
-
-    def get_row_visible(self, sheet: str, row: int) -> bool:
-        """
-        Get visible of a single row by given worksheet name and row number.
-
-        Args:
-            sheet (str): The worksheet name
-            row (int): The row number
-
-        Returns:
-            bool: Return the row visible if no error occurred, otherwise
-            raise a RuntimeError with the message.
-
-        Example:
-            For example, get visible state of row 5 in Sheet1:
-
-            ```python
-            try:
-                visible = f.get_row_visible("Sheet1", 5)
-            except RuntimeError as err:
-                print(err)
-            ```
-        """
-        lib.GetRowVisible.restype = types_go._BoolErrorResult
-        res = lib.GetRowVisible(
-            self.file_index, sheet.encode(ENCODE), row
-        )
+        res = lib.GetRowOutlineLevel(self.file_index, sheet.encode(ENCODE), row)
         err = res.err.decode(ENCODE)
         if not err:
             return res.val
@@ -2086,7 +2034,7 @@ def get_sheet_map(self) -> Dict[int, str]:
         sheets ID, and name maps of the workbook.
 
         Returns:
-            dict[int, str]: Return the sheet ID and name map if no error
+            Dict[int, str]: Return the sheet ID and name map if no error
             occurred, otherwise return an empty dictionary.
         """
         lib.GetSheetMap.restype = types_go._GetSheetMapResult
@@ -3474,7 +3422,7 @@ def set_row_height(self, sheet: str, row: int, height: float) -> None:
         if err != "":
             raise RuntimeError(err)
 
-    def set_row_outline(self, sheet: str, row: int, level: int) -> None:
+    def set_row_outline_level(self, sheet: str, row: int, level: int) -> None:
         """
         Set outline level number of a single row by given worksheet name and
         Excel row number. The value of parameter 'level' is 1-7.
@@ -3493,7 +3441,7 @@ def set_row_outline(self, sheet: str, row: int, level: int) -> None:
 
             ```python
             try:
-                f.set_row_outline("Sheet1", 2, 1)
+                f.set_row_outline_level("Sheet1", 2, 1)
             except RuntimeError as err:
                 print(err)
             ```

main.go

@@ -524,7 +524,7 @@ func AddComment(idx int, sheet *C.char, opts *C.struct_Comment) *C.char {
 	return C.CString(emptyString)
 }
 
-// AddFormControl provides the method to add form control button in a worksheet
+// AddFormControl provides the method to add form control object in a worksheet
 // by given worksheet name and form control options. Supported form control
 // type: button, check box, group box, label, option button, scroll bar and
 // spinner. If set macro for the form control, the workbook extension should be
@@ -1126,70 +1126,6 @@ func GetCellValue(idx int, sheet, cell *C.char, opts *C.struct_Options) C.struct
 	return C.struct_StringErrorResult{val: C.CString(val), err: C.CString(emptyString)}
 }
 
-// GetRowOutlineLevel provides a function to get outline level of a single row by given
-// worksheet name and row number. This function is concurrency safe.
-//
-//export GetRowOutlineLevel
-func GetRowOutlineLevel(idx int, sheet *C.char, row C.int) C.struct_IntErrorResult {
-    f, ok := files.Load(idx)
-    if !ok {
-        return C.struct_IntErrorResult{val: C.int(0), err: C.CString(errFilePtr)}
-    }
-    val, err := f.(*excelize.File).GetRowOutlineLevel(C.GoString(sheet), int(row))
-    if err != nil {
-        return C.struct_IntErrorResult{val: C.int(int32(val)), err: C.CString(err.Error())}
-    }
-    return C.struct_IntErrorResult{val: C.int(int32(val)), err: C.CString(emptyString)}
-}
-
-// GetRowStyle provides a function to get row style ID by given worksheet
-// name and row number. This function is concurrency safe.
-//
-//export GetRowStyle
-func GetRowStyle(idx int, sheet *C.char, row C.int) C.struct_IntErrorResult {
-    f, ok := files.Load(idx)
-    if !ok {
-        return C.struct_IntErrorResult{val: C.int(0), err: C.CString(errFilePtr)}
-    }
-    val, err := f.(*excelize.File).GetRowStyle(C.GoString(sheet), int(row))
-    if err != nil {
-        return C.struct_IntErrorResult{val: C.int(val), err: C.CString(err.Error())}
-    }
-    return C.struct_IntErrorResult{val: C.int(val), err: C.CString(emptyString)}
-}
-
-// GetRowVisible provides a function to get visible of a single row by given
-// worksheet name and row number. This function is concurrency safe.
-//
-//export GetRowVisible
-func GetRowVisible(idx int, sheet *C.char, row C.int) C.struct_BoolErrorResult {
-    f, ok := files.Load(idx)
-    if !ok {
-        return C.struct_BoolErrorResult{val: C._Bool(false), err: C.CString(errFilePtr)}
-    }
-    val, err := f.(*excelize.File).GetRowVisible(C.GoString(sheet), int(row))
-    if err != nil {
-        return C.struct_BoolErrorResult{val: C._Bool(val), err: C.CString(err.Error())}
-    }
-    return C.struct_BoolErrorResult{val: C._Bool(val), err: C.CString(emptyString)}
-}
-
-// GetRowHeight provides a function to get row height by given worksheet name
-// and row number. This function is concurrency safe.
-//
-//export GetRowHeight
-func GetRowHeight(idx int, sheet *C.char, row C.int) C.struct_Float64ErrorResult {
-    f, ok := files.Load(idx)
-    if !ok {
-        return C.struct_Float64ErrorResult{val: C.double(0), err: C.CString(errFilePtr)}
-    }
-    val, err := f.(*excelize.File).GetRowHeight(C.GoString(sheet), int(row))
-    if err != nil {
-        return C.struct_Float64ErrorResult{val: C.double(val), err: C.CString(err.Error())}
-    }
-    return C.struct_Float64ErrorResult{val: C.double(val), err: C.CString(emptyString)}
-}
-
 // GetColOutlineLevel provides a function to get outline level of a single
 // column by given worksheet name and column name.
 //
@@ -1293,6 +1229,38 @@ func GetDefaultFont(idx int) C.struct_StringErrorResult {
 	return C.struct_StringErrorResult{val: C.CString(val), err: C.CString(emptyString)}
 }
 
+// GetRowHeight provides a function to get row height by given worksheet name
+// and row number.
+//
+//export GetRowHeight
+func GetRowHeight(idx int, sheet *C.char, row C.int) C.struct_Float64ErrorResult {
+	f, ok := files.Load(idx)
+	if !ok {
+		return C.struct_Float64ErrorResult{val: C.double(0), err: C.CString(errFilePtr)}
+	}
+	val, err := f.(*excelize.File).GetRowHeight(C.GoString(sheet), int(row))
+	if err != nil {
+		return C.struct_Float64ErrorResult{val: C.double(val), err: C.CString(err.Error())}
+	}
+	return C.struct_Float64ErrorResult{val: C.double(val), err: C.CString(emptyString)}
+}
+
+// GetRowOutlineLevel provides a function to get outline level of a single row
+// by given worksheet name and row number.
+//
+//export GetRowOutlineLevel
+func GetRowOutlineLevel(idx int, sheet *C.char, row C.int) C.struct_IntErrorResult {
+	f, ok := files.Load(idx)
+	if !ok {
+		return C.struct_IntErrorResult{val: C.int(0), err: C.CString(errFilePtr)}
+	}
+	val, err := f.(*excelize.File).GetRowOutlineLevel(C.GoString(sheet), int(row))
+	if err != nil {
+		return C.struct_IntErrorResult{val: C.int(int32(val)), err: C.CString(err.Error())}
+	}
+	return C.struct_IntErrorResult{val: C.int(int32(val)), err: C.CString(emptyString)}
+}
+
 // GetRowVisible provides a function to get visible of a single row by given
 // worksheet name and Excel row number.
 //

test_excelize.py

@@ -352,7 +352,7 @@ def test_style(self):
 
         self.assertIsNone(f.set_row_outline_level("Sheet1", 2, 1))
         with self.assertRaises(RuntimeError) as context:
-            f.set_row_outline("SheetN", 2, 1)
+            f.set_row_outline_level("SheetN", 2, 1)
         self.assertEqual(str(context.exception), "sheet SheetN does not exist")
         self.assertEqual(f.get_row_outline_level("Sheet1", 2), 1)
         with self.assertRaises(RuntimeError) as context:
@@ -1229,6 +1229,10 @@ def test_cell_hyperlink(self):
     def test_cell_rich_text(self):
         f = excelize.new_file()
         self.assertIsNone(f.set_row_height("Sheet1", 1, 35))
+        self.assertEqual(f.get_row_height("Sheet1", 1), 35)
+        with self.assertRaises(RuntimeError) as context:
+            f.get_row_height("SheetN", 1)
+        self.assertEqual(str(context.exception), "sheet SheetN does not exist")
 
         with self.assertRaises(RuntimeError) as context:
             f.set_row_height("Sheet1", 0, 35)