byzh-core 0.0.2.11__py3-none-any.whl → 0.0.2.13__py3-none-any.whl

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,26 @@ def b_archive_zip(
 ):
     '''
     压缩文件夹，排除 指定文件夹and指定后缀文件
+
+    name代表前缀, ext代表后缀(包括.)
+
     :param source_path:
-    :param output_path:
-    :param exclude_dirs: ['__pycache__', '.git', '.idea']
-    :param exclude_files: ['.gitignore', 'README.md']
-    :param exclude_exts: ['.csv', '.npy', '.pt', '.pth']
+    :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']
+    :param while_list: 白名单-文件全名 >>> ['.gitignore', 'README.md']
+    :param contain_empty_folder: 是否包含空文件夹
     :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 +56,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/Bbasic/text_style.py

@@ -31,6 +31,7 @@ class B_Appearance(Enum):
 
     HIGHLIGHT = "\033[1m"  # 高亮
     LOWLIGHT = "\033[2m"   # 低亮
+    ITALIC = "\033[3m"     # 斜体
     UNDERLINE = "\033[4m"  # 下划线
     REVERSE = "\033[7m"    # 反显(白底黑字)
 
@@ -41,12 +42,13 @@ if __name__ == '__main__':
     print("\033[0m默认文字\033[0m")
     print("\033[1m高亮文字\033[0m")
     print("\033[2m低亮文字\033[0m")
-    # print("\033[3m无效文字\033[0m")
+    print("\033[3m斜体文字\033[0m") # 在某些终端中可能无效
     print("\033[4m下划线文字\033[0m")
-    print("\033[5m闪烁文字(无效)\033[0m")
-    # print("\033[6m无效文字\033[0m")
+    print("\033[5m闪烁文字\033[0m") # 在某些终端中可能无效
+    print("\033[6m快速闪烁文字\033[0m") # 在某些终端中可能无效
     print("\033[7m反显文字\033[0m")
     print("\033[8m消隐文字(无效)\033[0m")
+    # exit()
 
     print("\n\033[31;1m字体颜色\033[0m测试文字")
     print("\033[30m低亮黑色文字\033[0m\t\033[30;1m高亮黑色文字\033[0m")

byzh_core/Btqdm/__init__.py

@@ -1,4 +1,6 @@
 
-from .my_tqdm import B_Tqdm
+from .my_tqdm import B_Tqdm, B_Color, B_Appearance, B_Background
 
-__all__ = ['B_Tqdm']
+__all__ = [ 'B_Color', 'B_Appearance', 'B_Background',
+    'B_Tqdm'
+]

byzh_core/Btqdm/my_tqdm.py

@@ -2,7 +2,7 @@ import sys
 import time
 import threading
 
-from ..Bbasic import B_Color
+from ..Bbasic import B_Color, B_Appearance, B_Background
 
 
 class B_Tqdm:
@@ -39,8 +39,14 @@ class B_Tqdm:
         seconds = int(seconds % 60)
         return f'{minutes:02}:{seconds:02}'
 
-    def update(self, step=1, color=B_Color.BLUE, prefix=None, suffix=None):
+    def update(self, step=1, prefix=None, suffix=None, color:B_Color=B_Color.BLUE, appearance:B_Appearance=None, background:B_Background=None):
         with self._lock:
+            pre_show = color.value
+            if appearance is not None:
+                pre_show += appearance.value
+            if background is not None:
+                pre_show += background.value
+
             if self.current == 0:
                 self.start_time = time.time()
             if prefix is not None:
@@ -66,12 +72,12 @@ class B_Tqdm:
                 filled_length = int(self.length * self.current // self.total)
                 bar = self.fill * filled_length + '-' * (self.length - filled_length) * len(self.fill)
 
-                sys.stdout.write(f'\r{color}{self.prefix} |{bar}|'
+                sys.stdout.write(f'\r{pre_show}{self.prefix} |{bar}|'
                                  f' {self.current}/{self.total} -> {elapsed_str}<{estimated_str} | {speed:.1f} it/s |'
-                                 f' {self.suffix}{B_Color.RESET}')
+                                 f' {self.suffix}{B_Color.RESET.value}')
             else:
-                sys.stdout.write(f'\r{color}{self.prefix} | {self.current} iters -> {elapsed_str} | {speed:.1f} it/s |'
-                                 f' {self.suffix}{B_Color.RESET}')
+                sys.stdout.write(f'\r{pre_show}{self.prefix} | {self.current} iters -> {elapsed_str} | {speed:.1f} it/s |'
+                                 f' {self.suffix}{B_Color.RESET.value}')
             sys.stdout.flush()
 
             # 补回车

byzh_core/__init__.py

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

{byzh_core-0.0.2.11.dist-info → byzh_core-0.0.2.13.dist-info}/METADATA

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

{byzh_core-0.0.2.11.dist-info → byzh_core-0.0.2.13.dist-info}/RECORD

@@ -1,18 +1,15 @@
 byzh_core/B_os.py,sha256=-6KjK2NzEeF8GiQno0BmbVDei9DDxOaXdaKGqFeL_eY,2372
-byzh_core/__init__.py,sha256=ZId6-ESyPcPTcRPv9HPPO22SQwXjjgYlIrPQqB6TOEg,111
+byzh_core/__init__.py,sha256=3MQSx_FHA9m2ns8iWJvgFa0fodxgXK2zeOmKii0WeIU,111
 byzh_core/Barchive/__init__.py,sha256=wUdz646VS0Uhq9lwMkd3YQHCvQhLDqgADoDjFGMqIn0,65
-byzh_core/Barchive/archive.py,sha256=6uMoOs-lmdcezdOgXr4s9NmjHVRDvG4v_YGQhaPPyGo,2681
+byzh_core/Barchive/archive.py,sha256=sG9m1Hr-d2zxYVmzTVRNXX2U2T5baMYECZVqjt0k8pU,3157
 byzh_core/Bbasic/__init__.py,sha256=wr7Y7YJINhgpV5X6BT5DaGJKcHUOZYNerCGXoi2Egac,116
-byzh_core/Bbasic/text_style.py,sha256=waaj_DKg6eBEyM3kcdpPJtghLPIR171opIjx4rXrUus,3202
-byzh_core/Bmath/__init__.py,sha256=G3AQug6izkEX3UfzO_mqUNJW88ZKlmYb4Q8CAactK4w,105
-byzh_core/Bmath/divides.py,sha256=dr85IqGSE9NvugQu7az29GLcjRiLjXU_hZTwtNifIXg,1132
-byzh_core/Bmath/get_norm.py,sha256=y1QsCTo7qhtGTXIxpc6JtamLWloC7ENRuVdNtK5yi58,596
+byzh_core/Bbasic/text_style.py,sha256=34u2-Rsur63iNQ0m7tHxpFWqnQZWybSxBx7vnhOhqDo,3346
 byzh_core/Btable/__init__.py,sha256=NlQBjp_mvObEUm4y6wXbGipkNM2N3uNIUidaJkTwFsw,62
 byzh_core/Btable/auto_table.py,sha256=nc8RvF86laDnITAzX8sVj3l5tbIGflrsstIbSbGDaAI,14747
 byzh_core/Bterminal/__init__.py,sha256=B6p6mHVhi5LAHKlvqfrv20E6XNqUsfU2xD753V6-Zf4,83
 byzh_core/Bterminal/cmd.py,sha256=iK0fwI0D3peEwUYYZWwnl9X8ImFfrBsEq6ySd3DcRdE,3839
-byzh_core/Btqdm/__init__.py,sha256=PQRcUn9WXd1YGyFMEKnJU74mdV695_8NHQ56Nsja0DM,53
-byzh_core/Btqdm/my_tqdm.py,sha256=myyFo3GgyX_wWfSjMWfSTkcnTECf1tqwpXEFpJkzNtw,2878
+byzh_core/Btqdm/__init__.py,sha256=G8pvJYizvdTUI3Xw-yELXY7BbjTghCXJLdqUuDoRNZA,141
+byzh_core/Btqdm/my_tqdm.py,sha256=OIlT01P6g-rDyDt6wlX9lORAUux9x-LA6EZRGQyJaXU,3202
 byzh_core/Bwriter/__init__.py,sha256=QcHzKs0305Pr78ZvZgcC_4miSYZh8jJQDt5TD0GIeEg,82
 byzh_core/Bwriter/writer.py,sha256=kSfIyGdx-XGoV1TBUY6f7NoFL_40fTx9ISTT8Fic0yE,3167
 byzh_core/obsolete/__init__.py,sha256=wpfHMPD4awPRDJVYlaiGtkkpjq2srWB7d7LrWhoX5R0,161
@@ -21,8 +18,8 @@ byzh_core/obsolete/row_table.py,sha256=rIX0-Yvb3RnO0RJBkA4m18gux1zYSnEKTy6uQGcWi
 byzh_core/obsolete/xy_table.py,sha256=-KHK8EUlkJj3Rh0sp_KHI0QFt29AlMASMmR8q8ykUBM,6784
 byzh_core/obsolete/Bconfig/__init__.py,sha256=7lAp7wNetW0AyJcike7ekdY_8wrQQtFjBsi6684t_lU,54
 byzh_core/obsolete/Bconfig/config.py,sha256=TD8CC1P2Zu95Tf8AGK2IHRXjrCCMBA_tdoZsc1Rr0Gk,10953
-byzh_core-0.0.2.11.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
-byzh_core-0.0.2.11.dist-info/METADATA,sha256=YnqgjGFeI4EquXuRCVUsjD9zSsSeUK3RzLayda7hpBg,372
-byzh_core-0.0.2.11.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-byzh_core-0.0.2.11.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
-byzh_core-0.0.2.11.dist-info/RECORD,,
+byzh_core-0.0.2.13.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
+byzh_core-0.0.2.13.dist-info/METADATA,sha256=3zXlKKCBBEzdMdoI6-WVmgqsnZ7UqAaB5lzqjjy1ZqM,372
+byzh_core-0.0.2.13.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+byzh_core-0.0.2.13.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
+byzh_core-0.0.2.13.dist-info/RECORD,,

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/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/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)