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

maloja/__main__.py

@@ -26,77 +26,6 @@ def print_header_info():
 	#print("#####")
 	print()
 
-
-
-def get_instance():
-	try:
-		return int(subprocess.check_output(["pgrep","-f","maloja$"]))
-	except Exception:
-		return None
-
-def get_instance_supervisor():
-	try:
-		return int(subprocess.check_output(["pgrep","-f","maloja_supervisor"]))
-	except Exception:
-		return None
-
-def restart():
-	if stop():
-		start()
-	else:
-		print(col["red"]("Could not stop Maloja!"))
-
-def start():
-	if get_instance_supervisor() is not None:
-		print("Maloja is already running.")
-	else:
-		print_header_info()
-		setup()
-		try:
-			#p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
-			sp = subprocess.Popen(["python3","-m","maloja","supervisor"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
-			print(col["green"]("Maloja started!"))
-
-			port = conf.malojaconfig["PORT"]
-
-			print("Visit your server address (Port " + str(port) + ") to see your web interface. Visit /admin_setup to get started.")
-			print("If you're installing this on your local machine, these links should get you there:")
-			print("\t" + col["blue"]("http://localhost:" + str(port)))
-			print("\t" + col["blue"]("http://localhost:" + str(port) + "/admin_setup"))
-			return True
-		except Exception:
-			print("Error while starting Maloja.")
-			return False
-
-
-def stop():
-
-	for attempt in [(signal.SIGTERM,2),(signal.SIGTERM,5),(signal.SIGKILL,3),(signal.SIGKILL,5)]:
-
-		pid_sv = get_instance_supervisor()
-		pid = get_instance()
-
-		if pid is None and pid_sv is None:
-			print("Maloja stopped!")
-			return True
-
-		if pid_sv is not None:
-			os.kill(pid_sv,attempt[0])
-		if pid is not None:
-			os.kill(pid,attempt[0])
-
-		time.sleep(attempt[1])
-
-	return False
-
-
-
-
-
-
-	print("Maloja stopped!")
-	return True
-
 def onlysetup():
 	print_header_info()
 	setup()
@@ -109,24 +38,6 @@ def run_server():
 	from . import server
 	server.run_server()
 
-def run_supervisor():
-	setproctitle("maloja_supervisor")
-	while True:
-		log("Maloja is not running, starting...",module="supervisor")
-		try:
-			process = subprocess.Popen(
-			    ["python3", "-m", "maloja","run"],
-			    stdout=subprocess.DEVNULL,
-			    stderr=subprocess.DEVNULL,
-			)
-		except Exception as e:
-			log("Error starting Maloja: " + str(e),module="supervisor")
-		else:
-			try:
-				process.wait()
-			except Exception as e:
-				log("Maloja crashed: " + str(e),module="supervisor")
-
 def debug():
 	os.environ["MALOJA_DEV_MODE"] = 'true'
 	conf.malojaconfig.load_environment()
@@ -173,11 +84,7 @@ def main(*args,**kwargs):
 
 	actions = {
 		# server
-		"start":start,
-		"restart":restart,
-		"stop":stop,
 		"run":run_server,
-		"supervisor":run_supervisor,
 		"debug":debug,
 		"setup":onlysetup,
 		# admin scripts

maloja/__pkginfo__.py

@@ -4,7 +4,7 @@
 # you know what f*ck it
 # this is hardcoded for now because of that damn project / package name discrepancy
 # i'll fix it one day
-VERSION = "3.2.3"
+VERSION = "3.2.4"
 HOMEPAGE = "https://github.com/krateng/maloja"
 
 

maloja/apis/listenbrainz.py

@@ -3,7 +3,7 @@ from ._exceptions import *
 from .. import database
 import datetime
 from ._apikeys import apikeystore
-from ..database.exceptions import DuplicateScrobble
+from ..database.exceptions import DuplicateScrobble, DuplicateTimestamp
 
 from ..pkg_global.conf import malojaconfig
 
@@ -27,6 +27,7 @@ class Listenbrainz(APIHandler):
 			InvalidMethodException: (200, {"code": 200, "error": "Invalid Method"}),
 			MalformedJSONException: (400, {"code": 400, "error": "Invalid JSON document submitted."}),
 			DuplicateScrobble: (200, {"status": "ok"}),
+			DuplicateTimestamp: (409, {"error": "Scrobble with the same timestamp already exists."}),
 			Exception: (500, {"code": 500, "error": "Unspecified server error."})
 		}
 

maloja/database/__init__.py

@@ -1,6 +1,8 @@
 # server
 from bottle import request, response, FormsDict
 
+from ..pkg_global import conf
+
 
 # decorator that makes sure this function is only run in normal operation,
 # not when we run a task that needs to access the database
@@ -932,6 +934,9 @@ def get_predefined_rulesets(dbconn=None):
 
 
 def start_db():
+
+	conf.AUX_MODE = True # that is, without a doubt, the worst python code you have ever seen
+
 	# Upgrade database
 	from .. import upgrade
 	upgrade.upgrade_db(sqldb.add_scrobbles)
@@ -941,8 +946,16 @@ def start_db():
 	from . import associated
 	associated.load_associated_rules()
 
+	# import scrobbles
+	from ..proccontrol.tasks.import_scrobbles import import_scrobbles #lmao this codebase is so fucked
+	for f in os.listdir(data_dir['import']()):
+		if f != 'dummy':
+			import_scrobbles(data_dir['import'](f))
+
 	dbstatus['healthy'] = True
 
+	conf.AUX_MODE = False # but you have seen it
+
 	# inform time module about begin of scrobbling
 	try:
 		firstscrobble = sqldb.get_scrobbles(limit=1)[0]

maloja/pkg_global/conf.py

@@ -298,6 +298,7 @@ data_directories = {
 	"auth":pthj(dir_settings['state'],"auth"),
 	"backups":pthj(dir_settings['state'],"backups"),
 	"images":pthj(dir_settings['state'],"images"),
+	"import":pthj(dir_settings['state'],"import"),
 	"scrobbles":pthj(dir_settings['state']),
 	"rules":pthj(dir_settings['config'],"rules"),
 	"clients":pthj(dir_settings['config']),

maloja/proccontrol/tasks/import_scrobbles.py

@@ -34,9 +34,12 @@ def import_scrobbles(inputf):
 	filename = os.path.basename(inputf)
 	importfunc = None
 
+	if re.match(r"recenttracks-.*\.csv", filename):
+		typeid, typedesc = "lastfm", "Last.fm (ghan CSV)"
+		importfunc = parse_lastfm_ghan_csv
 
-	if re.match(r".*\.csv", filename):
-		typeid,typedesc = "lastfm", "Last.fm (benjaminbenben export)"
+	elif re.match(r".*\.csv", filename):
+		typeid,typedesc = "lastfm", "Last.fm (benjaminbenben CSV)"
 		importfunc = parse_lastfm
 
 	elif re.match(r"Streaming_History_Audio.+\.json", filename):
@@ -65,8 +68,8 @@ def import_scrobbles(inputf):
 		importfunc = parse_rockbox
 
 	elif re.match(r"recenttracks-.*\.json", filename):
-		typeid, typedesc = "lastfm", "Last.fm (ghan export)"
-		importfunc = parse_lastfm_ghan
+		typeid, typedesc = "lastfm", "Last.fm (ghan JSON)"
+		importfunc = parse_lastfm_ghan_json
 
 	elif re.match(r".*\.json",filename):
 		try:
@@ -83,8 +86,8 @@ def import_scrobbles(inputf):
 		return result
 
 
-	print(f"Parsing {col['yellow'](inputf)} as {col['cyan'](typedesc)} export")
-	print("This could take a while...")
+	print(f"Parsing {col['yellow'](inputf)} as {col['cyan'](typedesc)} export.")
+	print(col['red']("Please double-check if this is correct - if the import fails, the file might have been interpreted as the wrong type."))
 
 	timestamps = set()
 	scrobblebuffer = []
@@ -154,21 +157,22 @@ def parse_spotify_lite_legacy(inputf):
 	inputf = pth.abspath(inputf)
 	inputfolder = pth.dirname(inputf)
 	filenames = re.compile(r'StreamingHistory[0-9]+\.json')
-	inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
+	#inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
+	inputfiles = [inputf]
 
-	if len(inputfiles) == 0:
-		print("No files found!")
-		return
+	#if len(inputfiles) == 0:
+	#	print("No files found!")
+	#	return
 
-	if inputfiles != [inputf]:
-		print("Spotify files should all be imported together to identify duplicates across the whole dataset.")
-		if not ask("Import " + ", ".join(col['yellow'](pth.basename(i)) for i in inputfiles) + "?",default=True):
-			inputfiles = [inputf]
-			print("Only importing", col['yellow'](pth.basename(inputf)))
+	#if inputfiles != [inputf]:
+	#	print("Spotify files should all be imported together to identify duplicates across the whole dataset.")
+	#	if not ask("Import " + ", ".join(col['yellow'](pth.basename(i)) for i in inputfiles) + "?",default=True):
+	#		inputfiles = [inputf]
+	#		print("Only importing", col['yellow'](pth.basename(inputf)))
 
 	for inputf in inputfiles:
 
-		print("Importing",col['yellow'](inputf),"...")
+		#print("Importing",col['yellow'](inputf),"...")
 		with open(inputf,'r') as inputfd:
 			data = json.load(inputfd)
 
@@ -207,21 +211,22 @@ def parse_spotify_lite(inputf):
 	inputf = pth.abspath(inputf)
 	inputfolder = pth.dirname(inputf)
 	filenames = re.compile(r'Streaming_History_Audio.+\.json')
-	inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
+	#inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
+	inputfiles = [inputf]
 
-	if len(inputfiles) == 0:
-		print("No files found!")
-		return
+	#if len(inputfiles) == 0:
+	#	print("No files found!")
+	#	return
 
-	if inputfiles != [inputf]:
-		print("Spotify files should all be imported together to identify duplicates across the whole dataset.")
-		if not ask("Import " + ", ".join(col['yellow'](pth.basename(i)) for i in inputfiles) + "?",default=True):
-			inputfiles = [inputf]
-			print("Only importing", col['yellow'](pth.basename(inputf)))
+	#if inputfiles != [inputf]:
+	#	print("Spotify files should all be imported together to identify duplicates across the whole dataset.")
+	#	if not ask("Import " + ", ".join(col['yellow'](pth.basename(i)) for i in inputfiles) + "?",default=True):
+	#		inputfiles = [inputf]
+	#		print("Only importing", col['yellow'](pth.basename(inputf)))
 
 	for inputf in inputfiles:
 
-		print("Importing",col['yellow'](inputf),"...")
+		#print("Importing",col['yellow'](inputf),"...")
 		with open(inputf,'r') as inputfd:
 			data = json.load(inputfd)
 
@@ -267,17 +272,18 @@ def parse_spotify(inputf):
 	inputf = pth.abspath(inputf)
 	inputfolder = pth.dirname(inputf)
 	filenames = re.compile(r'endsong_[0-9]+\.json')
-	inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
+	#inputfiles = [os.path.join(inputfolder,f) for f in os.listdir(inputfolder) if filenames.match(f)]
+	inputfiles = [inputf]
 
-	if len(inputfiles) == 0:
-		print("No files found!")
-		return
+	#if len(inputfiles) == 0:
+	#	print("No files found!")
+	#	return
 
-	if inputfiles != [inputf]:
-		print("Spotify files should all be imported together to identify duplicates across the whole dataset.")
-		if not ask("Import " + ", ".join(col['yellow'](pth.basename(i)) for i in inputfiles) + "?",default=True):
-			inputfiles = [inputf]
-			print("Only importing", col['yellow'](pth.basename(inputf)))
+	#if inputfiles != [inputf]:
+	#	print("Spotify files should all be imported together to identify duplicates across the whole dataset.")
+	#	if not ask("Import " + ", ".join(col['yellow'](pth.basename(i)) for i in inputfiles) + "?",default=True):
+	#		inputfiles = [inputf]
+	#		print("Only importing", col['yellow'](pth.basename(inputf)))
 
 	# we keep timestamps here as well to remove duplicates because spotify's export
 	# is messy - this is specific to this import type and should not be mixed with
@@ -288,7 +294,7 @@ def parse_spotify(inputf):
 
 	for inputf in inputfiles:
 
-		print("Importing",col['yellow'](inputf),"...")
+		#print("Importing",col['yellow'](inputf),"...")
 		with open(inputf,'r') as inputfd:
 			data = json.load(inputfd)
 
@@ -408,7 +414,7 @@ def parse_lastfm(inputf):
 				continue
 
 
-def parse_lastfm_ghan(inputf):
+def parse_lastfm_ghan_json(inputf):
 	with open(inputf, 'r') as inputfd:
 		data = json.load(inputfd)
 
@@ -430,6 +436,21 @@ def parse_lastfm_ghan(inputf):
 			}, '')
 
 
+def parse_lastfm_ghan_csv(inputf):
+	with open(inputf, 'r') as inputfd:
+		reader = csv.DictReader(inputfd)
+
+		for row in reader:
+			yield ('CONFIDENT_IMPORT', {
+				'track_title': row['track'],
+				'track_artists': row['artist'],
+				'track_length': None,
+				'album_name': row['album'],
+				'scrobble_time': int(row['uts']),
+				'scrobble_duration': None
+			}, '')
+
+
 def parse_listenbrainz(inputf):
 
 	with open(inputf,'r') as inputfd:

maloja/server.py

@@ -3,6 +3,7 @@ import os
 from threading import Thread
 from importlib import resources
 import time
+from magic import from_file
 
 
 # server stuff
@@ -154,7 +155,8 @@ def static_image(pth):
 
 @webserver.route("/cacheimages/<uuid>")
 def static_proxied_image(uuid):
-	return static_file(uuid,root=data_dir['cache']('images'))
+	mimetype = from_file(os.path.join(data_dir['cache']('images'),uuid),True)
+	return static_file(uuid,root=data_dir['cache']('images'),mimetype=mimetype)
 
 @webserver.route("/login")
 def login():
@@ -165,16 +167,16 @@ def login():
 @webserver.route("/media/<name>.<ext>")
 def static(name,ext):
 	assert ext in ["txt","ico","jpeg","jpg","png","less","js","ttf","css"]
-	with resources.files('maloja') / 'web' / 'static' as staticfolder:
-		response = static_file(ext + "/" + name + "." + ext,root=staticfolder)
+	staticfolder = resources.files('maloja') / 'web' / 'static'
+	response = static_file(ext + "/" + name + "." + ext,root=staticfolder)
 	response.set_header("Cache-Control", "public, max-age=3600")
 	return response
 
 # new, direct reference
 @webserver.route("/static/<path:path>")
 def static(path):
-	with resources.files('maloja') / 'web' / 'static' as staticfolder:
-		response = static_file(path,root=staticfolder)
+	staticfolder = resources.files('maloja') / 'web' / 'static'
+	response = static_file(path,root=staticfolder)
 	response.set_header("Cache-Control", "public, max-age=3600")
 	return response
 

maloja/setup.py

@@ -1,10 +1,9 @@
 import os
+import shutil
 
 from importlib import resources
-try:
-	from setuptools import distutils
-except ImportError:
-	import distutils
+from pathlib import PosixPath
+
 from doreah.io import col, ask, prompt
 
 from .pkg_global.conf import data_dir, dir_settings, malojaconfig, auth
@@ -22,21 +21,27 @@ 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
+	data_file_source = resources.files("maloja") / 'data_files'
+	for cat in dir_settings:
+		if dir_settings[cat] is None:
+			continue
+		if cat == 'config' and malojaconfig.readonly:
+			continue
 
-			if cat == 'config' and malojaconfig.readonly:
-				continue
+		# to avoid permission problems with the root dir
+		for subfolder in os.listdir(data_file_source / cat):
+			src = data_file_source / cat / subfolder
+			dst = PosixPath(dir_settings[cat]) / subfolder
+			if os.path.isdir(src):
+				shutil.copytree(src, dst, dirs_exist_ok=True)
 
-			distutils.dir_util.copy_tree(os.path.join(folder,cat),dir_settings[cat],update=False)
 
 charset = list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 def randomstring(length=32):
 	import random
 	return "".join(str(random.choice(charset)) for _ in range(length))
 
+
 def setup():
 
 	copy_initial_local_files()
@@ -51,10 +56,11 @@ def setup():
 				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
+					print(f"\tCurrently not using a {col['red'](keyname)} for image display - config is read only.")
+				else:
+					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
 			else:
 				print(f"\t{col['lawngreen'](keyname)} found.")
 

maloja/web/jinja/admin_issues.jinja

@@ -15,7 +15,7 @@
 
 
 			var xhttp = new XMLHttpRequest();
-			xhttp.open("POST","/api/newrule?", true);
+			xhttp.open("POST","/apis/mlj_1/newrule?", true);
 			xhttp.send(keys);
 			e = arguments[0];
 			line = e.parentNode;
@@ -25,7 +25,7 @@
 		function fullrebuild() {
 
 			var xhttp = new XMLHttpRequest();
-			xhttp.open("POST","/api/rebuild", true);
+			xhttp.open("POST","/apis/mlj_1/rebuild", true);
 			xhttp.send();
 			window.location = "/wait";
 

maloja/web/jinja/admin_setup.jinja

@@ -24,7 +24,7 @@
 			keys = "filename=" + encodeURIComponent(filename);
 			console.log(keys);
 			var xhttp = new XMLHttpRequest();
-			xhttp.open("POST","/api/importrules", true);
+			xhttp.open("POST","/apis/mlj_1/importrules", true);
 			xhttp.send(keys);
 
 			e.innerHTML = e.innerHTML.replace("Add","Remove");
@@ -36,7 +36,7 @@
 			keys = "remove&filename=" + encodeURIComponent(filename);
 
 			var xhttp = new XMLHttpRequest();
-			xhttp.open("POST","/api/importrules", true);
+			xhttp.open("POST","/apis/mlj_1/importrules", true);
 			xhttp.send(keys);
 
 			e.innerHTML = e.innerHTML.replace("Remove","Add");

maloja/web/static/js/manualscrobble.js

@@ -186,7 +186,7 @@ function search_manualscrobbling(searchfield) {
 	else {
 		xhttp = new XMLHttpRequest();
 		xhttp.onreadystatechange = searchresult_manualscrobbling;
-		xhttp.open("GET","/api/search?max=5&query=" + encodeURIComponent(txt), true);
+		xhttp.open("GET","/apis/mlj_1/search?max=5&query=" + encodeURIComponent(txt), true);
 		xhttp.send();
 	}
 }

maloja/web/static/js/search.js

@@ -1,17 +1,23 @@
-var searches = []
+var searches = [];
+var debounceTimer;
 
 function search(searchfield) {
-	txt = searchfield.value;
-	if (txt == "") {
-		reallyclear()
-	}
-	else {
-		xhttp = new XMLHttpRequest();
-		searches.push(xhttp)
-		xhttp.onreadystatechange = searchresult
-		xhttp.open("GET","/api/search?max=5&query=" + encodeURIComponent(txt), true);
-		xhttp.send();
-	}
+    clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(() => {
+        const txt = searchfield.value;
+        if (txt == "") {
+            reallyclear();
+        }
+        else {
+            const xhttp = new XMLHttpRequest();
+            searches.push(xhttp);
+            xhttp.onreadystatechange = searchresult
+            xhttp.open("GET","/apis/mlj_1/search?max=5&query=" + encodeURIComponent(txt), true);
+            xhttp.send();
+        }
+    }, 1000);
+
+
 }
 
 

maloja/web/static/js/upload.js

@@ -1,3 +1,3 @@
 function upload(encodedentity,b64) {
-	neo.xhttprequest("/api/addpicture?" + encodedentity,{"b64":b64},"POST")
+	neo.xhttprequest("/apis/mlj_1/addpicture?" + encodedentity,{"b64":b64},"POST")
 }

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

@@ -1,29 +1,29 @@
 Metadata-Version: 2.3
 Name: malojaserver
-Version: 3.2.3
+Version: 3.2.4
 Summary: Self-hosted music scrobble database
 Keywords: scrobbling,music,selfhosted,database,charts,statistics
 Author-email: Johannes Krattenmacher <maloja@dev.krateng.ch>
-Requires-Python: >=3.11
+Requires-Python: ==3.12.*
 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>=2.0.1, <3
-Requires-Dist: nimrodel>=0.8.0
-Requires-Dist: setproctitle>=1.1.10
-Requires-Dist: jinja2>=3.0.0
-Requires-Dist: lru-dict>=1.1.6
-Requires-Dist: psutil>=5.8.0
-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"
+Requires-Dist: bottle==0.13.*
+Requires-Dist: waitress==3.0.*
+Requires-Dist: doreah==2.0.*
+Requires-Dist: nimrodel==0.8.*
+Requires-Dist: setproctitle==1.3.*
+Requires-Dist: jinja2==3.1.*
+Requires-Dist: lru-dict==1.3.*
+Requires-Dist: psutil==5.9.*
+Requires-Dist: sqlalchemy==2.0
+Requires-Dist: python-datauri==3.0.*
+Requires-Dist: python-magic==0.4.*
+Requires-Dist: requests==2.32.*
+Requires-Dist: toml==0.10.*
+Requires-Dist: PyYAML==6.0.*
+Requires-Dist: pyvips==2.2.* ; extra == "full"
 Project-URL: documentation, https://github.com/krateng/maloja
 Project-URL: homepage, https://github.com/krateng/maloja
 Project-URL: repository, https://github.com/krateng/maloja
@@ -72,7 +72,7 @@ You can check [my own Maloja page](https://maloja.krateng.ch) as an example inst
 ## How to install
 
 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.
+I cannot offer any help for bare metal installations (but using venv should help).
 
 Pull the [latest image](https://hub.docker.com/r/krateng/maloja) or check out the repository and use the included Containerfile.
 
@@ -116,30 +116,18 @@ The modified run command with these variables would look like:
 
 ### Basic control
 
-When not running in a container, you can run the application with `maloja run`. You can also run it in the background with
-`maloja start` and `maloja stop`, but this might not be supported in the future.
+When not running in a container, you can run the application with `maloja run`.
 
 
 ### Data
 
-If you would like to import your previous scrobbles, use the command `maloja import *filename*`. This works on:
+If you would like to import your previous scrobbles, copy them into the import folder in your data directory. This works on:
 
 * 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
 
-⚠️ Never import your data while maloja is running. When you need to do import inside docker container start it in shell mode instead and perform import before starting the container as mentioned above.
-
-```console
-	docker run -it --entrypoint sh -v $PWD/malojadata:/mljdata -e MALOJA_DATA_DIRECTORY=/mljdata krateng/maloja
-	cd /mljdata
-	maloja import my_last_fm_export.csv
-```
-
-
-To backup your data, run `maloja backup`, optional with `--include_images`.
-
 ### Customization
 
 * Have a look at the [available settings](settings.md) and specifiy your choices in `/etc/maloja/settings.ini`. You can also set each of these settings as an environment variable with the prefix `MALOJA_` (e.g. `MALOJA_SKIP_SETUP`).

{malojaserver-3.2.3.dist-info → malojaserver-3.2.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 maloja/__init__.py,sha256=ZMck_-0sLKrjUCt5PTqxFEnJ5L5Qq6K0QSEHz-B_77s,110
-maloja/__main__.py,sha256=WcsL9heCrO_8wrhZWlZ21JCCq-TBLU7cWR93few-zlk,5606
-maloja/__pkginfo__.py,sha256=vQ6ApGGl5cENg3EAHGw2tD3g_5OsoSjraceN7XYiqw0,392
+maloja/__main__.py,sha256=jCdvg3zKYuCXsoesBBPFgisH-TOr5bzGXk-gm2dRwg0,3321
+maloja/__pkginfo__.py,sha256=rGbkAMCF8qB1ViE8X9Dw5TO1oV6ILoAVgONVoSugem8,392
 maloja/cleanup.py,sha256=bLwYYVtGPxnrZFQnl0vvbeBFrgwcbe-YJn5in9CDLwo,6889
 maloja/images.py,sha256=yz8XxP8WKMbcxSkuz7RXGhN2mr6K4RY4yaWpB-MLQnc,13455
 maloja/malojatime.py,sha256=dp-Q8ienlfxyFUyCQYK6H9wDx8VBrW70H0jCpLncuzs,16692
 maloja/malojauri.py,sha256=jbYsvpZjLlKz8kU3jNytzupsYxJf-V-HYsHSnUa6QBA,6482
-maloja/server.py,sha256=X7LSVBnmCZS22QnvOfr6FQDvg06c0qBgOOjPrFEx-n8,7318
-maloja/setup.py,sha256=hKEK31jiFTNEA1TvKZpJJ4cVK13OFWnjEGsGzLGwo0U,3157
+maloja/server.py,sha256=zwg_WnUoJvrgxHU8hH1r6xKBXLvxyWwHfxfhGtCBbN4,7423
+maloja/setup.py,sha256=LKWyJFfOGVhM2RRScsR_RuOyzkLBdf4ZF-6-GWtHqhc,3412
 maloja/upgrade.py,sha256=2OtUMobInRRFRN0p7znGkWZ0Dq0wbN29xi06EiKA2k8,3291
 maloja/apis/__init__.py,sha256=2EhXgqfFRcTo7-71dR20rZ4P1mW1g_LVmmkd0GT5bv4,1441
 maloja/apis/_apikeys.py,sha256=htt8bnwfhpmhJAXcldmyXTT1QFlYR7LxnT4vG6duxzY,751
@@ -14,7 +14,7 @@ maloja/apis/_base.py,sha256=fCe_8qVQQu_Cxp7VpbFZiIYuR805yRnOwPq-dRqGkeg,3192
 maloja/apis/_exceptions.py,sha256=LoTHoTkG_ZQDnUmKeF1ngENOY1hyzrUVYq05cOYJqgk,218
 maloja/apis/audioscrobbler.py,sha256=2gFSAMmA_9z5A3-8VVQ7dKb3hqe4dvwcMfti4l6uoMk,4097
 maloja/apis/audioscrobbler_legacy.py,sha256=pJIIK-MpNahAEzVjNyULcFsnRnFBAVskfS8432AvZs8,3507
-maloja/apis/listenbrainz.py,sha256=xkblyHEedY4hroTXWH4lrFtspvTqeogBhW1TS0WPtx0,3166
+maloja/apis/listenbrainz.py,sha256=5HEGv2Qd-Q6CpPI3DeoJUXW9kc85EDePMxWp0xBVl5Y,3279
 maloja/apis/native_v1.py,sha256=I_BkWM_mvo9fxtSRqbbjWBiQbdUieCDz1xB1lRC5xFE,26438
 maloja/data_files/cache/.maloja_cache_sentinel,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maloja/data_files/cache/images/dummy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -49,8 +49,8 @@ maloja/data_files/state/images/images.info,sha256=fnzMHHdpmWBRfZTXOFIYoMguunAyRO
 maloja/data_files/state/images/albums/dummy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maloja/data_files/state/images/artists/dummy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maloja/data_files/state/images/tracks/dummy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maloja/data_files/state/scrobbles/dummy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maloja/database/__init__.py,sha256=UuvbvLKuwYgysyNnjbYjOEGD5cmag4v_GcNFESsc4EE,31404
+maloja/data_files/state/import/dummy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+maloja/database/__init__.py,sha256=JdR4OGFI7byuboFKCo-X-1fw8516aAvjENdwEDQU-3U,31802
 maloja/database/associated.py,sha256=xde_CCDpHBSOOwgaNa7hc-4nH8PhKjdHQJaXIe3w4Wg,1680
 maloja/database/dbcache.py,sha256=TbppBv7NoMZcpmNycdoxKyQ3eNGGcg38THOF9GmsM2Q,4455
 maloja/database/exceptions.py,sha256=7e4n85Ed7fn-oECVy8oleX7PYjGoZMReUWiCRXI2lTI,1436
@@ -62,13 +62,13 @@ maloja/dev/generate.py,sha256=MlQYBts0f6OSVb063YxeDTWsODG49p-_aKRrRjm0PTY,2953
 maloja/dev/profiler.py,sha256=m2tagSaXe1ngGPdjmCZn7ZKEg2O9nr0qtCsUL6TJ2TI,1611
 maloja/jinjaenv/context.py,sha256=tVGVgW1g4LeYA5VmPlUmRy27fqV2tWb-bRTpJZcw8vk,3838
 maloja/jinjaenv/filters.py,sha256=IgUB4PeqvEqY1UpXwfmLyEvQVTMn6vYAav0L_6aY8_s,1477
-maloja/pkg_global/conf.py,sha256=kkDVG1qURdFFBRm1uMJaCebA5Jaw_9i2JcTb3TK-WfA,17246
+maloja/pkg_global/conf.py,sha256=qjZ61n5Abbysdgf_EHUWXmu-tEUyrh0Dves40OOpdqE,17294
 maloja/pkg_global/monkey.py,sha256=ocxp6wpyYuUcdF4g4Tz2Pmo_pysxYrmWunOPEw8cZrU,585
 maloja/proccontrol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maloja/proccontrol/tasks/__init__.py,sha256=-DRlzLIkYqbeDCWPaFXleOcceGXj-OUQWm6_4T8s1ds,166
 maloja/proccontrol/tasks/backup.py,sha256=sLqrX5Zzf7vYfsv4YG7yv0WS7E55gggo-nIxg8Fz05I,1322
 maloja/proccontrol/tasks/export.py,sha256=uloufUcqEzhedpANBwohkcPPwYboXRjqTCoo0YUdsDo,794
-maloja/proccontrol/tasks/import_scrobbles.py,sha256=A1j7m-ZH-0YPAWr4vEUOR3EvPl1-qW0nn3Dwe2pK9-o,15654
+maloja/proccontrol/tasks/import_scrobbles.py,sha256=MrRWs8yMoLfHXBVveD5TINzMveYScqQ07meZ5rO8UaU,16369
 maloja/proccontrol/tasks/parse_albums.py,sha256=co09x9lyi0ZCqJ2QRtUHbmNgku_VNEIXCWCM7nYSals,4111
 maloja/thirdparty/__init__.py,sha256=FMnnHatVj5flaio7J8o01MwPz6TyiY_ngwxtEqgOruI,9571
 maloja/thirdparty/audiodb.py,sha256=2vmyZmKZNL4Um4JVC200oN9mrvXIIeYXhny5AeOuF-I,814
@@ -81,11 +81,11 @@ maloja/web/jinja/about.jinja,sha256=2idNqp8k43KKda94sWyD1fN9YB3TFCSgRE7ro2zdf3s,
 maloja/web/jinja/admin_albumless.jinja,sha256=QBYEwIFSagh-AAQ5BeNJpG1x4Aqgo4qe-OCX4RhvnLA,400
 maloja/web/jinja/admin_apikeys.jinja,sha256=QFWZdkcVks6_80-N_h2sxABkdD8XD9Wgj6DbnoQSDk0,314
 maloja/web/jinja/admin_import.jinja,sha256=VlfGqfisYkDXnSRPrUvuUheFw341RFGQXcCNrmi95ag,809
-maloja/web/jinja/admin_issues.jinja,sha256=1ZhxhwC0VSLQL5LftmP500GO150IMiY3MGPgu1zHDiQ,2471
+maloja/web/jinja/admin_issues.jinja,sha256=gXXU6Oyrn_lK-X5qJrHr7XfQlopwtglQ0Oq1JivOUD0,2485
 maloja/web/jinja/admin_manual.jinja,sha256=H8txrBoPPao_8TKAgADxShc7wSSvV2Qp7rmHBpPYwks,2317
 maloja/web/jinja/admin_overview.jinja,sha256=SV3R7timLMquMZ_m_Qtb6fu_YNOk5RJ74sXEZ2m7GbQ,3626
 maloja/web/jinja/admin_settings.jinja,sha256=6jNVteSN-2PQalDn8e-pWW7xAN0vIWESgQjaYRN2CRw,183
-maloja/web/jinja/admin_setup.jinja,sha256=rDFgmz1c0DZAyF-Z90XyGpm4dzc-GRSFQ-wa44Gvoyo,5268
+maloja/web/jinja/admin_setup.jinja,sha256=vEalQCiSIoXS-PAr_n2bXZtuZpRtRVybgdZvQPbCsMY,5282
 maloja/web/jinja/album.jinja,sha256=KjPuTxVy_p94k7cmWI0JWPCdyXjJeXdNczAtCJK4pDw,4158
 maloja/web/jinja/artist.jinja,sha256=DkekMGX5bfvy8MWCgFZi9mwuhHQB--7BoztbiAdYmKs,4914
 maloja/web/jinja/charts_albums.jinja,sha256=uJTS8oy1-pMTG6NuHQPsrqNuJBfEoa7Q_BQOzz16lPM,1389
@@ -169,12 +169,12 @@ maloja/web/static/ico/favicon_old.ico,sha256=Xch-fUCuGwBdUP3-kFgQZgXBj-jvVTW7tii
 maloja/web/static/js/datechange.js,sha256=TZfsi-9nzGHmieJALipW6qrFKNsmkOCQW1xX1UwJ_KA,921
 maloja/web/static/js/edit.js,sha256=cF9JyB_3I8pYlWzC-s7zBsGaREvFvI2M9cEWxCXSw_A,13544
 maloja/web/static/js/lazyload17-8-2.min.js,sha256=sO6HPavoXo796Zp_bq6ts4qHOoEqfydXEXSX5NojP48,8893
-maloja/web/static/js/manualscrobble.js,sha256=8BSHrh1LWoOHXkcpUcnEZlXyfhKDh83deiJks15YyqI,6350
+maloja/web/static/js/manualscrobble.js,sha256=3R-QqEpa1rNpUjTng5dc4BH1XLgEDQDeO1ObST5uR4A,6357
 maloja/web/static/js/neopolitan.js,sha256=KHUpclvGsvGWc6OHu4e-UNwOmt_A-leNgbY1e3mtb00,5721
 maloja/web/static/js/notifications.js,sha256=Svf3u9XcJ0bUlDZca4Z2BEblK7DdKs3wR4EVZaG7-70,1405
-maloja/web/static/js/search.js,sha256=2BedwlSbE3L1Q7InX_RoC6SigJmJQ4wLpYEzh2iWt40,3545
+maloja/web/static/js/search.js,sha256=2kXEWwzVBP5B3n_yU7vDv8X5U_o3QGgw_HbVHvhRUfo,3769
 maloja/web/static/js/statselect.js,sha256=UyHo7bjXKwhG_q5DgJDaoEgCRcsYRIQoV8S2beIBo_0,1750
-maloja/web/static/js/upload.js,sha256=z0LjPSGw86Up1ozq-EsZkmJX_hKlgPSirgH9-qMYwac,112
+maloja/web/static/js/upload.js,sha256=DtoNOxs2EjViIO4QI7SkrWC6NC5yIaebMTybGARNiI0,119
 maloja/web/static/png/chartpos_bronze.png,sha256=ObhVuxMfM5LQZoMIjHaBfTHxrUsbKpmDKUHI4zfDmBQ,244
 maloja/web/static/png/chartpos_gold.png,sha256=1zzoKe8QVBnTyoirF-d4s-uyZdeFzZ5jN9Rmjcmxy2o,239
 maloja/web/static/png/chartpos_normal.png,sha256=SbdVtmwCezOnCoKyID5N_E0BGJn3MCD90209qOGFamI,245
@@ -197,8 +197,8 @@ maloja/web/static/ttf/Ubuntu-Medium.ttf,sha256=DWhfUcO8OU8CyMIYVlukI5cs-zXCVChx4
 maloja/web/static/ttf/Ubuntu-MediumItalic.ttf,sha256=bcsuSGcaFmv1YGT0BikSt61Bov3ylg786wJC2_N8pUs,309648
 maloja/web/static/ttf/Ubuntu-Regular.ttf,sha256=Zv6pwACR8l64pSZUgCO2FUeFh2qQCvLY9HKSJolpgWM,299684
 maloja/web/static/txt/robots.txt,sha256=Mx6pCQ2wyfb1l72YQP1bFxgw9uCzuhyyTfqR8Mla7cE,26
-malojaserver-3.2.3.dist-info/entry_points.txt,sha256=LrZkF8oW67Jx5Gp2GBG-WhUqW_ALwmCgfr7sVMTOu0k,47
-malojaserver-3.2.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-malojaserver-3.2.3.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-malojaserver-3.2.3.dist-info/METADATA,sha256=PuvbYy12B1eDhzoS1nCisspM9vEwuDLQlzTogOD40lc,9068
-malojaserver-3.2.3.dist-info/RECORD,,
+malojaserver-3.2.4.dist-info/entry_points.txt,sha256=LrZkF8oW67Jx5Gp2GBG-WhUqW_ALwmCgfr7sVMTOu0k,47
+malojaserver-3.2.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+malojaserver-3.2.4.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+malojaserver-3.2.4.dist-info/METADATA,sha256=InxNxathNK9a2Ix2OGeFdpGPsCd-WLNGm1WpLctdPyY,8526
+malojaserver-3.2.4.dist-info/RECORD,,