mirror
/
maloja
mirror of https://github.com/krateng/maloja.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplified timestamp desc further

This commit is contained in:
krateng 2021-12-10 22:19:12 +01:00
parent 05460f97b7
commit a85ec372f2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maloja/malojatime.py
View File

@ -486,11 +486,10 @@ def time_pad(f,t,full=False):
def timestamp_desc(t,short=False):
if short:
now = datetime.datetime.now(tz=datetime.timezone.utc)
timeobj = datetime.datetime.fromtimestamp(t,tz=TIMEZONE)
difference = int(now.timestamp() - t)
timeobj = datetime.datetime.utcfromtimestamp(t)
if short:
difference = int(datetime.datetime.now().timestamp() - t)
thresholds = (
(10,"just now"),
@ -503,13 +502,10 @@ def timestamp_desc(t,short=False):
(math.inf,f"{timeobj.strftime('%Y')}")
)
for t,s in thresholds:
if difference < t: return s.format(sec=difference,obj=datetime.datetime.utcfromtimestamp(t))
for t,s in thresholds: if difference < t: return s
else:
timeobject = datetime.datetime.fromtimestamp(t,tz=TIMEZONE)
format = get_settings("TIME_FORMAT")
return timeobject.strftime(format)
return timeobj.strftime(get_settings("TIME_FORMAT"))