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

maloja/dev/profiler.py

@@ -1,9 +1,9 @@
 import os
 
 import cProfile, pstats
+import time
 
 from doreah.logging import log
-from doreah.timing import Clock
 
 from ..pkg_global.conf import data_dir
 
@@ -27,8 +27,7 @@ def profile(func):
 
 	def newfunc(*args,**kwargs):
 
-		clock = Clock()
-		clock.start()
+		starttime = time.time()
 
 		if FULL_PROFILE:
 			benchmarkfolder = data_dir['logs']("benchmarks")
@@ -44,7 +43,7 @@ def profile(func):
 		if FULL_PROFILE:
 			localprofiler.disable()
 
-		seconds = clock.stop()
+		seconds = time.time() - starttime
 
 		if not SINGLE_CALLS:
 			times.setdefault(realfunc,[]).append(seconds)

maloja/images.py

@@ -284,6 +284,12 @@ def image_request(artist_id=None,track_id=None,album_id=None):
 		if result is not None:
 			# we got an entry, even if it's that there is no image (value None)
 			if result['value'] is None:
+				# fallback to album regardless of setting (because we have no image)
+				if track_id:
+					track = database.sqldb.get_track(track_id)
+					if track.get("album"):
+						album_id = database.sqldb.get_album_id(track["album"])
+						return image_request(album_id=album_id)
 				# use placeholder
 				if malojaconfig["FANCY_PLACEHOLDER_ART"]:
 					placeholder_url = "https://generative-placeholders.glitch.me/image?width=300&height=300&style="

maloja/malojauri.py

