Made artist delimiters a setting, fix GH-66

maloja/__pkginfo__.py

@@ -5,7 +5,7 @@ author = {
 	"email":"maloja@krateng.dev",
 	"github": "krateng"
 }
-version = 2,11,0
+version = 2,12,0
 versionstr = ".".join(str(n) for n in version)
 links = {
 	"pypi":"malojaserver",

maloja/cleanup.py

@@ -62,11 +62,14 @@ class CleanerAgent:
 		return (a in confirmed)
 
 	#Delimiters used for extra artists, even when in the title field
-	delimiters_feat = ["ft.","ft","feat.","feat","featuring","Ft.","Ft","Feat.","Feat","Featuring"]
+	#delimiters_feat = ["ft.","ft","feat.","feat","featuring","Ft.","Ft","Feat.","Feat","Featuring"]
+	delimiters_feat = settings.get_settings("DELIMITERS_FEAT")
 	#Delimiters in informal artist strings, spaces expected around them
-	delimiters = ["vs.","vs","&"]
+	#delimiters = ["vs.","vs","&"]
+	delimiters = settings.get_settings("DELIMITERS_INFORMAL")
 	#Delimiters used specifically to tag multiple artists when only one tag field is available, no spaces used
-	delimiters_formal = ["; ",";","/"]
+	#delimiters_formal = ["; ",";","/"]
+	delimiters_formal = settings.get_settings("DELIMITERS_FORMAL")
 
 	def parseArtists(self,a):
 

maloja/data_files/config/settings/default.ini

@@ -56,6 +56,9 @@ DB_CACHE_ENTRIES = 10000 #experiment with this depending on your RAM
 DB_MAX_MEMORY = 75 # percentage of RAM utilization (whole container, not just maloja) that should trigger a flush
 INVALID_ARTISTS = ["[Unknown Artist]","Unknown Artist","Spotify"]
 REMOVE_FROM_TITLE = ["(Original Mix)","(Radio Edit)","(Album Version)","(Explicit Version)","(Bonus Track)"]
+DELIMITERS_FEAT = ["ft.","ft","feat.","feat","featuring","Ft.","Ft","Feat.","Feat","Featuring"]
+DELIMITERS_INFORMAL = ["vs.","vs","&"]
+DELIMITERS_FORMAL = [";","/"]
 USE_PARSE_PLUGINS = no
 
 [Local Images]

settings.md

@@ -42,6 +42,9 @@ Settings File			| Environment Variable			| Type			| Description
 **Database**
 `INVALID_ARTISTS`		|  						| List (String)	| Artists that should be discarded immediately
 `REMOVE_FROM_TITLE`		|  						| List (String)	| Phrases that should be removed from song titles
+`DELIMITERS_FEAT`   |  						| List (String)	| Delimiters used for extra artists, even when in the title field
+`DELIMITERS_INFORMAL`   |  						| List (String)	| Delimiters in informal artist strings with spaces expected around them
+`DELIMITERS_FORMAL`   |  						| List (String)	| Delimiters used to tag multiple artists when only one tag field is available
 **Web Interface**
 `DEFAULT_RANGE_CHARTS_ARTISTS`	|  				| String		| What range is shown per default for the tile view on the start page
 `DEFAULT_RANGE_CHARTS_TRACKS`	|  				| String		| What range is shown per default for the tile view on the start page