Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-31 14:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made artist delimiters a setting, fix GH-66

Browse Source
This commit is contained in:
Krateng 2021-01-06 22:09:07 +01:00
parent adfd6d2fc2
commit 723efcb8ba
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maloja/__pkginfo__.py
View File

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

9
maloja/cleanup.py
View File

@ -62,11 +62,14 @@ class CleanerAgent:
return (a in confirmed) return (a in confirmed)
#Delimiters used for extra artists, even when in the title field #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 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 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): def parseArtists(self,a):

3
maloja/data_files/config/settings/default.ini
View File

@ -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 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"] INVALID_ARTISTS = ["[Unknown Artist]","Unknown Artist","Spotify"]
REMOVE_FROM_TITLE = ["(Original Mix)","(Radio Edit)","(Album Version)","(Explicit Version)","(Bonus Track)"] 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 USE_PARSE_PLUGINS = no
[Local Images] [Local Images]

3
settings.md
View File

@ -42,6 +42,9 @@ Settings File | Environment Variable | Type | Description
**Database** **Database**
`INVALID_ARTISTS` |   | List (String) | Artists that should be discarded immediately `INVALID_ARTISTS` |   | List (String) | Artists that should be discarded immediately
`REMOVE_FROM_TITLE` |   | List (String) | Phrases that should be removed from song titles `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** **Web Interface**
`DEFAULT_RANGE_CHARTS_ARTISTS` |   | String | What range is shown per default for the tile view on the start page `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 `DEFAULT_RANGE_CHARTS_TRACKS` |   | String | What range is shown per default for the tile view on the start page