mirror of
https://github.com/krateng/maloja.git
synced 2025-04-22 19:40:28 +03:00
Merge branch 'feature-albums' into next_minor_version
This commit is contained in:
commit
c0ccb716c5
maloja
0
maloja/data_files/state/images/albums/dummy
Normal file
0
maloja/data_files/state/images/albums/dummy
Normal file
@ -110,6 +110,7 @@ def incoming_scrobble(rawscrobble,fix=True,client=None,api=None,dbconn=None):
|
||||
proxy_scrobble_all(scrobbledict['track']['artists'],scrobbledict['track']['title'],scrobbledict['time'])
|
||||
|
||||
dbcache.invalidate_caches(scrobbledict['time'])
|
||||
dbcache.invalidate_entity_cache() # because album info might have changed
|
||||
|
||||
#return {"status":"success","scrobble":scrobbledict}
|
||||
return scrobbledict
|
||||
@ -153,6 +154,11 @@ def rawscrobble_to_scrobbledict(rawscrobble, fix=True, client=None):
|
||||
if 'album_artists' not in scrobbleinfo:
|
||||
scrobbleinfo['album_artists'] = scrobbleinfo.get('track_artists')
|
||||
|
||||
# New plan, do this further down
|
||||
# NONE always means there is simply no info, so make a guess or whatever the options say
|
||||
# various artists always needs to be specified via []
|
||||
# TODO
|
||||
|
||||
# processed info to internal scrobble dict
|
||||
scrobbledict = {
|
||||
"time":scrobbleinfo.get('scrobble_time'),
|
||||
|
@ -220,8 +220,8 @@ def jinja_page(name):
|
||||
res = template.render(**loc_context)
|
||||
except TemplateNotFound:
|
||||
abort(404,f"Not found: '{name}'")
|
||||
except (ValueError, IndexError):
|
||||
abort(404,"This Artist or Track does not exist")
|
||||
#except (ValueError, IndexError):
|
||||
# abort(404,"This Artist or Track does not exist")
|
||||
|
||||
if malojaconfig["DEV_MODE"]: jinja_environment.cache.clear()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user