From 22172d8b57df2ad1282f8d835183be45843fdd6a Mon Sep 17 00:00:00 2001 From: Krateng Date: Fri, 25 Sep 2020 17:06:45 +0200 Subject: [PATCH] Fixed GET scrobbling --- maloja/__pkginfo__.py | 2 +- maloja/apis/native_v1.py | 11 +++++++++-- maloja/web/jinja/track.jinja | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index b15aaa7..8b05bb1 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,9,9 +version = 2,9,10 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", diff --git a/maloja/apis/native_v1.py b/maloja/apis/native_v1.py index c84677f..5e2e3e2 100644 --- a/maloja/apis/native_v1.py +++ b/maloja/apis/native_v1.py @@ -195,9 +195,16 @@ def compare_external(**keys): @api.get("newscrobble") -def get_post_scrobble(*args,**kwargs): +def get_post_scrobble(artist:Multi,**keys): """DEPRECATED. Use the equivalent POST method instead.""" - return post_scrobble(*args,**kwargs) + artists = artist + title = keys.get("title") + album = keys.get("album") + duration = keys.get("seconds") + time = keys.get("time") + if time is not None: time = int(time) + + return incoming_scrobble(artists,title,album=album,duration=duration,time=time) @api.post("newscrobble") @authenticated_api_with_alternate(api_key_correct) diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja index 74c389f..8da962f 100644 --- a/maloja/web/jinja/track.jinja +++ b/maloja/web/jinja/track.jinja @@ -7,7 +7,7 @@ {% endblock %}