use 'min' for minutes

Divkix · Feb 27, 2023 · b424c83 · b424c83
1 parent c3951c9
commit b424c83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/docs/formatters.md b/docs/formatters.md
@@ -11,7 +11,8 @@ print(humanbytes_size)
 human_time = Formatters.time_formatter(15000)
 print(human_time)
 
-# time being in m/h/d/w/m/y.
+# time being in s/min/h/d/w/m/y.
+# Note: use 'min' for minutes
 seconds = Formatters.get_time_in_seconds("2w")
 print(seconds)
 ```
diff --git a/pypers/formatters.py b/pypers/formatters.py
@@ -45,10 +45,12 @@ def time_formatter(
         minutes, seconds = divmod(seconds, 60)
         hours, minutes = divmod(minutes, 60)
         days, hours = divmod(hours, 24)
+        months, days = divmod(days, 30)
         tmp = (
-            ((str(days) + "d, ") if days else "")
+            ((str(months) + "m, ") if months else "")
+            + ((str(days) + "d, ") if days else "")
             + ((str(hours) + "h, ") if hours else "")
-            + ((str(minutes) + "m, ") if minutes else "")
+            + ((str(minutes) + "min, ") if minutes else "")
             + ((str(seconds) + "s, ") if seconds else "")
         )
         return tmp[:-2]
@@ -59,14 +61,14 @@ def get_time_in_seconds(time: str) -> int:
         Convert time in a string format to seconds.
 
         Args:
-            time: The time in string format with m/h/d/w/m/y.
+            time: The time in string format with s/min/h/d/w/m/y. Note: use 'min' for minutes.
 
         Returns:
             The time in seconds.
         """
         times = {
             "s": 1,
-            "m": 60,
+            "min": 60,
             "h": 3600,
             "d": 86400,
             "w": 604800,