byzh-core 0.0.2.1__tar.gz → 0.0.2.3__tar.gz

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/PKG-INFO

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

byzh_core-0.0.2.3/byzh_core/B_os.py

@@ -0,0 +1,60 @@
+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):
+    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
+
+    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.3/byzh_core/Bos/B_os.py

@@ -0,0 +1,35 @@
+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.3/byzh_core/Bos/__init__.py

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

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/byzh_core/Bos/make.py

@@ -4,6 +4,12 @@ import shutil
 
 def is_dir(path):
     path = Path(path)
+
+    # 存在
+    if os.path.isdir(path):
+        return True
+
+    # 不存在
     name = path.name
     if '.' in name:
         return False
@@ -11,6 +17,12 @@ def is_dir(path):
 
 def is_file(path):
     path = Path(path)
+
+    # 存在
+    if os.path.isfile(path):
+        return True
+
+    # 不存在
     name = path.name
     if '.' in name:
         return True

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/byzh_core/Btable/auto_table.py

@@ -172,7 +172,7 @@ class B_AutoTable:
         dir = Path(path).resolve().parent
         os.makedirs(dir, exist_ok=True)
         with open(path, 'w') as f:
-            f.write(self.get_table_by_str())
+            f.write(self.to_str())
 
     def update_txt(self, path):
         '''
@@ -194,7 +194,7 @@ class B_AutoTable:
 
 
 
-    def get_table_by_strs(self) -> List[str]:
+    def to_strs(self) -> List[str]:
         transpose = self._need_transpose()
         self._update_all(transpose)
         self._update_widths()
@@ -222,9 +222,9 @@ class B_AutoTable:
 
         return results
 
-    def get_table_by_str(self) -> str:
+    def to_str(self) -> str:
         result = ""
-        strs = self.get_table_by_strs()
+        strs = self.to_strs()
         for x in strs[:-1]:
             result += x + '\n'
         result += strs[-1]
@@ -391,7 +391,7 @@ class B_AutoTable:
                     return True
         return False
     def __str__(self):
-        return self.get_table_by_str()
+        return self.to_str()
 
     def __getitem__(self, index):
         index = str(index)

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/byzh_core/Btqdm/my_tqdm.py

@@ -19,7 +19,7 @@ class B_Tqdm:
         :param total: 总数
         :param prefix: 前缀
         :param suffix: 后缀
-        :param length: 进度条长度(字符)
+        :param length: 进度条长度(字符), 默认为20个字符长度
         :param fill: 填充字符
         """
         super().__init__()
@@ -64,7 +64,7 @@ class B_Tqdm:
             # 更新进度条
             if self.total is not None:
                 filled_length = int(self.length * self.current // self.total)
-                bar = self.fill * filled_length + '-' * (self.length - filled_length)
+                bar = self.fill * filled_length + '-' * (self.length - filled_length) * len(self.fill)
 
                 sys.stdout.write(f'\r{color}{self.prefix} |{bar}|'
                                  f' {self.current}/{self.total} -> {elapsed_str}<{estimated_str} | {speed:.1f} it/s |'

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/byzh_core/__init__.py

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

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/byzh_core.egg-info/PKG-INFO

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

{byzh_core-0.0.2.1 → byzh_core-0.0.2.3}/byzh_core.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 setup.py
+byzh_core/B_os.py
 byzh_core/__init__.py
 byzh_core.egg-info/PKG-INFO
 byzh_core.egg-info/SOURCES.txt
@@ -16,9 +17,9 @@ 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/path.py
 byzh_core/Bos/remove.py
 byzh_core/Btable/__init__.py
 byzh_core/Btable/auto_table.py

byzh_core-0.0.2.1/byzh_core/Bos/__init__.py

@@ -1,6 +0,0 @@
-from .remove import b_rm
-from .make import b_makedir
-from .path import b_get_parent_dir, b_get_cwd
-
-
-__all__ = ['b_rm', 'b_makedir', 'b_get_parent_dir', 'b_get_cwd']

byzh_core-0.0.2.1/byzh_core/Bos/path.py

@@ -1,17 +0,0 @@
-import os
-from pathlib import Path
-from typing import Literal
-
-def b_get_parent_dir(path: Literal['__file__']) -> Path:
-    '''
-    获取 该py文件 所在的文件夹
-    :param path: __file__
-    '''
-    parent_dir = Path(path).parent
-    return parent_dir
-
-def b_get_cwd() -> Path:
-    '''
-    获取 当前工作目录current working directory
-    '''
-    return Path.cwd()