feat: readonly config support read-only filesystem

maloja/cleanup.py

@@ -15,13 +15,15 @@ class CleanerAgent:
 	def updateRules(self):
 
 		rawrules = []
-		for f in os.listdir(data_dir["rules"]()):
+		try:
-			if f.split('.')[-1].lower() != 'tsv': continue
+			for f in os.listdir(data_dir["rules"]()):
-			filepath = data_dir["rules"](f)
+				if f.split('.')[-1].lower() != 'tsv': continue
-			with open(filepath,'r') as filed:
+				filepath = data_dir["rules"](f)
-				reader = csv.reader(filed,delimiter="\t")
+				with open(filepath,'r') as filed:
-				rawrules += [[col for col in entry if col] for entry in reader if len(entry)>0 and not entry[0].startswith('#')]
+					reader = csv.reader(filed,delimiter="\t")
-
+					rawrules += [[col for col in entry if col] for entry in reader if len(entry)>0 and not entry[0].startswith('#')]
+		except FileNotFoundError:
+			pass
 
 		self.rules_belongtogether = [r[1] for r in rawrules if r[0]=="belongtogether"]
 		self.rules_notanartist = [r[1] for r in rawrules if r[0]=="notanartist"]

maloja/database/associated.py

@@ -19,12 +19,16 @@ def load_associated_rules():
 
 	# load from file
 	rawrules = []
-	for f in os.listdir(data_dir["rules"]()):
+	try:
-		if f.split('.')[-1].lower() != 'tsv': continue
+		for f in os.listdir(data_dir["rules"]()):
-		filepath = data_dir["rules"](f)
+			if f.split('.')[-1].lower() != 'tsv': continue
-		with open(filepath,'r') as filed:
+			filepath = data_dir["rules"](f)
-			reader = csv.reader(filed,delimiter="\t")
+			with open(filepath,'r') as filed:
-			rawrules += [[col for col in entry if col] for entry in reader if len(entry)>0 and not entry[0].startswith('#')]
+				reader = csv.reader(filed,delimiter="\t")
+				rawrules += [[col for col in entry if col] for entry in reader if len(entry)>0 and not entry[0].startswith('#')]
+	except FileNotFoundError:
+		return
+
 	rules = [{'source_artist':r[1],'target_artist':r[2]} for r in rawrules if r[0]=="countas"]
 
 	#for rule in rules:

maloja/pkg_global/conf.py

@@ -311,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!")
@@ -321,7 +327,7 @@ 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
@@ -344,8 +350,10 @@ auth = doreah.auth.AuthManager(singleuser=True,cookieprefix='maloja',stylesheets
 doreah.logging.defaultlogger.logfolder = data_dir['logs']() if malojaconfig["LOGGING"] else None
 
 
-
+try:
-custom_css_files = [f for f in os.listdir(data_dir['css']()) if f.lower().endswith('.css')]
+	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/setup.py

@@ -24,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")
@@ -37,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']
@@ -45,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