funcguard 0.2.0__tar.gz → 0.2.1__tar.gz

{funcguard-0.2.0 → funcguard-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcguard
-Version: 0.2.0
+Version: 0.2.1
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen

{funcguard-0.2.0 → funcguard-0.2.1}/funcguard/time_utils.py

@@ -20,16 +20,23 @@ def time_log(message, i = 0, max_num = 0, s_time = None, start_from = 0 , return
     """
     now = datetime.now( timezone( timedelta( hours = 8 ) ) )
     time_str = "{:02d}:{:02d}:{:02d}".format( now.hour, now.minute, now.second )
-    progress_info = ""
+    progress_info = eta_time_info = etr_time_info = ""
     if i < 2 or max_num < 2 :
-        print( time_str + " " + message )
+        if return_field in ["end_time", "remaining_time"] :
+            return ""
+        else:
+            print( time_str + " " + message )
 
     else :
         # 根据start_from参数计算实际处理的项目数
         process_item = i + 1 if start_from == 0 else i
         progress_info = "{}/{}".format( process_item, max_num )
         # 检查是否应该显示预计完成时间和剩余时间
-        if process_item % 10 == 0 and s_time is not None and process_item < max_num :
+        # 当return_field为"end_time"或"remaining_time"时，每次都计算时间
+        # 否则只在每10个处理一次时计算
+        should_calculate_time = (return_field in ["end_time", "remaining_time"] and process_item < max_num ) or (process_item % 10 == 0 and s_time is not None and process_item < max_num)
+        
+        if should_calculate_time and s_time is not None and process_item < max_num:
             duration = now - s_time
             ev_duration = duration / process_item  # 每项平均耗时
             remaining_items = max_num - process_item
@@ -37,16 +44,17 @@ def time_log(message, i = 0, max_num = 0, s_time = None, start_from = 0 , return
             end_time = now + time_left
             end_time_str = end_time.strftime( "%Y-%m-%d %H:%M" )
             remaining_time_str = str( timedelta( seconds = int( time_left.total_seconds() ) ) )
-
-            #  Estimated Time of Arrival（预计完成/到达时间）
-            if return_field == "end_time" :
-                return f"eta {end_time_str}"   
-
-            # Estimated Time Remaining（预计剩余时间）
-            elif return_field == "remaining_time" :
-                return f"etr {remaining_time_str}" 
-
-            progress_info = progress_info + "（{}）etr {}".format( end_time_str, remaining_time_str )
+            eta_time_info = f"eta {end_time_str}"
+            etr_time_info = f"etr {remaining_time_str}"
+            progress_info = progress_info + f" ( {eta_time_info}  {etr_time_info} )"
+
+        #  Estimated Time of Arrival（预计完成/到达时间）
+        if return_field == "end_time" :
+            return eta_time_info   
+        
+        # Estimated Time Remaining（预计剩余时间）
+        elif return_field == "remaining_time" :
+            return etr_time_info
 
         print( time_str + " " + message + " " + progress_info )
     return progress_info

{funcguard-0.2.0 → funcguard-0.2.1}/funcguard.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcguard
-Version: 0.2.0
+Version: 0.2.1
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen

{funcguard-0.2.0 → funcguard-0.2.1}/setup.py

@@ -9,7 +9,7 @@ except FileNotFoundError:
 
 setup(
     name='funcguard',
-    version='0.2.0',
+    version='0.2.1',
     packages=find_packages(),
     install_requires=[
         'requests',