byzh-core 0.0.2.6__tar.gz → 0.0.2.8__tar.gz

{byzh_core-0.0.2.6 → byzh_core-0.0.2.8}/PKG-INFO

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

{byzh_core-0.0.2.6 → byzh_core-0.0.2.8}/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-0.0.2.6 → byzh_core-0.0.2.8}/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-0.0.2.8/byzh_core/Bwriter/__init__.py

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

{byzh_core-0.0.2.6 → byzh_core-0.0.2.8}/byzh_core/Bwriter/writer.py

@@ -83,7 +83,7 @@ class B_Writer:
             assert color in COLOR_DICT, f"color参数错误，请输入{COLOR_DICT.keys()}"
             print(COLOR_DICT.get(color) + str(string) + B_Color.RESET)
 
-    def toFile(self, string, ifTime=None):
+    def toFile(self, string, ifTime:bool=None):
         '''
         写入到文件内
         '''
@@ -99,7 +99,7 @@ class B_Writer:
         self.f.write("\n")
         self.f.flush()
 
-    def toBoth(self, string, ifTime=False, color: Color_Literal = None):
+    def toBoth(self, string, ifTime:bool=None, color: Color_Literal = None):
         '''
         同时写入到文件和terminal
         :param string:
@@ -116,7 +116,7 @@ class B_Writer:
         self.toWant_cmd = toCmd
         self.toWant_file = toFile
 
-    def toWant(self, string, ifTime=False, color: Color_Literal = None):
+    def toWant(self, string, ifTime:bool=None, color: Color_Literal = None):
         '''
         使用前先调用setWant方法
         '''

{byzh_core-0.0.2.6 → byzh_core-0.0.2.8}/byzh_core/__init__.py

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

{byzh_core-0.0.2.6/byzh_core → byzh_core-0.0.2.8/byzh_core/obsolete}/Bconfig/config.py

@@ -1,4 +1,4 @@
-from ..Bbasic import B_Color
+from ...Bbasic import B_Color
 
 
 class B_Config:

{byzh_core-0.0.2.6 → byzh_core-0.0.2.8}/byzh_core.egg-info/PKG-INFO

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

{byzh_core-0.0.2.6 → byzh_core-0.0.2.8}/byzh_core.egg-info/SOURCES.txt

@@ -12,25 +12,20 @@ byzh_core/Barchive/__init__.py
 byzh_core/Barchive/archive.py
 byzh_core/Bbasic/__init__.py
 byzh_core/Bbasic/text_style.py
-byzh_core/Bconfig/__init__.py
-byzh_core/Bconfig/config.py
 byzh_core/Bmath/__init__.py
 byzh_core/Bmath/divides.py
 byzh_core/Bmath/get_norm.py
-byzh_core/Bos/B_os.py
-byzh_core/Bos/__init__.py
-byzh_core/Bos/make.py
-byzh_core/Bos/remove.py
 byzh_core/Btable/__init__.py
 byzh_core/Btable/auto_table.py
-byzh_core/Btable/obsolete/__init__.py
-byzh_core/Btable/obsolete/auto_table.py
-byzh_core/Btable/obsolete/row_table.py
-byzh_core/Btable/obsolete/xy_table.py
 byzh_core/Bterminal/__init__.py
 byzh_core/Bterminal/cmd.py
 byzh_core/Btqdm/__init__.py
 byzh_core/Btqdm/my_tqdm.py
 byzh_core/Bwriter/__init__.py
-byzh_core/Bwriter/globalwriter.py
-byzh_core/Bwriter/writer.py
+byzh_core/Bwriter/writer.py
+byzh_core/obsolete/__init__.py
+byzh_core/obsolete/auto_table.py
+byzh_core/obsolete/row_table.py
+byzh_core/obsolete/xy_table.py
+byzh_core/obsolete/Bconfig/__init__.py
+byzh_core/obsolete/Bconfig/config.py

byzh_core-0.0.2.6/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-0.0.2.6/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-0.0.2.6/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-0.0.2.6/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-0.0.2.6/byzh_core/Bwriter/__init__.py

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

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