mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Change to time handling

Browse Source
This commit is contained in:
Krateng 2019-04-04 20:01:06 +02:00
parent 752832db88
commit e50b0d7194
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htmlgenerators.py
View File

@ -1,6 +1,7 @@
import urllib import urllib
from bottle import FormsDict from bottle import FormsDict
import datetime import datetime
from malojatime import time_fix, internal_to_uri
def artistLink(name): def artistLink(name):
@ -33,6 +34,9 @@ def scrobblesLink(timekeys,amount=None,percent=None,artist=None,track=None,assoc
# necessary because urllib.parse.urlencode doesnt handle multidicts # necessary because urllib.parse.urlencode doesnt handle multidicts
def keysToUrl(*dicts,exclude=[]): def keysToUrl(*dicts,exclude=[]):
for dict in dicts:
for key in dict:
dict[key] = internal_to_uri(dict[key])
st = "" st = ""
keys = removeIdentical(*dicts) keys = removeIdentical(*dicts)
for k in keys: for k in keys:
@ -148,17 +152,17 @@ def KeySplit(keys,forceTrack=False,forceArtist=False):
# 2 # 2
resultkeys2 = {} resultkeys2 = {}
if "since" in keys: resultkeys2["since"] = keys.get("since") if "since" in keys: resultkeys2["since"] = time_fix(keys.get("since"))
elif "from" in keys: resultkeys2["since"] = keys.get("from") elif "from" in keys: resultkeys2["since"] = time_fix(keys.get("from"))
elif "start" in keys: resultkeys2["since"] = keys.get("start") elif "start" in keys: resultkeys2["since"] = time_fix(keys.get("start"))
# #
if "to" in keys: resultkeys2["to"] = keys.get("to") if "to" in keys: resultkeys2["to"] = time_fix(keys.get("to"))
elif "until" in keys: resultkeys2["to"] = keys.get("until") elif "until" in keys: resultkeys2["to"] = time_fix(keys.get("until"))
elif "end" in keys: resultkeys2["to"] = keys.get("end") elif "end" in keys: resultkeys2["to"] = time_fix(keys.get("end"))
# #
if "in" in keys: resultkeys2["within"] = keys.get("in") if "in" in keys: resultkeys2["within"] = time_fix(keys.get("in"))
elif "within" in keys: resultkeys2["within"] = keys.get("within") elif "within" in keys: resultkeys2["within"] = time_fix(keys.get("within"))
elif "during" in keys: resultkeys2["within"] = keys.get("during") elif "during" in keys: resultkeys2["within"] = time_fix(keys.get("during"))
#3 #3

10
malojatime.py
View File

@ -22,6 +22,16 @@ def end_of_scrobbling():
def uri_to_internal(t):
return time_fix(t)
def internal_to_uri(t):
if isinstance(t,list) or isinstance(t,tuple):
return "/".join(str(t))
return str(t)
# converts strings and stuff to lists # converts strings and stuff to lists
def time_fix(t): def time_fix(t):