byzh-core 0.0.2.10__tar.gz → 0.0.2.12__tar.gz

{byzh_core-0.0.2.10 → byzh_core-0.0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: byzh_core
-Version: 0.0.2.10
+Version: 0.0.2.12
 Summary: byzh_core是byzh系列的核心库，包含了一些常用的工具函数和类。
 Author: byzh_rc
 License: MIT

{byzh_core-0.0.2.10 → byzh_core-0.0.2.12}/byzh_core/Barchive/archive.py

@@ -1,10 +1,12 @@
 import os
 import zipfile
+from pathlib import Path
+
 from ..Btqdm import B_Tqdm
 
 def b_archive_zip(
     source_path,
-    output_path,
+    output_path:str|Path=None,
     exclude_dirs:list[str]=None,
     exclude_files:list[str]=None,
     exclude_exts:list[str]=None,
@@ -13,21 +15,24 @@ def b_archive_zip(
 ):
     '''
     压缩文件夹，排除 指定文件夹and指定后缀文件
+
+    name代表前缀, ext代表后缀(包括.)
+
     :param source_path:
-    :param output_path:
+    :param output_path: 如果不传入, 则默认为source_path同名同路径的zip文件
     :param exclude_dirs: ['__pycache__', '.git', '.idea']
     :param exclude_files: ['.gitignore', 'README.md']
     :param exclude_exts: ['.csv', '.npy', '.pt', '.pth']
     :return:
     '''
-    if exclude_dirs is None:
-        exclude_dirs = []
-    if exclude_files is None:
-        exclude_files = []
-    if exclude_exts is None:
-        exclude_exts = []
-    if while_list is None:
-        while_list = []
+    output_path = source_path + '.zip' if output_path is None else output_path
+    def get_lst(lst):
+        return [] if lst is None else lst
+    exclude_dirs = get_lst(exclude_dirs)
+    exclude_files = get_lst(exclude_files)
+    exclude_exts = get_lst(exclude_exts)
+    while_list = get_lst(while_list)
+
 
     my_tqdm = B_Tqdm(prefix='Archive')
 
@@ -49,7 +54,6 @@ def b_archive_zip(
                 # 排除指定后缀文件files
                 files = [f for f in files if f in while_list or not any(f.endswith(ext) for ext in exclude_exts)]
 
-
                 # 压缩文件:
                 for file in files:
                     file_path = os.path.join(root, file)

{byzh_core-0.0.2.10 → byzh_core-0.0.2.12}/byzh_core/Bwriter/writer.py

@@ -5,6 +5,9 @@ import os
 
 from ..Bbasic import B_Color
 
+def color_wrap(string:str, color:B_Color):
+    return color.value + string + B_Color.RESET.value
+
 class B_Writer:
     def __init__(
         self,
@@ -22,7 +25,7 @@ class B_Writer:
         self.mode = mode
         self.time_file = time_file
 
-        self.color = color.value
+        self.color = color
 
         self.f = None
         self.setFile(self.path, self.mode, self.time_file)
@@ -66,9 +69,9 @@ class B_Writer:
             t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
 
         if color is None:
-            print(self.color + t + str(string) + B_Color.RESET.value)
+            print(color_wrap(t+str(string), self.color))
         else:
-            print(color.value + t + str(string) + B_Color.RESET.value)
+            print(color_wrap(t+str(string), color))
 
     def toFile(self, string:str, ifTime:bool=None):
         '''
@@ -82,7 +85,7 @@ class B_Writer:
         elif ifTime==True or self.time_file==True:
             t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
 
-        self.f.write(str(string+t))
+        self.f.write(str(t+string))
         self.f.write("\n")
         self.f.flush()
 

{byzh_core-0.0.2.10 → byzh_core-0.0.2.12}/byzh_core/__init__.py

@@ -2,4 +2,4 @@
 # class      以"B_"开头
 # function   以"b_"开头
 
-__version__ = '0.0.2.10'
+__version__ = '0.0.2.12'

{byzh_core-0.0.2.10 → byzh_core-0.0.2.12}/byzh_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: byzh_core
-Version: 0.0.2.10
+Version: 0.0.2.12
 Summary: byzh_core是byzh系列的核心库，包含了一些常用的工具函数和类。
 Author: byzh_rc
 License: MIT

{byzh_core-0.0.2.10 → byzh_core-0.0.2.12}/byzh_core.egg-info/SOURCES.txt

@@ -12,9 +12,6 @@ byzh_core/Barchive/__init__.py
 byzh_core/Barchive/archive.py
 byzh_core/Bbasic/__init__.py
 byzh_core/Bbasic/text_style.py
-byzh_core/Bmath/__init__.py
-byzh_core/Bmath/divides.py
-byzh_core/Bmath/get_norm.py
 byzh_core/Btable/__init__.py
 byzh_core/Btable/auto_table.py
 byzh_core/Bterminal/__init__.py

byzh_core-0.0.2.10/byzh_core/Bmath/__init__.py

@@ -1,4 +0,0 @@
-from .divides import b_divides
-from .get_norm import b_get_norm
-
-__all__ = ['b_divides', 'b_get_norm']

byzh_core-0.0.2.10/byzh_core/Bmath/divides.py

@@ -1,41 +0,0 @@
-from typing import Union, List, Set, Tuple
-
-my_type1 = Union[int, float, str]
-def get_num(num: my_type1):
-    if isinstance(num, str):
-        return float(num)
-    return num
-
-my_type2 = Union[my_type1, List[my_type1], Set[my_type1], Tuple[my_type1]]
-def b_divides(iterUp: my_type2, iterDown: my_type2):
-    """
-    支持list, tuple, set, 单个数\n
-    iterUp as 分子\n
-    iterDown as 分母
-    """
-    up = 1
-    down = 1
-
-    if not isinstance(iterUp, list) and not isinstance(iterUp, tuple) and not isinstance(iterUp, set):
-        up *= get_num(iterUp)
-    else:
-        for x in iterUp:
-            up *= get_num(x)
-
-    if not isinstance(iterDown, list) and not isinstance(iterDown, tuple) and not isinstance(iterDown, set):
-        down *= get_num(iterDown)
-    else:
-        for x in iterDown:
-            down *= get_num(x)
-
-    return up / down
-
-if __name__ == '__main__':
-    result = b_divides([1, 2, 3], [4, 5])
-    print(result)
-
-    result = b_divides(6.63e-34, (9.11e-31, 3e8))
-    print(result)
-
-    result = b_divides('6.63e-34', ['9.11e-31', 3e8])
-    print(result)

byzh_core-0.0.2.10/byzh_core/Bmath/get_norm.py

@@ -1,21 +0,0 @@
-from typing import Literal
-def b_get_norm(
-    lst: list,
-    mode: Literal['min-max'] = 'min-max',
-    ndigits: int | None = None
-) -> tuple[list, float, float]:
-
-    if mode =='min-max':
-        minimum = min(lst)
-        maximum = max(lst)
-        if ndigits is None:
-            result = [(x-minimum)/(maximum-minimum) for x in lst]
-        else:
-            result = [round((x-minimum)/(maximum-minimum), ndigits) for x in lst]
-        return (result, minimum, maximum)
-
-
-if __name__ == '__main__':
-    lst = [1, 2, 3, 4, 5]
-    result = b_get_norm(lst)
-    print(result)