malojaserver 3.2.1__py3-none-any.whl → 3.2.3__py3-none-any.whl

maloja/thirdparty/lastfm.py

@@ -55,24 +55,25 @@ class LastFM(MetadataInterface, ProxyScrobbleInterface):
 		})
 
 	def authorize(self):
-		try:
-			response = requests.post(
-				url=self.proxyscrobble['scrobbleurl'],
-				params=self.query_compose({
-					"method":"auth.getMobileSession",
-					"username":self.settings["username"],
-					"password":self.settings["password"],
-					"api_key":self.settings["apikey"]
-				}),
-				headers={
-					"User-Agent":self.useragent
-				}
-			)
+		if all(self.settings[key] not in [None,"ASK",False] for key in ["username","password","apikey","secret"]):
+			try:
+				response = requests.post(
+					url=self.proxyscrobble['scrobbleurl'],
+					params=self.query_compose({
+						"method":"auth.getMobileSession",
+						"username":self.settings["username"],
+						"password":self.settings["password"],
+						"api_key":self.settings["apikey"]
+					}),
+					headers={
+						"User-Agent":self.useragent
+					}
+				)
 
-			data = ElementTree.fromstring(response.text)
-			self.settings["sk"] = data.find("session").findtext("key")
-		except Exception as e:
-			log("Error while authenticating with LastFM: " + repr(e))
+				data = ElementTree.fromstring(response.text)
+				self.settings["sk"] = data.find("session").findtext("key")
+			except Exception as e:
+				log("Error while authenticating with LastFM: " + repr(e))
 
 
 	# creates signature and returns full query

maloja/web/jinja/abstracts/base.jinja

@@ -75,7 +75,7 @@
             <a href="/"><img style="display:block;" src="/favicon.png" /></a>
           </div>
           <div id="right-side">
-            <span><input id="searchinput" placeholder="Search for an artist or track..." oninput="search(this)" onblur="clearresults()" /></span>
+            <span><input id="searchinput" placeholder="Search for an album, artist or track..." oninput="search(this)" onblur="clearresults()" /></span>
           </div>
 
 

maloja/web/jinja/admin_albumless.jinja

@@ -6,6 +6,8 @@
 Here you can find tracks that currently have no album.<br/><br/>
 
 {% with list = dbc.get_tracks_without_album() %}
+You have {{list|length}} tracks with no album.<br/><br/>
+
 {% include 'partials/list_tracks.jinja' %}
 {% endwith %}
 

maloja/web/jinja/admin_overview.jinja

@@ -67,9 +67,9 @@
 		<li>manually scrobble from track pages</li>
 		<li>delete scrobbles</li>
 		<li>reparse scrobbles</li>
-		<li>edit tracks and artists</li>
-		<li>merge tracks and artists</li>
-		<li>upload artist and track art by dropping a file on the existing image on an artist or track page</li>
+		<li>edit tracks, albums and artists</li>
+		<li>merge tracks, albums and artists</li>
+		<li>upload artist, album and track art by dropping a file on the existing image on an artist or track page</li>
 		<li>see more detailed error pages</li>
 	</ul>
 

maloja/web/jinja/admin_setup.jinja

@@ -56,7 +56,7 @@
 
 	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.
 	<br/><br/>
-	You can also use any standard-compliant scrobbler. For GNUFM (audioscrobbler) scrobblers, enter <span class="stats"><span name="serverurl">yourserver.tld</span>/apis/audioscrobbler</span> as your Gnukebox server and your API key as the password. For Listenbrainz scrobblers, use <span class="stats"><span name="serverurl">yourserver.tld</span>/apis/listenbrainz</span> as the API URL and your API key as token.
+	You can also use any standard-compliant scrobbler. For GNUFM (audioscrobbler) scrobblers, enter <span class="stats"><span name="serverurl">yourserver.tld</span>/apis/audioscrobbler</span> as your Gnukebox server and your API key as the password. For Listenbrainz scrobblers, use <span class="stats"><span name="serverurl">yourserver.tld</span>/apis/listenbrainz</span> as the API URL (depending on the implementation, you might need to add a <span class="stats">/1</span> at the end) and your API key as token.
 	<br/><br/>
 	If you use another browser or another music player, you could try to code your own extension. The API is super simple! Just send a POST HTTP request to
 

