config/music: adjust ordering helpers

.config/puddletag/combos

@@ -120,7 +120,12 @@
       "melodic",
       "Progressive House",
       "calibrate",
-      "minecraft"
+      "virtual self",
+      "giants",
+      "fathers",
+      "father",
+      "piano",
+      ""
     ]
   },
   "&Pattern": {
@@ -208,7 +213,7 @@
       ",? ?( (&|fe?a?t(uring)?.?|x|and|/|\\+) |/|, ) ?",
       ",? ?( (&|fe?a?t(uring)?.?|x|and|/|\\+) |/|, |\\\\\\\\) ?",
       "^; ",
-      "^; "
+      "(.*) & (.*)"
     ]
   },
   "Replace &matches with:": {
@@ -230,7 +235,7 @@
       "\\\\",
       "; ",
       "",
-      ""
+      "$1; $2"
     ]
   },
   "&Separator": {

.config/puddletag/genres

@@ -42,4 +42,7 @@ Mix; DnB
 Mix; DnB; Energy
 House; Canto
 Soundtrack
-Dubstep; Vocal; Liquid
+Dubstep; Vocal; Liquid
+Electronic
+Piano
+Electronic; Vocal

.config/puddletag/puddletag.conf

@@ -16,7 +16,7 @@
   "main": {
     "lang": "auto",
     "lastfolder": "/home/janek/data/music",
-    "maximized": true
+    "maximized": false
   },
   "playlist": {
     "extinfo": 1,
@@ -42,7 +42,7 @@
     "fontsize": 10,
     "rowsize": 43,
     "sort_fields": [
-      "album"
+      "track"
     ],
     "sort_reverse": false
   },
@@ -84,11 +84,12 @@
       "Length",
       "Year",
       "Genre",
+      "Path",
       "BPM",
       "Comment",
       "Bitrate",
-      "Path",
+      "Album Artist",
-      "Album Artist"
+      "Tags"
     ],
     "tags": [
       "__dirpath",
@@ -100,11 +101,12 @@
       "__length",
       "year",
       "genre",
+      "__path",
       "bpm",
       "comment",
       "__bitrate",
-      "__path",
+      "albumartist",
-      "albumartist"
+      "version"
     ]
   },
   "editor": {

.config/shell/music

@@ -4,7 +4,8 @@ MUSIC_RAW="$AUDIO/songs/_raw"
 alias scbra='scpr zebra "/srv/funkwhale/data/music${PWD/$MUSIC}"'
 
 findsongs() {
-	find -regextype posix-extended -maxdepth 1 -type f -regex "${1:-.*\.(mp3|flac|wav|m4a)}" -printf "%P\n"
+	find -regextype posix-extended -maxdepth 1 -type f \
+		-regex "${1:-.*\.(mp3|flac|wav|m4a)}" -printf "%P\n"
 }
 
 addmix() {
@@ -36,17 +37,17 @@ addsong() {
 addalbum() {
 	mkdir -p "$MUSIC/$1"
 	mkdir -p "$MUSIC_RAW/$1"
-	f1 -regextype posix-extended -type f -regex "\./(cover|folder)\.(png|jpg|jpeg)" | while read cover; do
+	f1 -regextype posix-extended -type f -regex "\./(cover|folder)\.(png|jpg|jpeg)" |
-		foundcover="true"
+		while read cover; do
-		cp -v "$cover" "$MUSIC/$1" &&
+			foundcover="true"
-		mv -v "$cover" "$MUSIC_RAW
+			cp -v "$cover" "$MUSIC/$1" &&
-/$1"
+			mv -v "$cover" "$MUSIC_RAW/$1"
-	done
+		done
-	test "$foundcover" || f1 -regextype posix-extended -type f -regex ".*\.(png|jpg|jpeg)" | while read cover; do
+	test "$foundcover" || f1 -regextype posix-extended -type f -regex ".*\.(png|jpg|jpeg)" |
-		cp -v "$cover" "$MUSIC/$1" &&
+		while read cover; do
-		mv -v "$cover" "$MUSIC_RAW
+			cp -v "$cover" "$MUSIC/$1" &&
-/$1"
+			mv -v "$cover" "$MUSIC_RAW/$1"
-	done
+		done
 
 	IFS=$'\n'
 	for s in $(findsongs ".*\.(flac|wav)"); do
@@ -57,12 +58,12 @@ addalbum() {
 }
 
 formatsongs() {
-	_pwd="$PWD"
+	(
-	find "$PWD" "$@" -type d | while read d; do builtin cd $d; findsongs | while read song; do
+	find -maxdepth 1 -type d | formatin
-		new="$(formatsong "$song")"
+	find "$@" "$PWD" -type d | while read d;
-		test "$new" && test "$new" != "$song" && mv -iv "$song" "$new"
+		do builtin cd $d && findsongs | formatin
-	done; done
+		done
-	builtin cd "$_pwd"
+	)
 	IFS=$'\n'
 	for f in $(find "$@" -name "*.wav"); do
 		echo "Converting $f to ${f%.*}.flac"
@@ -71,9 +72,17 @@ formatsongs() {
 	unset IFS
 }
 
+# Normalize filenames from stding
+formatin() {
+	while read song; do
+		new="$(formatsong "$song")"
+		test "$new" && test "$new" != "$song" && mv -iv "$song" "$new"
+	done
+}
+
 formatsong() {
-	echo "$1" | sed -e 's/\([ ([]\)\(ft\|Ft\|Feat\|featuring\)\([ .]\)/\1feat\3/;
+	echo "$1" | sed -e 's/\b\(ft\|Ft\|Feat\|featuring\)\([ .]\)/feat\2/;
-		s/\([ ([]\)feat /\1feat. /;
+		s/\bfeat /feat. /;
 		s/ \((Original Mix)\|(Original)\|(Full Stream)\|.NCS Release.\)//i;
 		s/ (\(Acoustic\|Live\))/ [\1]/i;
 		s/ \[\(feat.*\)\]/ (\1)/i;