diff --git a/.config/puddletag/puddletag.conf b/.config/puddletag/puddletag.conf index b0ef16c..9560f7b 100644 --- a/.config/puddletag/puddletag.conf +++ b/.config/puddletag/puddletag.conf @@ -6,6 +6,7 @@ "/home/janek/.local/share/puddletag/actions/standard.action", "/home/janek/.local/share/puddletag/actions/caseconversion.action", "/home/janek/.local/share/puddletag/actions/Artist splitting.action", + "/home/janek/.local/share/puddletag/actions/Genre Splitting.action", "/home/janek/.local/share/puddletag/actions/Swap artists.action", "/home/janek/.local/share/puddletag/actions/Genre House.action", "/home/janek/.local/share/puddletag/actions/Genre Acoustic.action", @@ -16,7 +17,7 @@ }, "main": { "lang": "auto", - "lastfolder": "/home/janek/data/4-media/music", + "lastfolder": "/home/janek/data/4-media/music/Electronic/Feint", "maximized": false }, "playlist": { @@ -43,7 +44,7 @@ "fontsize": 10, "rowsize": 43, "sort_fields": [ - "genre" + "title" ], "sort_reverse": false }, @@ -121,15 +122,16 @@ "%artist% - %track% - %title%", "%artist% - %album% - %track% - %title%" ], - "index": 0 + "index": 1 }, "functions": { - "last_used": "regex" + "last_used": "remove_dupes" }, "actions": { "checked": [ "Standard", - "Artist splitting" + "Artist splitting", + "Genre Splitting" ] }, "quick_actions": { @@ -137,4 +139,4 @@ "Artist splitting" ] } -} +} \ No newline at end of file diff --git a/.config/shell/music b/.config/shell/music index 5254a1a..7158f2f 100644 --- a/.config/shell/music +++ b/.config/shell/music @@ -68,7 +68,7 @@ formatsongs() { ( find -maxdepth 1 -type d | formatin find "$@" "$PWD" -type d | while read d; - do builtin cd $d && findsongs | formatin + do builtin cd "$d" && findsongs | formatin done ) # fd --no-ignore-vcs --type f --extension opus --exec opusdec --quiet "{}" "{.}.wav" \; ".*" "$@" @@ -91,8 +91,9 @@ formatin() { formatsong() { echo "$1" | sed -e 's/\b\(ft\|Ft\|Feat\|featuring\)\([ .]\)/feat\2/; s/\bfeat /feat. /; + s/)(/) (/g; s/ [[(]\(Free Download\|Original Mix\|Original\|Full Stream\|NCS Release\)[])]//i; - s/ (\(Acoustic\|Live\))/ [\1]/i; + s/ (\(Acoustic\|Live|.* Remix\))/ [\1]/i; s/ \[\(feat.*\)\]/ (\1)/i; s/^\([A-z]\+\) The \([^-]\+\)$/\1, the \2/g; s/ \(\..\{2,4\}\)$/\1/; diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index db9874c..e8eac69 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -61,7 +61,7 @@ find $HOME -maxdepth 1 -type l -exec file {} + | sed 's/.* //' | xargs -r mkdir -p link python /usr/bin/python3 -# TODO don't do these prematurely +# TODO don't link these prematurely, might lead to installation conflicts link fdfind /usr/bin/fd link batcat /usr/bin/bat