maloja/web/jinja/error.jinja

@@ -8,8 +8,8 @@
 				<div style="background-image:url('/favicon.png')"></div>
 			</td>
 			<td class="text">
-				<h1>{{ error_desc }}</h1><br/>
-				{{ error_full_desc }}
+				<h1>{{ error_desc | e }}</h1><br/>
+				{{ error_full_desc | e }}
 
 			</td>
 		</tr>

maloja/web/jinja/partials/album_showcase.jinja

@@ -29,7 +29,7 @@
 {% for entry in dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':False}) %}
 
 
-{% if artist not in (entry.album.artists or []) %}
+{% if info.artist not in (entry.album.artists or []) %}
 
 {%- set cert = None -%}
 {%- if entry.scrobbles >= settings.scrobbles_gold_album -%}{% set cert = 'gold' %}{%- endif -%}

maloja/web/jinja/partials/awards_album.jinja

@@ -63,7 +63,7 @@
 	{%- if e.scrobbles >= settings.scrobbles_diamond -%}{% set cert = 'diamond' %}{%- endif -%}
 
 	{%- if cert -%}
-	<a href='{{ links.url(e.track) }}' class="hidelink certified certified_{{ cert }} smallcerticon" title="{{ e.track.title }} has reached {{ cert.capitalize() }} status">
+	<a href='{{ links.url(e.track) }}' class="hidelink certified certified_{{ cert }} smallcerticon" title="{{ e.track.title | e }} has reached {{ cert.capitalize() }} status">
 	    {% include 'icons/cert_track.jinja' %}
 	</a>
 	{%- endif %}

maloja/web/jinja/partials/awards_artist.jinja

@@ -72,7 +72,7 @@
 	{%- if e.scrobbles >= settings.scrobbles_diamond_album -%}{% set cert = 'diamond' %}{%- endif -%}
 
 	{%- if cert -%}
-	<a href='{{ links.url(e.album) }}' class="hidelink certified certified_{{ cert }} smallcerticon" title="{{ e.album.albumtitle }} has reached {{ cert.capitalize() }} status">
+	<a href='{{ links.url(e.album) }}' class="hidelink certified certified_{{ cert }} smallcerticon" title="{{ e.album.albumtitle | e }} has reached {{ cert.capitalize() }} status">
     	    {% include 'icons/cert_album.jinja' %}
     	</a>
 	{%- endif %}
@@ -87,7 +87,7 @@
 	{%- if e.scrobbles >= settings.scrobbles_diamond -%}{% set cert = 'diamond' %}{%- endif -%}
 
 	{%- if cert -%}
-	<a href='{{ links.url(e.track) }}' class="hidelink certified certified_{{ cert }} smallcerticon" title="{{ e.track.title }} has reached {{ cert.capitalize() }} status">
+	<a href='{{ links.url(e.track) }}' class="hidelink certified certified_{{ cert }} smallcerticon" title="{{ e.track.title | e }} has reached {{ cert.capitalize() }} status">
     	    {% include 'icons/cert_track.jinja' %}
     	</a>
 	{%- endif %}

maloja/web/jinja/partials/charts_albums_tiles.jinja

@@ -16,10 +16,14 @@
 		{% if entry is not none %}
 			{% set album = entry.album %}
 			{% set rank = entry.rank %}
+			{% set scrobbles = entry.scrobbles %}
 			<div class="tile">
 			<a href="{{ links.url(album) }}">
 				<div class="lazy" data-bg="{{ images.get_album_image(album) }}"'>
 					<span class='stats'>#{{ rank }}</span> <span>{{ album.albumtitle }}</span>
+					{% if settings['SHOW_PLAY_NUMBER_ON_TILES'] %}
+						<p class="scrobbles"><span>{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}</span> </p>
+					{% endif %}
 				</div>
 			</a>
 			</div>

maloja/web/jinja/partials/charts_artists_tiles.jinja

@@ -16,10 +16,14 @@
 		{% if entry is not none %}
 			{% set artist = entry.artist %}
 			{% set rank = entry.rank %}
+			{% set scrobbles = entry.scrobbles %}
 			<div class="tile">
 			<a href="{{ links.url(artist) }}">
 				<div class="lazy" data-bg="{{ images.get_artist_image(artist) }}"'>
-					<span class='stats'>#{{ rank }}</span> <span>{{ artist }}</span>
+					<span class='stats'>#{{ rank }}</span> <span>{{ artist }}</span> 
+					{% if settings['SHOW_PLAY_NUMBER_ON_TILES'] %}
+						<p class="scrobbles"><span>{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}</span> </p>
+					{% endif %}
 				</div>
 			</a>
 			</div>

maloja/web/jinja/partials/charts_tracks_tiles.jinja

@@ -16,10 +16,14 @@
 		{% if entry is not none %}
 			{% set track = entry.track %}
 			{% set rank = entry.rank %}
+			{% set scrobbles = entry.scrobbles %}
 			<div class="tile">
 			<a href="{{ links.url(track) }}">
 				<div class="lazy" data-bg="{{ images.get_track_image(track) }}"'>
 					<span class='stats'>#{{ rank }}</span> <span>{{ track.title }}</span>
+					{% if settings['SHOW_PLAY_NUMBER_ON_TILES'] %}
+						<p class="scrobbles"><span>{{ scrobbles }} {{ 'play' if scrobbles == 1 else 'plays' }}</span> </p>
+					{% endif %}
 				</div>
 			</a>
 			</div>

maloja/web/jinja/snippets/entityrow.jinja

@@ -20,11 +20,11 @@
 		<td class='searchProvider'>{{ links.link_search(entity) }}</td>
 	{% endif %}
 	<td class='track'>
-		<span class='artist_in_trackcolumn'>{{ links.links(entity.artists) }}</span> – {{ links.link(entity) }}
+		<span class='artist_in_trackcolumn'>{{ links.links(entity.artists, restrict_amount=True) }}</span> – {{ links.link(entity) }}
 	</td>
 {% elif entity is mapping and 'albumtitle' in entity %}
 	<td class='album'>
-		<span class='artist_in_trackcolumn'>{{ links.links(entity.artists) }}</span> – {{ links.link(entity) }}
+		<span class='artist_in_albumcolumn'>{{ links.links(entity.artists, restrict_amount=True) }}</span> – {{ links.link(entity) }}
 	</td>
 {% else %}
 	<td class='artist'>{{ links.link(entity) }}

maloja/web/jinja/snippets/links.jinja

@@ -8,9 +8,11 @@
 	<a href="{{ url(entity) }}">{{ name | e }}</a>
 {%- endmacro %}
 
-{% macro links(entities) -%}
+{% macro links(entities, restrict_amount=False) -%}
 	{% if entities is none or entities == [] %}
 		{{ settings["DEFAULT_ALBUM_ARTIST"] }}
+	{% elif entities.__len__() > 3 and restrict_amount %}
+	    {{ link(entities[0]) }} et al.
 	{% else %}
 		{% for entity in entities -%}
 			{{ link(entity) }}{{ ", " if not loop.last }}

maloja/web/static/css/maloja.css

@@ -363,12 +363,14 @@ div#notification_area {
 	right:20px;
 }
 div#notification_area div.notification {
