♻️ refactor(calendar.all): Leverage .bin/human.py.

Author: make-github-pseudonymous-again

.bin/calendar._all

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 from datetime import datetime, timedelta
+import human
 import re
 
 FMT = '%Y-%m-%d %H:%M:%S'
@@ -13,7 +14,6 @@ from events import _range
 from events import _cache_load_url
 from events import calendars
 from events import FRESH
-from events import _duration
 
 def _icon(event):
 
@@ -175,7 +175,7 @@ for title, events in sections:
             hbegin = begin.humanize(),
             range = _range( now , begin , end ) ,
             hend = end.humanize( ) ,
-            hduration = 'lasts ' +  _duration( begin , end ) ,
+            hduration = 'lasts ' +  human.timedelta( end - begin ) ,
             name = name,
             location = location,
             urls = urls

.bin/events.py

@@ -201,79 +201,3 @@ def event_to_i3_status_object ( now: datetime , event: ics.Event ) :
         "full_text":" {}".format(full_text),
         "short_text":" {}".format(short_text)
     }
-
-
-# FORMAT TIME
-
-def _humanize(time, ref):
-
-    x = time.humanize(ref)
-
-    if x == "in seconds":
-
-        return "in {} seconds".format((time - ref).seconds)
-
-    if x == "just now":
-
-        return "now"
-
-    return x
-
-
-def _duration(A, B):
-
-    x = _humanize(B, A)
-
-    if x == 'now':
-
-        return '{} seconds'.format((B - A).seconds)
-
-    if x == 'in a minute':
-
-        return '1 minute'
-
-    return x[3:]
-
-
-def _shortduration(A, B):
-
-    return _shorten(_duration(A, B))
-
-
-def _shorthumanize(time, ref):
-
-    return _shorten(_humanize(time, ref))
-
-def _tinyduration(A, B):
-
-    return _tinier(_duration(A, B))
-
-
-def _tinyhumanize(time, ref):
-
-    return _tinier(_humanize(time, ref))
-
-
-def _shorten(x):
-
-    if 'minutes' in x or 'seconds' in x:
-
-        return x[:-4]
-
-    if 'minute' in x:
-
-        return x[:-3]
-
-    return x
-
-def _tinier(x):
-
-    if 'minutes' in x or 'seconds' in x:
-
-        return x[:-6]
-
-    if 'minute' in x:
-
-        return x[:-5]
-
-    return x

.bin/human.py

@@ -52,7 +52,7 @@ def seconds(value: float):
 		if count == 0: continue
 		return _duration(unit, count)
 
-	return 'now'
+	return 'instant'
 
 def timedelta(delta: dt.timedelta):
 	return seconds(delta.total_seconds())
@@ -64,5 +64,7 @@ def datetime(x: dt.datetime, relative_to: Optional[dt.datetime]=None):
 	delta = x - relative_to
 	s = delta.total_seconds()
 
-	fmt = '{}' if s == 0 else '{} ago' if s < 0 else 'in {}'
+	if s == 0: return 'now'
+
+	fmt = '{} ago' if s < 0 else 'in {}'
 	return fmt.format(seconds(abs(s)))