byzh-core 0.0.2.5__py3-none-any.whl → 0.0.2.7__py3-none-any.whl

byzh_core/B_os.py

@@ -58,29 +58,35 @@ def rm(path):
     if os.path.isfile(path):
         os.remove(path)
 
-def get_dirpaths_in_dir(root_dir_path, unwanted_dirname=['__pycache__']):
+
+def get_dirpaths_in_dir(root_dir_path, exclude_dir=['__pycache__', '.git']):
     result = []
     for root, dirs, files in os.walk(root_dir_path):
+        for i, dir in enumerate(dirs):
+            if str(dir) in exclude_dir:
+                dirs.pop(i)
         path = Path(root)
-        if path.name in unwanted_dirname:
-            continue
         result.append(path)
 
     result = result[1:]
 
     return result
 
-def get_filepaths_in_dir(root_dir_path, unwanted_name=[], unwanted_suffix=['.pyc']):
+def get_filepaths_in_dir(root_dir_path, exclude_name=[], exclude_suffix=['.pyc'], exclude_dir=['.git']):
     file_paths = []
     for root, dirs, files in os.walk(root_dir_path):
+        for i, dir in enumerate(dirs):
+            if str(dir) in exclude_dir:
+                dirs.pop(i)
         for file in files:
             file_path = os.path.join(root, file)
             file_path = Path(file_path)
-            if file_path.name in unwanted_name or file_path.suffix in unwanted_suffix:
+            if file_path.name in exclude_name or file_path.suffix in exclude_suffix:
                 continue
             file_paths.append(file_path)
     return file_paths
 
 if __name__ == '__main__':
-    print(get_dirpaths_in_dir(r'E:\byzh_workingplace\byzh-rc-to-pypi\uploadToPypi_core\byzh_core'))
-    print(get_filepaths_in_dir(r'E:\byzh_workingplace\byzh-rc-to-pypi\uploadToPypi_core\byzh_core'))
+    # print(get_dirpaths_in_dir(r'E:\byzh_workingplace\byzh-rc-to-pypi'))
+    a = get_filepaths_in_dir(r'E:\byzh_workingplace\byzh-rc-to-pypi')
+    print(a)

byzh_core/Barchive/archive.py

@@ -1,5 +1,6 @@
 import os
 import zipfile