-	background-color:white;
+	background-color:black;
 	width:400px;
 	min-height:50px;
 	margin-bottom:7px;
 	padding:9px;
-	opacity:0.4;
+	opacity:0.5;
+	border-left: 8px solid var(--notification-color);
+	border-radius: 3px;
 }
 div#notification_area div.notification:hover {
 	opacity:0.95;
@@ -781,6 +783,9 @@ table.list td.artists,td.artist,td.title,td.track {
 table.list td.track span.artist_in_trackcolumn {
 	color: var(--text-color-secondary);
 }
+table.list td.album span.artist_in_albumcolumn {
+	color: var(--text-color-secondary);
+}
 
 table.list td.searchProvider {
 	width: 20px;
@@ -987,6 +992,7 @@ table.misc td {
 
 
 div.tiles {
+    max-height: 600px;
 	display: grid;
 	grid-template-columns: repeat(18, calc(100% / 18));
 	grid-template-rows: repeat(6, calc(100% / 6));
@@ -1069,6 +1075,12 @@ div.tiles span {
         overflow-wrap: anywhere;
 }
 
+div.tiles p.scrobbles {
+	margin: 0;
+	top:100%;
+	position: sticky;
+}
+
 div.tiles a:hover {
 	text-decoration: none;
 }

maloja/web/static/css/startpage.css

@@ -22,8 +22,8 @@ div#startpage {
 
 @media (min-width: 1401px) and (max-width: 2200px) {
 	div#startpage {
-		grid-template-columns: 45vw 45vw;
-		grid-template-rows: 45vh 45vh 45vh;
+		grid-template-columns: repeat(2, 45vw);
+		grid-template-rows: repeat(3, 45vh);
 
 		grid-template-areas:
 			"charts_artists lastscrobbles"

maloja/web/static/js/manualscrobble.js

@@ -126,7 +126,7 @@ function scrobble(artists,title,albumartists,album,timestamp) {
 	lastArtists = artists;
 	lastTrack = title;
 	lastAlbum = album;
-	lastAlbumartists = albumartists;
+	lastAlbumartists = albumartists || [];
 
 	var payload = {
 		"artists":artists,

maloja/web/static/js/notifications.js

@@ -1,12 +1,14 @@
 // JS for feedback to the user whenever any XHTTP action is taken
 
 const colors = {
-	'warning':'red',
+    'error': 'red',
+	'warning':'#8ACC26',
 	'info':'green'
 }
 
+
 const notification_template = info => `
-	<div class="notification" style="background-color:${colors[info.notification_type]};">
+	<div class="notification" style="--notification-color: ${colors[info.notification_type]};">
 		<b>${info.title}</b><br/>
 		<span>${info.body}</span>
 
@@ -35,18 +37,24 @@ function notify(title,msg,notification_type='info',reload=false) {
 }
 
 function notifyCallback(request) {
-	var body = request.response;
+	var response = request.response;
 	var status = request.status;
 
 	if (status == 200) {
-		var notification_type = 'info';
+	    if (response.hasOwnProperty('warnings') && response.warnings.length > 0) {
+	        var notification_type = 'warning';
+	    }
+	    else {
+	        var notification_type = 'info';
+	    }
+
 		var title = "Success!";
-		var msg = body.desc || body;
+		var msg = response.desc || response;
 	}
 	else {
-		var notification_type = 'warning';
-		var title = "Error: " + body.error.type;
-		var msg = body.error.desc || "";
+		var notification_type = 'error';
+		var title = "Error: " + response.error.type;
+		var msg = response.error.desc || "";
 	}
 
 

{malojaserver-3.2.1.dist-info → malojaserver-3.2.3.dist-info}/METADATA

@@ -1,17 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: malojaserver
-Version: 3.2.1
+Version: 3.2.3
 Summary: Self-hosted music scrobble database
 Keywords: scrobbling,music,selfhosted,database,charts,statistics
 Author-email: Johannes Krattenmacher <maloja@dev.krateng.ch>
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Requires-Dist: bottle>=0.12.16
 Requires-Dist: waitress>=2.1.0
-Requires-Dist: doreah>=1.9.4, <2
+Requires-Dist: doreah>=2.0.1, <3
 Requires-Dist: nimrodel>=0.8.0
 Requires-Dist: setproctitle>=1.1.10
 Requires-Dist: jinja2>=3.0.0
@@ -21,6 +21,8 @@ Requires-Dist: sqlalchemy>=2.0
 Requires-Dist: python-datauri>=1.1.0
 Requires-Dist: requests>=2.27.1
 Requires-Dist: setuptools>68.0.0
+Requires-Dist: toml>=0.10.2
+Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: pyvips>=2.1 ; extra == "full"
 Project-URL: documentation, https://github.com/krateng/maloja
 Project-URL: homepage, https://github.com/krateng/maloja
@@ -69,15 +71,8 @@ You can check [my own Maloja page](https://maloja.krateng.ch) as an example inst
 
 ## How to install
 
-### Requirements
-
-Maloja should run on any x86 or ARM machine that runs Python.
-
-It is highly recommended to use **Docker** or **Podman**.
-
-Your CPU should have a single core passmark score of at the very least 1500. 500 MB RAM should give you a decent experience, but performance will benefit greatly from up to 2 GB.
-
-### Docker / Podman
+To avoid issues with version / dependency mismatches, Maloja should only be used in **Docker** or **Podman**, not on bare metal.
+I cannot offer any help for bare metal installations.
 
 Pull the [latest image](https://hub.docker.com/r/krateng/maloja) or check out the repository and use the included Containerfile.
 
@@ -96,11 +91,7 @@ An example of a minimum run configuration to access maloja via `localhost:42010`
 	docker run -p 42010:42010 -v $PWD/malojadata:/mljdata -e MALOJA_DATA_DIRECTORY=/mljdata krateng/maloja
 ```
 
-#### Linux Host
-
-**NOTE:** If you are using [rootless containers with Podman](https://developers.redhat.com/blog/2020/09/25/rootless-containers-with-podman-the-basics#why_podman_) this DOES NOT apply to you.
-
-If you are running Docker on a **Linux Host** you should specify `user:group` ids of the user who owns the folder on the host machine bound to `MALOJA_DATA_DIRECTORY` in order to avoid [docker file permission problems.](https://ikriv.com/blog/?p=4698) These can be specified using the [environmental variables **PUID** and **PGID**.](https://docs.linuxserver.io/general/understanding-puid-and-pgid)
+If you are using [rootless containers with Podman](https://developers.redhat.com/blog/2020/09/25/rootless-containers-with-podman-the-basics#why_podman_) the following DOES NOT apply to you, but if you are running **Docker** on a **Linux Host** you should specify `user:group` ids of the user who owns the folder on the host machine bound to `MALOJA_DATA_DIRECTORY` in order to avoid [docker file permission problems.](https://ikriv.com/blog/?p=4698) These can be specified using the [environmental variables **PUID** and **PGID**.](https://docs.linuxserver.io/general/understanding-puid-and-pgid)
 
 To get the UID and GID for the current user run these commands from a terminal:
 
@@ -113,33 +104,6 @@ The modified run command with these variables would look like:
 	docker run -e PUID=1000 -e PGID=1001 -p 42010:42010 -v $PWD/malojadata:/mljdata -e MALOJA_DATA_DIRECTORY=/mljdata krateng/maloja
 ```
 
-### PyPI
-
-You can install Maloja with
-
-```console
-	pip install malojaserver
-```
-
-To make sure all dependencies are installed, you can also use one of the included scripts in the `install` folder.
-
-### From Source
-
-Clone this repository and enter the directory with
-
-```console
-	git clone https://github.com/krateng/maloja
-	cd maloja
-```
-
-Then install all the requirements and build the package, e.g.:
-
-```console
-	sh ./install/install_dependencies_alpine.sh
-	pip install -r requirements.txt
-	pip install .
-```
-
 
 ### Extras
 
@@ -160,7 +124,7 @@ When not running in a container, you can run the application with `maloja run`.
 
 If you would like to import your previous scrobbles, use the command `maloja import *filename*`. This works on:
 
-* a Last.fm export generated by [benfoxall's website](https://benjaminbenben.com/lastfm-to-csv/) ([GitHub page](https://github.com/benfoxall/lastfm-to-csv))
+* a Last.fm export generated by [ghan64's website](https://lastfm.ghan.nl/export/)
 * an official [Spotify data export file](https://www.spotify.com/us/account/privacy/)
 * an official [ListenBrainz export file](https://listenbrainz.org/profile/export/)
 * the export of another Maloja instance