fix uptime

tobrot/helper_funcs/display_progress.py

@@ -37,8 +37,8 @@ async def progress_for_pyrogram(
         time_to_completion = round((total - current) / speed) * 1000
         estimated_total_time = elapsed_time + time_to_completion
 
-        elapsed_time = TimeFormatter(milliseconds=elapsed_time)
-        estimated_total_time = TimeFormatter(milliseconds=estimated_total_time)
+        elapsed_time = time_formatter(milliseconds=elapsed_time)
+        estimated_total_time = time_formatter(milliseconds=estimated_total_time)
 
         progress = "[{0}{1}] \nP: {2}%\n".format(
             ''.join([FINISHED_PROGRESS_STR for i in range(math.floor(percentage / 5))]),
@@ -85,14 +85,21 @@ def humanbytes(size):
     return str(round(size, 2)) + " " + Dic_powerN[n] + 'B'
 
 
-def TimeFormatter(milliseconds: int) -> str:
-    seconds, milliseconds = divmod(int(milliseconds), 1000)
-    minutes, seconds = divmod(seconds, 60)
-    hours, minutes = divmod(minutes, 60)
-    days, hours = divmod(hours, 24)
-    tmp = ((str(days) + "d, ") if days else "") + \
-        ((str(hours) + "h, ") if hours else "") + \
-        ((str(minutes) + "m, ") if minutes else "") + \
-        ((str(seconds) + "s, ") if seconds else "") + \
-        ((str(milliseconds) + "ms, ") if milliseconds else "")
-    return tmp[:-2]
+def time_formatter(seconds: int) -> str:
+    result = ""
+    v_m = 0
+    remainder = seconds
+    r_ange_s = {
+        "days": (24 * 60 * 60),
+        "hours": (60 * 60),
+        "minutes": 60,
+        "seconds": 1
+    }
+    for age in r_ange_s:
+        divisor = r_ange_s[age]
+        v_m, remainder = divmod(remainder, divisor)
+        v_m = int(v_m)
+        if v_m != 0:
+            result += f" {v_m} {age} "
+    return result
+

tobrot/plugins/status_message_fn.py

@@ -22,7 +22,7 @@
 from tobrot.dinmamoc import Commandi
 from tobrot.amocmadin import Loilacaztion
 from tobrot.helper_funcs.display_progress import (
-    TimeFormatter,
+    time_formatter,
     humanbytes
 )
 
@@ -72,7 +72,7 @@ async def status_message_f(client, message):
     if msg == "":
         msg = Loilacaztion.NO_TOR_STATUS
 
-    currentTime = TimeFormatter((time.time() - BOT_START_TIME))
+    currentTime = time_formatter((time.time() - BOT_START_TIME))
     total, used, free = shutil.disk_usage(".")
     total = humanbytes(total)
     used = humanbytes(used)