Use client tstamp or server time

redshodan · Dec 25, 2018 · 3becb97 · 3becb97
1 parent 2664a14
commit 3becb97
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/test/tests/rest/testscrobble.py b/test/tests/rest/testscrobble.py
@@ -1,7 +1,21 @@
+import time
+
 from unsonic.views.rest.scrobble import Scrobble
 from . import buildCmd, checkResp
 
 
 def testScrobble(session):
     cmd = buildCmd(session, Scrobble, {"id": "tr-1"})
     checkResp(cmd.req, cmd())
+
+
+def testScrobbleSubmission(session):
+    cmd = buildCmd(session, Scrobble,
+                   {"id": "tr-1", "time": str(int(time.time()) * 1000),
+                    "submission":"True"})
+    checkResp(cmd.req, cmd())
+
+
+def testScrobbleSubmissionNoTime(session):
+    cmd = buildCmd(session, Scrobble, {"id": "tr-1", "submission":"True"})
+    checkResp(cmd.req, cmd())
diff --git a/unsonic/views/rest/scrobble.py b/unsonic/views/rest/scrobble.py
@@ -70,8 +70,9 @@ def handleReq(self, session):
                 if lastfm.is_user:
                     log.info(
                         f"last.fm scrobbling: {track.artist} - {track.title}")
-                    lastfm.scrobble(track.artist.name, track.title,
-                                    int(time.time()),
+                    tstamp = self.params["time"]
+                    tstamp = tstamp / 1000 if stamp else int(time.time())
+                    lastfm.scrobble(track.artist.name, track.title, tstamp,
                                     album=track.album.title,
                                     album_artist=track.album.artist.name,
                                     track_number=track.track_num,