knify 1.8.54__tar.gz → 1.8.56__tar.gz

{knify-1.8.54 → knify-1.8.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: knify
-Version: 1.8.54
+Version: 1.8.56
 Summary: Development tools for python
 Home-page: https://github.com/qicongsheng/knify
 Author: qicongsheng

{knify-1.8.54 → knify-1.8.56}/knify/dateutil.py

@@ -18,15 +18,21 @@ def now_str(format: str = FORMAT_YYMMDDHMS) -> str:
     return date_to_str(now(), format)
 
 
-def date_to_str(date_obj: datetime, format: str = FORMAT_YYMMDDHMS) -> str:
+def date_to_str(date_obj: datetime, format: str = FORMAT_YYMMDDHMS):
+    if date_obj is None:
+        return None
     if type(date_obj) == datetime.timedelta:
         return (datetime.datetime(1970, 1, 1) + date_obj).strftime(format)
     return date_obj.strftime(format)
 
 
 def str_to_date(str_obj: str, format: str) -> datetime:
+    if str_obj is None:
+        return None
     return datetime.datetime.strptime(str_obj, format)
 
 
 def date_to_timestamp(date_obj: datetime):
+    if date_obj is None:
+        return None
     return time.mktime(date_obj.timetuple())

{knify-1.8.54 → knify-1.8.56}/knify/excelutil.py

@@ -5,6 +5,9 @@ from typing import Callable
 
 from openpyxl.reader.excel import load_workbook
 
+from . import listutil
+from . import objutil
+
 
 class Header:
     def __init__(self, index: int, name: str | None, transformer: Callable[[object], object] = None):
@@ -18,28 +21,28 @@ class HeaderBuilder:
         self.default_transformer = None
         self.headers = []
 
-    def set_default_transformer(self, transformer: Callable[[object], object] = None):
+    def set_default_transformer(self, transformer: Callable[[object], object] = None) -> object:
         self.default_transformer = transformer
         return self
 
-    def set_names(self, names: list[str] = None):
+    def set_names(self, names: list[str] = None) -> object:
         for index_, name in enumerate(names):
             self.headers.append(Header(index_, name, self.default_transformer))
         return self
 
-    def set_transformer(self, name: str, transformer: Callable[[object], object] = None):
+    def set_transformer(self, name: str, transformer: Callable[[object], object] = None) -> object:
         for header in self.headers:
             if name == header.name:
                 header.transformer = transformer
         return self
 
-    def append(self, index: int, name: str | None, transformer: Callable[[object], object] = None):
-        target_tindex = index if index is not None else len(self.headers)
-        target_transformer = transformer if transformer is not None else self.default_transformer
-        self.headers.append(Header(target_tindex, name, target_transformer))
+    def append(self, index: int, name: str | None, transformer: Callable[[object], object] = None) -> object:
+        target_index = objutil.default_if_none(index, len(self.headers))
+        target_transformer = objutil.default_if_none(transformer, self.default_transformer)
+        self.headers.append(Header(target_index, name, target_transformer))
         return self
 
-    def to_headers(self):
+    def to_headers(self) -> list[Header]:
         return self.headers
 
 
@@ -47,26 +50,31 @@ def read_excel(file_path: str, sheet: str | int | None = 0, headers: list[Header
     results = []
     workbook = load_workbook(filename=file_path)
     sheet_ = workbook[sheet] if isinstance(sheet, str) else workbook[workbook.sheetnames[sheet]]
-    headers_ = [cell.value for cell in sheet_[1]]
+    headers_ = [cell.value for cell in sheet_[start_row]]
     for row_idx, row in enumerate(sheet_.rows):
         if row_idx < start_row:
             continue
         result = {}
         for header_idx, header_ in enumerate(headers_):
             # 没有传入headers,使用默认header
-            if headers is None or len(headers) == 0:
+            if listutil.is_empty(headers):
                 result[header_] = row[header_idx].value
             # 传入了headers
             else:
-                target_headers = list(filter(lambda h_: h_.index == header_idx, headers))
-                header = target_headers[0] if target_headers is not None and len(target_headers) > 0 else None
+                header = listutil.find_first(list(filter(lambda h_: h_.index == header_idx, headers)))
                 if header is None:
                     continue
                 else:
-                    col_name = header.name if header.name is not None else header_
+                    col_name = objutil.default_if_none(header.name, header_)
                     cell_value = row[header_idx].value
                     cell_value = cell_value if header.transformer is None else header.transformer(row[header_idx].value)
                     result[col_name] = cell_value
-        if len(result.keys()) > 0:
+        if objutil.has_keys(result):
             results.append(result)
     return results
+
+
+def read_headers(file_path: str, sheet: str | int | None = 0, header_row: int = 0):
+    workbook = load_workbook(filename=file_path)
+    sheet_ = workbook[sheet] if isinstance(sheet, str) else workbook[workbook.sheetnames[sheet]]
+    return [cell.value for cell in sheet_[header_row + 1]]

{knify-1.8.54 → knify-1.8.56}/knify/help.py

@@ -8,7 +8,7 @@ def get_pip_name():
 
 
 def get_version():
-    return '1.8.54'
+    return '1.8.56'
 
 
 def print_version():

{knify-1.8.54 → knify-1.8.56}/knify/listutil.py

@@ -13,3 +13,7 @@ def is_empty(list_obj: list):
 
 def is_not_empty(list_obj: list):
     return list_obj is not None and len(list_obj) > 0
+
+
+def find_first(list_obj: list) -> object:
+    return list_obj[0] if list_obj is not None and len(list_obj) > 0 else None

{knify-1.8.54 → knify-1.8.56}/knify/objutil.py

@@ -5,3 +5,7 @@
 
 def default_if_none(obj: object, default_value: object) -> object:
     return default_value if obj is None or obj == '' else obj
+
+
+def has_keys(obj: object) -> bool:
+    return obj is not None and len(obj.keys()) > 0

{knify-1.8.54 → knify-1.8.56}/knify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: knify
-Version: 1.8.54
+Version: 1.8.56
 Summary: Development tools for python
 Home-page: https://github.com/qicongsheng/knify
 Author: qicongsheng