From 8db87bdbc54a073e0cf38158fdf8eb0babd61147 Mon Sep 17 00:00:00 2001 From: krateng Date: Sun, 13 Feb 2022 07:45:22 +0100 Subject: [PATCH] Various fixes --- maloja/apis/native_v1.py | 13 ++++++------- maloja/database/__init__.py | 2 +- maloja/malojauri.py | 2 +- maloja/web/jinja/abstracts/base.jinja | 1 + maloja/web/jinja/admin_setup.jinja | 22 ++++++++++++++-------- pyproject.toml | 5 +++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/maloja/apis/native_v1.py b/maloja/apis/native_v1.py index f0b1d4d..0a4b10f 100644 --- a/maloja/apis/native_v1.py +++ b/maloja/apis/native_v1.py @@ -225,19 +225,18 @@ def post_scrobble(artist:Multi=None,**keys): :param string artists: List of artists. Overwritten by artist parameter. :param string title: Title of the track. :param string album: Name of the album. Optional. + :param string albumartists: Album artists. Optional. :param int duration: Actual listened duration of the scrobble in seconds. Optional. + :param int length: Total length of the track in seconds. Optional. :param int time: UNIX timestamp of the scrobble. Optional, not needed if scrobble is at time of request. + :param boolean nofix: Skip server-side metadata parsing. Optional. """ #artists = "/".join(artist) - artists = artist if artist is not None else keys.get("artists") - title = keys.get("title") - album = keys.get("album") - duration = keys.get("seconds") - time = keys.get("time") - nofix = keys.get("nofix") is not None + keys['artists'] = [artist] if artist is not None else keys.get("artists") + keys['fix'] = keys.get("nofix") is None if time is not None: time = int(time) - return incoming_scrobble(artists,title,album=album,duration=duration,time=time,fix=not nofix) + return incoming_scrobble(**keys) diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index b6a5db5..0317b2c 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -72,7 +72,7 @@ coa = CollectorAgent() -def incoming_scrobble(artists,title,album=None,albumartists=None,duration=None,time=None,fix=True): +def incoming_scrobble(artists,title,album=None,albumartists=None,duration=None,length=None,time=None,fix=True): if time is None: time = int(datetime.datetime.now(tz=datetime.timezone.utc).timestamp()) diff --git a/maloja/malojauri.py b/maloja/malojauri.py index 8b3f34b..d93caeb 100644 --- a/maloja/malojauri.py +++ b/maloja/malojauri.py @@ -36,7 +36,7 @@ def uri_to_internal(keys,forceTrack=False,forceArtist=False,api=False): limitkeys["timerange"] = get_range_object(since=since,to=to,within=within) #3 - delimitkeys = {"step":"month","stepn":1,"trail":1} + delimitkeys = {"step":"year","stepn":1,"trail":1} if "step" in keys: [delimitkeys["step"],delimitkeys["stepn"]] = (keys["step"].split("-") + [1])[:2] if "stepn" in keys: delimitkeys["stepn"] = keys["stepn"] #overwrite if explicitly given if "stepn" in delimitkeys: delimitkeys["stepn"] = int(delimitkeys["stepn"]) #in both cases, convert it here diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja index 1cab479..8411e93 100644 --- a/maloja/web/jinja/abstracts/base.jinja +++ b/maloja/web/jinja/abstracts/base.jinja @@ -49,6 +49,7 @@
Get your own charts on + GitHub, PyPI or Dockerhub diff --git a/maloja/web/jinja/admin_setup.jinja b/maloja/web/jinja/admin_setup.jinja index 233da8e..d79d9ad 100644 --- a/maloja/web/jinja/admin_setup.jinja +++ b/maloja/web/jinja/admin_setup.jinja @@ -54,7 +54,7 @@

Start Scrobbling

- If you use Vivaldi, Brave, Iridium or any other Chromium-based browser and listen to music on Plex or YouTube Music, download the extension and simply enter the server URL as well as your API key in the relevant fields. They will turn green if the server is accessible. + If you use a Chromium-based browser and listen to music on Plex, Spotify, Soundcloud, Bandcamp or YouTube Music, download the extension and simply enter the server URL as well as your API key in the relevant fields. They will turn green if the server is accessible.

You can also use any standard-compliant scrobbler. For GNUFM (audioscrobbler) scrobblers, enter yourserver.tld/apis/audioscrobbler as your Gnukebox server and your API key as the password. For Listenbrainz scrobblers, use yourserver.tld/apis/listenbrainz as the API URL and your API key as token.

@@ -62,15 +62,20 @@ yourserver.tld/apis/mlj_1/newscrobble - (make sure to use the public URL) with the key-value-pairs + (make sure to use the public URL) with the following values encoded as JSON:

- - - - - + + + + + + + + + +
artist Artist String
title Title String
key API Key
time UNIX timestamp - optional, defaults to time of request
seconds Duration of Scrobble - optional and currently not used
artists List of artist names
title Song title
album Album title - optional
albumartists List of album artists - optional
duration Duration of play in seconds - optional
length Full length of the trackin seconds - optional
time UNIX timestamp - optional, defaults to time of request
fix Set this to false to skip server-side metadata fixing - optional
key API Key, see API Keys


Finally, you could always manually scrobble! @@ -79,7 +84,8 @@

Import your Last.FM data

- Switching from Last.fm? Download all your data and run the command maloja import (the file you just downloaded). + Switching from Last.fm? Download all your data and run the command maloja import (the file you just downloaded).
+ You can also try out Multi-Scrobbler to import scrobbles from a wider range of sources.

Set up some rules

diff --git a/pyproject.toml b/pyproject.toml index 0e9a39b..1fb2029 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "malojaserver" -version = "2.14.6" +version = "3.0.0-dev" description = "Self-hosted music scrobble database" readme = "./README.md" requires-python = ">=3.6" @@ -28,7 +28,8 @@ dependencies = [ "jinja2>=2.11", "lru-dict>=1.1.6", "css_html_js_minify>=2.5.5", - "psutil>=5.8.0" + "psutil>=5.8.0", + "sqlalchemy>=1.4" ] [project.scripts]