+from ..Btqdm import B_Tqdm
 
 def b_archive_zip(
     source_path,
@@ -28,11 +29,14 @@ def b_archive_zip(
     if while_list is None:
         while_list = []
 
+    my_tqdm = B_Tqdm(prefix='Archive')
+
     with zipfile.ZipFile(output_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
         # 压缩文件:
         if os.path.isfile(source_path):
             arcname = os.path.basename(source_path)
             zipf.write(source_path, arcname)
+            my_tqdm.update(1)
             return
 
         # 压缩文件夹:
@@ -52,15 +56,18 @@ def b_archive_zip(
                     arcname = os.path.relpath(file_path, source_path) # 相对于source_path的相对路径
                     zipf.write(file_path, arcname)
 
+                    my_tqdm.update(1)
+
                 # 若是空文件夹，则压缩文件夹:
                 if contain_empty_folder and (len(dirs) == 0 and len(files) == 0):
                     arcname = os.path.relpath(root, source_path)
                     folder_path = root
                     zipf.write(folder_path, arcname)
+                    my_tqdm.update(1)
 
 if __name__ == '__main__':
     b_archive_zip(
-        source_path=r'E:\byzh_workingplace\byzh-rc-to-pypi\awa',
+        source_path=r'E:\byzh_workingplace\byzh-rc-to-pypi\mnist',
         output_path=r'E:\byzh_workingplace\byzh-rc-to-pypi\awaqwq.zip',
         exclude_dirs=['__pycache__', 'com'],
         exclude_exts=['.ppt']

byzh_core/Bconfig/config.py

@@ -251,8 +251,8 @@ class B_Config:
                         self.dict_lst[i][key] = value
 
     def to_table(self, path):
-        from ..Btable import B_AutoTable
-        my_table = B_AutoTable()
+        from ..Btable import B_Table2d
+        my_table = B_Table2d()
         for index, group in enumerate(self.group_lst):
             for key, value in self.dict_lst[index].items():
                 my_table[group][key] = value

byzh_core/Btable/auto_table.py

@@ -60,7 +60,7 @@ class Matrix2d:
     def __init__(self, row_name='x', col_name='y'):
         self.row_name = row_name
         self.col_name = col_name
-        self.matrix = [[row_name + ' | ' + col_name]]
+        self.matrix = [[row_name + ' \\ ' + col_name]]
 
     def get_rows(self): # 包含left_upper
         if self.matrix == [[]]:
@@ -151,9 +151,14 @@ class Dict1d:
 
     def __getitem__(self, key):
         key = str(key)
-        return self.dict[key]
+        try:
+            return self.dict[key]
+        except KeyError:
+            return None
     def __setitem__(self, key, value): # 用于最底层赋值
         key, value = str(key), str(value)
+        if value == 'None':
+            value = ' '
         self.dict[key] = value
     def set(self, key, value): # 用于非底层赋值（防止把子dict变为str）
         key = str(key)
@@ -214,6 +219,26 @@ class B_Table2d:
         # 判断是否改变
         self.is_changed = False
 
+    def set(self, row, col, content):
+        row, col, content = str(row), str(col), str(content)
+        self[row][col] = content
+
+    def get_str(self, row, col):
+        return self[row][col]
+    def get_int(self, row, col):
+        return int(self[row][col])
+    def get_float(self, row, col):
+        return float(self[row][col])
+    def get_bool(self, row, col):
+        '''
+        如果是字符串"True"或"1"，返回True，否则返回False
+        '''
+        temp = self[row][col]
+        if temp == "True" or temp == "1":
+            return True
+        else:
+            return False
+
     def __getitem__(self, row):
         self.is_changed = True
 
@@ -226,13 +251,19 @@ class B_Table2d:
         row = str(row)
         self.dict2d[row] = new_dict
 
-    def from_txt(self, txt_path, use_txt_name:bool=False):
+    def from_txt(self, txt_path, create:bool=False, use_txt_name:bool=False):
         '''
-
         :param txt_path:
+        :param create: 如果文件不存在，则创建
         :param use_txt_name: 默认使用init时的row_name和col_name
         :return:
         '''
+        if not os.path.exists(txt_path):
+            if create:
+                self.to_txt(txt_path)
+            else:
+                raise FileNotFoundError(f"文件不存在: {txt_path}")
+
         with open(txt_path, 'r', encoding='utf-8') as f:
             lines = f.readlines()
         matrix, row_name, col_name = strs2matrix(lines)
@@ -297,6 +328,51 @@ class B_Table2d:
     def to_str(self):
         return '\n'.join(self.to_strs())
 
+    def to_ini(self, path):
+        '''
+        输出为ini格式
+        :param path:
+        :return:
+        '''
+        if self.is_changed:
+            self.__dict2matrix()
+
+        groups = self.matrix2d.get_rows()[1:]
+        keys = self.matrix2d.get_cols()[1:]
+        with open(path, 'w', encoding='utf-8') as f:
+            for i, group in enumerate(groups):
+                f.write(f"[{group}]\n")
+                for j, key in enumerate(keys):
+                    value = self.matrix2d.get_by_index(i+1, j+1)
+                    f.write(f"{key} = {value}\n")
+                f.write("\n")
+
+    def from_ini(self, path):
+        '''
+        输入为ini格式
+        :param path:
+        :return:
+        '''
+        with open(path, 'r', encoding='utf-8') as f:
+            lines = f.readlines()
+
+        self.dict2d = Dict2d()
+
+        group = None
+        for line in lines:
+            line = line.strip()
+            if line.startswith('[') and line.endswith(']'):
+                group = line[1:-1]
+            elif '=' in line:
+                key, value = line.split('=')
+                key = key.strip()
+                value = value.strip()
+                if value == 'None':
+                    value = None
+                self[group][key] = value
+
+        self.__dict2matrix()
+
     def __str__(self):
         return self.to_str()
 

byzh_core/Bwriter/__init__.py

@@ -1,5 +1,3 @@
-
 from .writer import B_Writer
-from .globalwriter import B_GlobalWriter
 
-__all__ = ['B_Writer', 'B_GlobalWriter']
+__all__ = ['B_Writer']

byzh_core/__init__.py

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

{byzh_core-0.0.2.5.dist-info → byzh_core-0.0.2.7.dist-info}/METADATA

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

{byzh_core-0.0.2.5.dist-info → byzh_core-0.0.2.7.dist-info}/RECORD

@@ -1,20 +1,16 @@
-byzh_core/B_os.py,sha256=VFhqVrhcCSm3_gQ0NULqmygYSgO2sOqSIYIYNjQQ2QY,2237
-byzh_core/__init__.py,sha256=6eKioXUU_fhNgFfYCHNK0i8E-_J5Q_6O81eU60v1a-E,110
+byzh_core/B_os.py,sha256=-6KjK2NzEeF8GiQno0BmbVDei9DDxOaXdaKGqFeL_eY,2372
+byzh_core/__init__.py,sha256=d_c6dl-Qv2eGijPSDNAHZUqubney2tU5yZ3iWTk17FI,110
 byzh_core/Barchive/__init__.py,sha256=wUdz646VS0Uhq9lwMkd3YQHCvQhLDqgADoDjFGMqIn0,65
-byzh_core/Barchive/archive.py,sha256=yIQgef1APUcZdHM_7Pa9rCam-P3PA3pbcSJSaySoUj4,2498
+byzh_core/Barchive/archive.py,sha256=6uMoOs-lmdcezdOgXr4s9NmjHVRDvG4v_YGQhaPPyGo,2681
 byzh_core/Bbasic/__init__.py,sha256=wr7Y7YJINhgpV5X6BT5DaGJKcHUOZYNerCGXoi2Egac,116
 byzh_core/Bbasic/text_style.py,sha256=JelgL3AgcH607Mr-Bvr4u8Svb0twmNmqwXvOl4hHOSs,3161
 byzh_core/Bconfig/__init__.py,sha256=7lAp7wNetW0AyJcike7ekdY_8wrQQtFjBsi6684t_lU,54
-byzh_core/Bconfig/config.py,sha256=P9C4kAkxKnIFaJCErBXdABfOyWgFgVHpR-i-fiZXCNs,10956
+byzh_core/Bconfig/config.py,sha256=zfURiqwxXrPo4Pei63GaVvTslHnYTgmleCjeaGBR9K8,10952
 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/Bos/B_os.py,sha256=iGzL9if9Jh5z3U_qWRPIZCrHly2ZCz8MJLWiJwYVefA,763
-byzh_core/Bos/__init__.py,sha256=mMa6OugZs8gIfZMj7go_wEHZRe0JRffgiyIKTF5I_uc,88
-byzh_core/Bos/make.py,sha256=uGmHc96lXChihJs2jGiXJRp3tU_U5DPCo8jcc-aW6d4,663
-byzh_core/Bos/remove.py,sha256=HuGQlEOz7IZB_c6T9MzR3miRx60IeaBYP-3lp-P20-I,156
 byzh_core/Btable/__init__.py,sha256=NlQBjp_mvObEUm4y6wXbGipkNM2N3uNIUidaJkTwFsw,62
-byzh_core/Btable/auto_table.py,sha256=xEPe47hvoJpOHudWAdr_7pZqrs1W9hvWuJgwhOlPDfo,12378
+byzh_core/Btable/auto_table.py,sha256=nc8RvF86laDnITAzX8sVj3l5tbIGflrsstIbSbGDaAI,14747
 byzh_core/Btable/obsolete/__init__.py,sha256=wpfHMPD4awPRDJVYlaiGtkkpjq2srWB7d7LrWhoX5R0,161
 byzh_core/Btable/obsolete/auto_table.py,sha256=nC9eHj_IIGVkS2lmN_1gtOyglLCaGlwdoHzPvNNQDEw,13952
 byzh_core/Btable/obsolete/row_table.py,sha256=rIX0-Yvb3RnO0RJBkA4m18gux1zYSnEKTy6uQGcWilc,5999
@@ -23,11 +19,10 @@ byzh_core/Bterminal/__init__.py,sha256=B6p6mHVhi5LAHKlvqfrv20E6XNqUsfU2xD753V6-Z
 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/Bwriter/__init__.py,sha256=KSsbCJZ-1j5wOr-ZbTg8K3A8Du73d22DQVLdmq-3CBo,116
-byzh_core/Bwriter/globalwriter.py,sha256=tSjWxzLylAeZep67n5jbRsjQkXkBKRZLvKXUyGSY92Q,1824
+byzh_core/Bwriter/__init__.py,sha256=7db9No0yYOW5ZUtFVKWLRZcu_nz3kvw2W25IoiIiilE,54
 byzh_core/Bwriter/writer.py,sha256=px0ZNoSuXS_RbwVnYsBx2lYohyhHACfHM8-HBNEflhU,4006
-byzh_core-0.0.2.5.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
-byzh_core-0.0.2.5.dist-info/METADATA,sha256=_bY5y1V5XcgMQReiBrMErgm0mI_fp7HyzqHmXxx94N8,371
-byzh_core-0.0.2.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-byzh_core-0.0.2.5.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
-byzh_core-0.0.2.5.dist-info/RECORD,,
+byzh_core-0.0.2.7.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
+byzh_core-0.0.2.7.dist-info/METADATA,sha256=v5PcdMGqu_VZFUOqpGQ5OPD-xJNh4XarkoXdYONIyQo,371
+byzh_core-0.0.2.7.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+byzh_core-0.0.2.7.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
+byzh_core-0.0.2.7.dist-info/RECORD,,

byzh_core/Bos/B_os.py

@@ -1,35 +0,0 @@
-import shutil
-import os
-from pathlib import Path
-from typing import Literal
-
-def get_parent_dir(path: Literal['__file__']) -> Path:
-    '''
-    获取 该py文件 所在的文件夹
-    :param path: __file__
-    '''
-    parent_dir = Path(path).parent
-    return parent_dir
-
-def get_cwd() -> Path:
-    '''
-    获取 当前工作目录current working directory
-    '''
-    return Path.cwd()
-
-
-def makedirs(path):
-    from .make import is_dir, is_file
-
-    path = Path(path)
-
-    if is_dir(path):
-        os.makedirs(path, exist_ok=True)
-    if is_file(path):
-        os.makedirs(path.parent, exist_ok=True)
-
-def rm(path):
-    if os.path.isdir(path):
-        shutil.rmtree(path)
-    if os.path.isfile(path):
-        os.remove(path)

byzh_core/Bos/__init__.py

@@ -1,4 +0,0 @@
-from .remove import b_rm
-from .make import b_makedir
-
-__all__ = ['b_rm', 'b_makedir']

byzh_core/Bos/make.py

@@ -1,38 +0,0 @@
-from pathlib import Path
-import os
-import shutil
-
-def is_dir(path):
-    path = Path(path)
-
-    # 存在
-    if os.path.isdir(path):
-        return True
-
-    # 不存在
-    name = path.name
-    if '.' in name:
-        return False
-    return True
-
-def is_file(path):
-    path = Path(path)
-
-    # 存在
-    if os.path.isfile(path):
-        return True
-
-    # 不存在
-    name = path.name
-    if '.' in name:
-        return True
-    return False
-def b_makedir(path):
-    path = Path(path)
-
-    if is_dir(path):
-        os.makedirs(path, exist_ok=True)
-    if is_file(path):
-        os.makedirs(path.parent, exist_ok=True)
-
-

byzh_core/Bos/remove.py

@@ -1,8 +0,0 @@
-import os
-import shutil
-
-def b_rm(path):
-    if os.path.isdir(path):
-        shutil.rmtree(path)
-    if os.path.isfile(path):
-        os.remove(path)

byzh_core/Bwriter/globalwriter.py

@@ -1,62 +0,0 @@
-import threading
-import time
-import atexit
-
-
-class B_GlobalWriter():
-    _instance = None
-    _lock = threading.Lock()
-
-    def __new__(cls):
-        if cls._instance is None:
-            with cls._lock:
-                if cls._instance is None:
-                    cls._instance = super().__new__(cls)
-                    # 初始化
-                    cls._instance.file = None
-                    cls._instance.f = None
-                    cls._instance.ifTime = False
-                    atexit.register(cls._instance.closeFile)  # 注册关闭方法
-        return cls._instance
-
-    @classmethod
-    def setFile(cls, file, ifTime=False):
-        cls()
-        cls._instance.ifTime = ifTime
-        cls._instance.path = file
-        cls._instance.f = open(cls._instance.path, "a", encoding="utf-8")
-
-    @classmethod
-    def clearFile(cls):
-        cls()
-        assert cls._instance.f is not None, "请先调用setFile方法"
-        cls._instance.f.close()
-        cls._instance.f = open(cls._instance.path, 'w', encoding="utf-8")
-
-    @classmethod
-    def closeFile(cls):
-        if cls._instance.f:
-            cls._instance.f.close()
-            cls._instance.f = None
-
-    @classmethod
-    def toCmd(cls, string):
-        cls()
-        print(string)
-
-    @classmethod
-    def toFile(cls, string):
-        cls()
-        assert cls._instance.f is not None, "请先调用setFile方法"
-        if  cls._instance.ifTime:
-            t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
-            cls._instance.f.write(t)
-        cls._instance.f.write(string)
-        cls._instance.f.write("\n")
-        cls._instance.f.flush()
-
-    @classmethod
-    def toBoth(cls, string):
-        cls()
-        cls.toFile(string)
-        cls.toCmd(string)