@@ -29,6 +29,8 @@ def uri_to_internal(keys,accepted_entities=('artist','track','album'),forceTrack
 
 	# 1
 	filterkeys = {}
+	# this only takes care of the logic - what kind of entity we're dealing with
+	# it does not check with the database if it exists or what the canonical name is!!!
 	if "track" in accepted_entities and "title" in keys:
 		filterkeys.update({"track":{"artists":keys.getall("trackartist"),"title":keys.get("title")}})
 	if "artist" in accepted_entities and "artist" in keys:

maloja/pkg_global/conf.py

@@ -1,4 +1,7 @@
 import os
+
+import doreah.auth
+import doreah.logging
 from doreah.configuration import Configuration
 from doreah.configuration import types as tp
 
@@ -29,9 +32,7 @@ pthj = os.path.join
 def is_dir_usable(pth):
 	try:
 		os.makedirs(pth,exist_ok=True)
-		os.mknod(pthj(pth,".test"))
-		os.remove(pthj(pth,".test"))
-		return True
+		return os.access(pth,os.W_OK)
 	except Exception:
 		return False
 
@@ -179,7 +180,7 @@ malojaconfig = Configuration(
 			"name":(tp.String(),												"Name",							"Generic Maloja User")
 		},
 		"Third Party Services":{
-			"metadata_providers":(tp.List(tp.String()),							"Metadata Providers",			['lastfm','spotify','deezer','audiodb','musicbrainz'],	"Which metadata providers should be used in what order. Musicbrainz is rate-limited and should not be used first."),
+			"metadata_providers":(tp.List(tp.String()),							"Metadata Providers",			['lastfm','spotify','deezer','audiodb','musicbrainz'],	"List of which metadata providers should be used in what order. Musicbrainz is rate-limited and should not be used first."),
 			"scrobble_lastfm":(tp.Boolean(),									"Proxy-Scrobble to Last.fm",	False),
 			"lastfm_api_key":(tp.String(),										"Last.fm API Key",				None),
 			"lastfm_api_secret":(tp.String(),									"Last.fm API Secret",			None),
@@ -310,6 +311,12 @@ data_directories = {
 }
 
 for identifier,path in data_directories.items():
+	if path is None:
+		continue
+
+	if malojaconfig.readonly and (path == dir_settings['config'] or path.startswith(dir_settings['config']+'/')):
+		continue
+
 	try:
 		os.makedirs(path,exist_ok=True)
 		if not is_dir_usable(path): raise PermissionError(f"Directory {path} is not usable!")
@@ -320,41 +327,35 @@ for identifier,path in data_directories.items():
 			print("Cannot use",path,"for cache, finding new folder...")
 			data_directories['cache'] = dir_settings['cache'] = malojaconfig['DIRECTORY_CACHE'] = find_good_folder('cache')
 		else:
-			print("Directory",path,"is not usable.")
+			print(f"Directory for {identifier} ({path}) is not writeable.")
 			print("Please change permissions or settings!")
+			print("Make sure Maloja has write and execute access to this directory.")
 			raise
 
+class DataDirs:
+	def __init__(self, dirs):
+		self.dirs = dirs
 
-data_dir = {
-	k:lambda *x,k=k: pthj(data_directories[k],*x)  for k in data_directories
-}
-
-
+	def __getitem__(self, key):
+		return lambda *x, k=key: pthj(self.dirs[k], *x)
 
-### DOREAH CONFIGURATION
+data_dir = DataDirs(data_directories)
 
-from doreah import config
-
-config(
-	auth={
-		"multiuser":False,
-		"cookieprefix":"maloja",
-		"stylesheets":["/maloja.css"],
-		"dbfile":data_dir['auth']("auth.ddb")
-	},
-	logging={
-		"logfolder": data_dir['logs']() if malojaconfig["LOGGING"] else None
-	},
-	regular={
-		"offset": malojaconfig["TIMEZONE"]
-	}
-)
+### DOREAH OBJECTS
 
+auth = doreah.auth.AuthManager(singleuser=True,cookieprefix='maloja',stylesheets=("/maloja.css",),dbfile=data_dir['auth']("auth.sqlite"))
 
+#logger = doreah.logging.Logger(logfolder=data_dir['logs']() if malojaconfig["LOGGING"] else None)
+#log = logger.log
 
+# this is not how its supposed to be done, but lets ease the transition
+doreah.logging.defaultlogger.logfolder = data_dir['logs']() if malojaconfig["LOGGING"] else None
 
 
-custom_css_files = [f for f in os.listdir(data_dir['css']()) if f.lower().endswith('.css')]
+try:
+	custom_css_files = [f for f in os.listdir(data_dir['css']()) if f.lower().endswith('.css')]
+except FileNotFoundError:
+	custom_css_files = []
 
 from ..database.sqldb import set_maloja_info
 set_maloja_info({'last_run_version':VERSION})

maloja/proccontrol/tasks/export.py

@@ -12,11 +12,12 @@ def export(targetfolder=None):
 		targetfolder = os.getcwd()
 
 	timestr = time.strftime("%Y_%m_%d_%H_%M_%S")
+	timestamp = int(time.time()) # ok this is technically a separate time get from above, but those ms are not gonna matter, and im too lazy to change it all to datetime
 	filename = f"maloja_export_{timestr}.json"
 	outputfile = os.path.join(targetfolder,filename)
 	assert not os.path.exists(outputfile)
 
-	data = {'scrobbles':get_scrobbles()}
+	data = {'maloja':{'export_time': timestamp },'scrobbles':get_scrobbles()}
 	with open(outputfile,'w') as outfd:
 		json.dump(data,outfd,indent=3)
 

maloja/proccontrol/tasks/import_scrobbles.py

@@ -32,37 +32,53 @@ def import_scrobbles(inputf):
 	}
 
 	filename = os.path.basename(inputf)
+	importfunc = None
 
-	if re.match(r".*\.csv",filename):
-		typeid,typedesc = "lastfm","Last.fm"
+
+	if re.match(r".*\.csv", filename):
+		typeid,typedesc = "lastfm", "Last.fm (benjaminbenben export)"
 		importfunc = parse_lastfm
 
-	elif re.match(r"Streaming_History_Audio.+\.json",filename):
-		typeid,typedesc = "spotify","Spotify"
+	elif re.match(r"Streaming_History_Audio.+\.json", filename):
+		typeid,typedesc = "spotify", "Spotify"
 		importfunc = parse_spotify_lite
 
-	elif re.match(r"endsong_[0-9]+\.json",filename):
-		typeid,typedesc = "spotify","Spotify"
+	elif re.match(r"endsong_[0-9]+\.json", filename):
+		typeid,typedesc = "spotify", "Spotify"
 		importfunc = parse_spotify
 
-	elif re.match(r"StreamingHistory[0-9]+\.json",filename):
-		typeid,typedesc = "spotify","Spotify"
+	elif re.match(r"StreamingHistory[0-9]+\.json", filename):
+		typeid,typedesc = "spotify", "Spotify"
 		importfunc = parse_spotify_lite_legacy
 
-	elif re.match(r"maloja_export[_0-9]*\.json",filename):
-		typeid,typedesc = "maloja","Maloja"
+	elif re.match(r"maloja_export[_0-9]*\.json", filename):
+		typeid,typedesc = "maloja", "Maloja"
 		importfunc = parse_maloja
 
 	# username_lb-YYYY-MM-DD.json
-	elif re.match(r".*_lb-[0-9-]+\.json",filename):
-		typeid,typedesc = "listenbrainz","ListenBrainz"
+	elif re.match(r".*_lb-[0-9-]+\.json", filename):
+		typeid,typedesc = "listenbrainz", "ListenBrainz"
 		importfunc = parse_listenbrainz
 
-	elif re.match(r"\.scrobbler\.log",filename):
-		typeid,typedesc = "rockbox","Rockbox"
+	elif re.match(r"\.scrobbler\.log", filename):
+		typeid,typedesc = "rockbox", "Rockbox"
 		importfunc = parse_rockbox
 
-	else:
+	elif re.match(r"recenttracks-.*\.json", filename):
+		typeid, typedesc = "lastfm", "Last.fm (ghan export)"
+		importfunc = parse_lastfm_ghan
+
+	elif re.match(r".*\.json",filename):
+		try:
+			with open(filename,'r') as fd:
+				data = json.load(fd)
+			if 'maloja' in data:
+				typeid,typedesc = "maloja","Maloja"
+				importfunc = parse_maloja
+		except Exception:
+			pass
+
+	if not importfunc:
 		print("File",inputf,"could not be identified as a valid import source.")
 		return result
 
@@ -131,6 +147,7 @@ def import_scrobbles(inputf):
 
 	return result
 
+
 def parse_spotify_lite_legacy(inputf):
 	pth = os.path
 	# use absolute paths internally for peace of mind. just change representation for console output
@@ -243,6 +260,7 @@ def parse_spotify_lite(inputf):
 
 		print()
 
+
 def parse_spotify(inputf):
 	pth = os.path
 	# use absolute paths internally for peace of mind. just change representation for console output
@@ -354,6 +372,7 @@ def parse_spotify(inputf):
 
 		print()
 
+
 def parse_lastfm(inputf):
 
 	with open(inputf,'r',newline='') as inputfd:
@@ -388,6 +407,29 @@ def parse_lastfm(inputf):
 				yield ('FAIL',None,f"{row} (Line {line}) could not be parsed. Scrobble not imported. ({repr(e)})")
 				continue
 
+
+def parse_lastfm_ghan(inputf):
+	with open(inputf, 'r') as inputfd:
+		data = json.load(inputfd)
+
+	skip = 50000
+	for entry in data:
+		for track in entry['track']:
+			skip -= 1
+			#if skip: continue
+			#print(track)
+			#input()
+
+			yield ('CONFIDENT_IMPORT', {
+				'track_title': track['name'],
+				'track_artists': track['artist']['#text'],
+				'track_length': None,
+				'album_name': track['album']['#text'],
+				'scrobble_time': int(track['date']['uts']),
+				'scrobble_duration': None
+			}, '')
+
+
 def parse_listenbrainz(inputf):
 
 	with open(inputf,'r') as inputfd:

maloja/server.py

@@ -12,14 +12,13 @@ from jinja2.exceptions import TemplateNotFound
 
 # doreah toolkit
 from doreah.logging import log
-from doreah import auth
 
 # rest of the project
 from . import database
 from .database.jinjaview import JinjaDBConnection
 from .images import image_request
 from .malojauri import uri_to_internal, remove_identical
-from .pkg_global.conf import malojaconfig, data_dir
+from .pkg_global.conf import malojaconfig, data_dir, auth
 from .pkg_global import conf
 from .jinjaenv.context import jinja_environment
 from .apis import init_apis, apikeystore
@@ -97,7 +96,7 @@ aliases = {
 
 ### API
 
-auth.authapi.mount(server=webserver)
+conf.auth.authapi.mount(server=webserver)
 init_apis(webserver)
 
 # redirects for backwards compatibility
@@ -197,7 +196,7 @@ def jinja_page(name):
 	if name in aliases: redirect(aliases[name])
 	keys = remove_identical(FormsDict.decode(request.query))
 
-	adminmode = request.cookies.get("adminmode") == "true" and auth.check(request)
+	adminmode = request.cookies.get("adminmode") == "true" and auth.check_request(request)
 
 	with JinjaDBConnection() as conn:
 
@@ -222,7 +221,7 @@ def jinja_page(name):
 	return res
 
 @webserver.route("/<name:re:admin.*>")
-@auth.authenticated
+@auth.authenticated_function()
 def jinja_page_private(name):
 	return jinja_page(name)
 

maloja/setup.py

@@ -6,9 +6,8 @@ try:
 except ImportError:
 	import distutils
 from doreah.io import col, ask, prompt
-from doreah import auth
 
-from .pkg_global.conf import data_dir, dir_settings, malojaconfig
+from .pkg_global.conf import data_dir, dir_settings, malojaconfig, auth
 
 
 
@@ -25,6 +24,12 @@ ext_apikeys = [
 def copy_initial_local_files():
 	with resources.files("maloja") / 'data_files' as folder:
 		for cat in dir_settings:
+			if dir_settings[cat] is None:
+				continue
+
+			if cat == 'config' and malojaconfig.readonly:
+				continue
+
 			distutils.dir_util.copy_tree(os.path.join(folder,cat),dir_settings[cat],update=False)
 
 charset = list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
@@ -38,7 +43,6 @@ def setup():
 	SKIP = malojaconfig["SKIP_SETUP"]
 
 	try:
-
 		print("Various external services can be used to display images. If not enough of them are set up, only local images will be used.")
 		for k in ext_apikeys:
 			keyname = malojaconfig.get_setting_info(k)['name']
@@ -46,6 +50,8 @@ def setup():
 			if key is False:
 				print(f"\tCurrently not using a {col['red'](keyname)} for image display.")
 			elif key is None or key == "ASK":
+				if malojaconfig.readonly:
+					continue
 				promptmsg = f"\tPlease enter your {col['gold'](keyname)}. If you do not want to use one at this moment, simply leave this empty and press Enter."
 				key = prompt(promptmsg,types=(str,),default=False,skip=SKIP)
 				malojaconfig[k] = key
@@ -67,10 +73,10 @@ def setup():
 
 		if forcepassword is not None:
 			# user has specified to force the pw, nothing else matters
-			auth.defaultuser.setpw(forcepassword)
+			auth.change_pw(password=forcepassword)
 			print("Password has been set.")
-		elif auth.defaultuser.checkpw("admin"):
-			# if the actual pw is admin, it means we've never set this up properly (eg first start after update)
+		elif auth.still_has_factory_default_user():
+			# this means we've never set this up properly (eg first start after update)
 			while True:
 				newpw = prompt("Please set a password for web backend access. Leave this empty to generate a random password.",skip=SKIP,secret=True)
 				if newpw is None:
@@ -81,7 +87,7 @@ def setup():
 					newpw_repeat = prompt("Please type again to confirm.",skip=SKIP,secret=True)
 					if newpw != newpw_repeat: print("Passwords do not match!")
 					else: break
-			auth.defaultuser.setpw(newpw)
+			auth.change_pw(password=newpw)
 
 	except EOFError:
 		print("No user input possible. If you are running inside a container, set the environment variable",col['yellow']("MALOJA_SKIP_SETUP=yes"))

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/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/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));

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 || "";
 	}