byzh-core 0.0.2__py3-none-any.whl → 0.0.2.1__py3-none-any.whl

byzh_core/Btqdm/__init__.py

@@ -1,4 +1,4 @@
 
-from .b_tqdm import B_Tqdm
+from .my_tqdm import B_Tqdm
 
 __all__ = ['B_Tqdm']

byzh_core/Btqdm/my_tqdm.py

@@ -0,0 +1,80 @@
+import sys
+import time
+import threading
+
+from ..Bbasic import B_Color
+
+
+class B_Tqdm:
+    def __init__(
+            self,
+            total: int|None = None,
+            prefix: str = 'Processing',
+            suffix: str = '',
+            length: int = 20,
+            fill: str = '█',
+    ):
+        """
+        类似tqdm的进度条
+        :param total: 总数
+        :param prefix: 前缀
+        :param suffix: 后缀
+        :param length: 进度条长度(字符)
+        :param fill: 填充字符
+        """
+        super().__init__()
+        self.total = total
+        self.prefix = prefix
+        self.suffix = suffix
+        self.length = length
+        self.fill = fill
+        self.start_time = 0
+        self.current = 0
+
+        self._lock = threading.Lock()
+
+    def _format_time(self, seconds):
+        """将秒数转换为mm:ss格式"""
+        minutes = int(seconds // 60)
+        seconds = int(seconds % 60)
+        return f'{minutes:02}:{seconds:02}'
+
+    def update(self, step=1, color=B_Color.BLUE, prefix=None, suffix=None):
+        with self._lock:
+            if self.current == 0:
+                self.start_time = time.time()
+            if prefix is not None:
+                self.prefix = prefix
+            if suffix is not None:
+                self.suffix = suffix
+
+            # 更新进度
+            self.current += step
+
+            # 计算已用时间
+            elapsed_time = time.time() - self.start_time
+            elapsed_str = self._format_time(elapsed_time)
+            # 预估剩余时间
+            if self.total is not None:
+                estimated_time = elapsed_time / self.current * (self.total - self.current) if self.current > 0 else 0
+                estimated_str = self._format_time(estimated_time)
+            # 计算每秒处理的项数
+            speed = self.current / elapsed_time if elapsed_time > 0 else 0
+
+            # 更新进度条
+            if self.total is not None:
+                filled_length = int(self.length * self.current // self.total)
+                bar = self.fill * filled_length + '-' * (self.length - filled_length)
+
+                sys.stdout.write(f'\r{color}{self.prefix} |{bar}|'
+                                 f' {self.current}/{self.total} -> {elapsed_str}<{estimated_str} | {speed:.1f} it/s |'
+                                 f' {self.suffix}{B_Color.RESET}')
+            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.flush()
+
+            # 补回车
+            if self.current == self.total:
+                sys.stdout.write('\n')
+                sys.stdout.flush()

byzh_core/__init__.py

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

{byzh_core-0.0.2.dist-info → byzh_core-0.0.2.1.dist-info}/METADATA

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

{byzh_core-0.0.2.dist-info → byzh_core-0.0.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-byzh_core/__init__.py,sha256=D5TWdy8yOI-sk4rcb--qdUwnoq8eKlzd0BKiqP7mgqY,108
+byzh_core/__init__.py,sha256=b9tynLPxAljrHuEhOUsTJXUH9w2AtbotOQjjA5fEIBc,110
 byzh_core/Barchive/__init__.py,sha256=wUdz646VS0Uhq9lwMkd3YQHCvQhLDqgADoDjFGMqIn0,65
 byzh_core/Barchive/archive.py,sha256=yIQgef1APUcZdHM_7Pa9rCam-P3PA3pbcSJSaySoUj4,2498
 byzh_core/Bbasic/__init__.py,sha256=wr7Y7YJINhgpV5X6BT5DaGJKcHUOZYNerCGXoi2Egac,116
@@ -20,13 +20,13 @@ byzh_core/Btable/obsolete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 byzh_core/Btable/obsolete/b_auto_table.py,sha256=Cmblv_pknQeMew_KLO8vGdeSRtAykwbMh30QVhgS3UI,10422
 byzh_core/Bterminal/__init__.py,sha256=B6p6mHVhi5LAHKlvqfrv20E6XNqUsfU2xD753V6-Zf4,83
 byzh_core/Bterminal/cmd.py,sha256=iK0fwI0D3peEwUYYZWwnl9X8ImFfrBsEq6ySd3DcRdE,3839
-byzh_core/Btqdm/__init__.py,sha256=wyVbj7X1YpMeGJlriwISV-blZj4hfAk4ihpPMrUR8a0,52
-byzh_core/Btqdm/b_tqdm.py,sha256=692mfNqXhCwXunIpIMNVDt-5GRz4XMVCbcbiM4F9WGM,2620
+byzh_core/Btqdm/__init__.py,sha256=PQRcUn9WXd1YGyFMEKnJU74mdV695_8NHQ56Nsja0DM,53
+byzh_core/Btqdm/my_tqdm.py,sha256=3Xrw6qOEidLqKGE2UD3i37_cMzrSWy4QpNpO2_4I88M,2833
 byzh_core/Bwriter/__init__.py,sha256=KSsbCJZ-1j5wOr-ZbTg8K3A8Du73d22DQVLdmq-3CBo,116
 byzh_core/Bwriter/globalwriter.py,sha256=tSjWxzLylAeZep67n5jbRsjQkXkBKRZLvKXUyGSY92Q,1824
 byzh_core/Bwriter/writer.py,sha256=px0ZNoSuXS_RbwVnYsBx2lYohyhHACfHM8-HBNEflhU,4006
-byzh_core-0.0.2.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
-byzh_core-0.0.2.dist-info/METADATA,sha256=ZfBmv-NnQwC4EfRWshoSLuuL_YjFO8HWXiP3rnnsAkw,369
-byzh_core-0.0.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-byzh_core-0.0.2.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
-byzh_core-0.0.2.dist-info/RECORD,,
+byzh_core-0.0.2.1.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
+byzh_core-0.0.2.1.dist-info/METADATA,sha256=L0O0d5iXfO4t_8t6qKS4ul1pq54_rrcC_h7WUwAOQWc,371
+byzh_core-0.0.2.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+byzh_core-0.0.2.1.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
+byzh_core-0.0.2.1.dist-info/RECORD,,

byzh_core/Btqdm/b_tqdm.py

@@ -1,76 +0,0 @@
-import sys
-import time
-
-from ..Bbasic import B_Color
-
-
-class B_Tqdm:
-    def __init__(
-            self,
-            total: int|None = None,
-            prefix: str = 'Processing',
-            suffix: str = '',
-            length: int = 20,
-            fill: str = '█',
-    ):
-        """
-        类似tqdm的进度条
-        :param total: 总数
-        :param prefix: 前缀
-        :param suffix: 后缀
-        :param length: 进度条长度(字符)
-        :param fill: 填充字符
-        """
-        super().__init__()
-        self.total = total
-        self.prefix = prefix
-        self.suffix = suffix
-        self.length = length
-        self.fill = fill
-        self.start_time = 0
-        self.current = 0
-
-    def _format_time(self, seconds):
-        """将秒数转换为mm:ss格式"""
-        minutes = int(seconds // 60)
-        seconds = int(seconds % 60)
-        return f'{minutes:02}:{seconds:02}'
-
-    def update(self, step=1, color=B_Color.BLUE, prefix=None, suffix=None):
-        if self.current == 0:
-            self.start_time = time.time()
-        if prefix is not None:
-            self.prefix = prefix
-        if suffix is not None:
-            self.suffix = suffix
-
-        # 更新进度
-        self.current += step
-
-        # 计算已用时间
-        elapsed_time = time.time() - self.start_time
-        elapsed_str = self._format_time(elapsed_time)
-        # 预估剩余时间
-        if self.total is not None:
-            estimated_time = elapsed_time / self.current * (self.total - self.current) if self.current > 0 else 0
-            estimated_str = self._format_time(estimated_time)
-        # 计算每秒处理的项数
-        speed = self.current / elapsed_time if elapsed_time > 0 else 0
-
-        # 更新进度条
-        if self.total is not None:
-            filled_length = int(self.length * self.current // self.total)
-            bar = self.fill * filled_length + '-' * (self.length - filled_length)
-
-            sys.stdout.write(f'\r{color}{self.prefix} |{bar}|'
-                             f' {self.current}/{self.total} -> {elapsed_str}<{estimated_str} | {speed:.1f} it/s |'
-                             f' {self.suffix}{B_Color.RESET}')
-        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.flush()
-
-        # 补回车
-        if self.current == self.total:
-            sys.stdout.write('\n')
-            sys.stdout.flush()