From 546a01b43ef36b43c958bd45c66e108908dea7b9 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Fri, 22 Oct 2021 17:14:41 +0200
Subject: [PATCH] config: music playing configuration

---
 .config/puddletag/combos         | 82 ++++++++++++++++++++++++++++++--
 .config/puddletag/genres         |  6 ++-
 .config/puddletag/gensettings    |  2 +-
 .config/puddletag/puddletag.conf | 32 ++++++++-----
 .local/bin/scripts/focus         |  2 +-
 .local/bin/scripts/mp            |  9 ++--
 6 files changed, 112 insertions(+), 21 deletions(-)

diff --git a/.config/puddletag/combos b/.config/puddletag/combos
index e517dd1..7d92a4e 100644
--- a/.config/puddletag/combos
+++ b/.config/puddletag/combos
@@ -1,7 +1,27 @@
 {
   "w&ith:": {
     "values": [
-      ""
+      "",
+      "AK",
+      "We Are All Astronauts",
+      "We Are All Astronauts feat. Sergio Diaz De Rojas",
+      "Muzzy",
+      "/home/janek/data/music/Mixes/Mashes",
+      "Hillsong United",
+      "Florence Joy",
+      "Sarah Albrecht/Dominik Laim/ICF Worship",
+      "A Billion Robots",
+      "Arion",
+      "Bossfight",
+      "Eminence & Soulero",
+      "DJVI",
+      "/home/janek/data/music/Electronic/_Youtube",
+      "/home/janek/data/music/Electronic/Liquicity/Alchemy",
+      ";",
+      " ",
+      "Mr FijiWiji, Soulero - Nebula.flac",
+      "Mr FijiWiji, Direct, & Aruna",
+      ";"
     ]
   },
   "&Output": {
@@ -48,7 +68,16 @@
       "feint",
       "hi",
       "dnb",
-      ""
+      "weare",
+      "weareelev",
+      "eleva",
+      "rival",
+      "veela",
+      "chillstep",
+      "fijiwiji",
+      "Richards",
+      "I Remember You",
+      "I Remember You"
     ]
   },
   "&Pattern": {
@@ -63,7 +92,29 @@
   },
   "&Replace": {
     "values": [
-      ""
+      "",
+      ".* & .*",
+      ".* \\& .*",
+      "AK",
+      "We Are All Astronauts",
+      "We Are All Astronauts feat. Sergio Diaz De Rojas",
+      "Muzzy",
+      "/home/janek/data/music/Mixes/Mashes",
+      "Hillsong United",
+      "Florence Joy",
+      "Sarah Albrecht/Dominik Laim/ICF Worship",
+      "A Billion Robots",
+      "Arion",
+      "Bossfight",
+      "Eminence & Soulero",
+      "DJVI",
+      "/home/janek/data/music/Electronic/_Youtube",
+      "/home/janek/data/music/Electronic/Liquicity/Alchemy",
+      " ;",
+      "  ",
+      "Mr FijiWiji, Soulero - Nebula.flac",
+      "Mr FijiWiji, Direct, & Aruna",
+      ",;"
     ]
   },
   "&Format string": {
@@ -77,5 +128,30 @@
       "https://soundcloud.com/icf-berlin-fhain/%year%-fh",
       "https://soundcloud.com/icf-berlin-fhain/%date%-fh"
     ]
+  },
+  "&Regular Expression": {
+    "values": [
+      "(.*) & (.*)",
+      "(.*) (&|fe?a?t.) (.*)",
+      "(.*) (&|fe?a?t.?) (.*)",
+      "(.*) (&|fe?a?t.?|x) (.*)",
+      "(.*)( (&|fe?a?t.?|x) |/)(.*)",
+      ".*/ICF",
+      "(.*)( (&|fe?a?t.?|x) |/|, )(.*)",
+      "(.*)( (&|fe?a?t(uring)?.?|x|and) |/|, )(.*)",
+      "(.*)( (&|fe?a?t(uring)?.?|x|and|/) |/|, )(.*)",
+      "(.*)( (&|fe?a?t(uring)?.?|x|and|/|\\+) |/|, )(.*)",
+      "(.*)( (&|fe?a?t(uring)?.?|x|and|/|\\+) |/|, )(.*)"
+    ]
+  },
+  "Replace &matches with:": {
+    "values": [
+      "$1; $2",
+      "$1; $3",
+      "$1; $4",
+      "ICF",
+      "$1; $5",
+      "$1; $5"
+    ]
   }
 }
\ No newline at end of file
diff --git a/.config/puddletag/genres b/.config/puddletag/genres
index cccbd3d..eb7a8ec 100644
--- a/.config/puddletag/genres
+++ b/.config/puddletag/genres
@@ -25,4 +25,8 @@ Dance; Techno
 Drum & Bass
 Drum & Bass; Liquid
 Mix
-Mashup
\ No newline at end of file
+Mashup
+Ambient; Canto
+Chillstep; Canto
+Canto; Acoustic
+Future House
\ No newline at end of file
diff --git a/.config/puddletag/gensettings b/.config/puddletag/gensettings
index 47c470c..c949986 100644
--- a/.config/puddletag/gensettings
+++ b/.config/puddletag/gensettings
@@ -23,4 +23,4 @@
   "Show &row numbers": {
     "value": true
   }
-}
+}
\ No newline at end of file
diff --git a/.config/puddletag/puddletag.conf b/.config/puddletag/puddletag.conf
index 5cd8437..ceba4f3 100644
--- a/.config/puddletag/puddletag.conf
+++ b/.config/puddletag/puddletag.conf
@@ -4,13 +4,14 @@
     "convert": false,
     "order": [
       "/home/janek/.local/share/puddletag/actions/standard.action",
-      "/home/janek/.local/share/puddletag/actions/caseconversion.action"
+      "/home/janek/.local/share/puddletag/actions/caseconversion.action",
+      "/home/janek/.local/share/puddletag/actions/Artist splitting.action"
     ]
   },
   "main": {
     "lang": "auto",
-    "lastfolder": "/home/janek/data/music/Canto",
-    "maximized": false
+    "lastfolder": "/home/janek/data/music/Electronic/LauraBrehm",
+    "maximized": true
   },
   "playlist": {
     "extinfo": 1,
@@ -36,7 +37,7 @@
     "fontsize": 10,
     "rowsize": 43,
     "sort_fields": [
-      "__dirpath"
+      "album"
     ],
     "sort_reverse": false
   },
@@ -78,8 +79,10 @@
       "Length",
       "Year",
       "Genre",
+      "BPM",
       "Comment",
-      "Bitrate"
+      "Bitrate",
+      "Path"
     ],
     "tags": [
       "__dirpath",
@@ -91,18 +94,18 @@
       "__length",
       "year",
       "genre",
+      "bpm",
       "comment",
-      "__bitrate"
+      "__bitrate",
+      "__path"
     ]
   },
   "editor": {
     "patterns": [
+      "%artist% - %title%",
       "%artist% - $num(%track%,2) - %title%",
       "%artist% - %album% - $num(%track%,2) - %title%",
-      "%artist% - %title%",
-      "%artist% - %album%",
-      "%artist% - Track %track%",
-      "%artist% - %title%"
+      "%title%"
     ],
     "index": 0
   },
@@ -110,6 +113,13 @@
     "last_used": "autonumbering"
   },
   "actions": {
-    "checked": []
+    "checked": [
+      "Artist splitting"
+    ]
+  },
+  "quick_actions": {
+    "checked": [
+      "Artist splitting"
+    ]
   }
 }
\ No newline at end of file
diff --git a/.local/bin/scripts/focus b/.local/bin/scripts/focus
index a8d0bb2..4ef7a84 100755
--- a/.local/bin/scripts/focus
+++ b/.local/bin/scripts/focus
@@ -3,7 +3,7 @@
 # depends: mp mpc
 # env: MUSIC
 PLAYLISTS="$MUSIC/Playlists"
-mpc clear
+mpc -q clear
 if test -z "$1"
 then mp -q "$PLAYLISTS/focus.m3u"
 else
diff --git a/.local/bin/scripts/mp b/.local/bin/scripts/mp
index 7dee367..14e819e 100755
--- a/.local/bin/scripts/mp
+++ b/.local/bin/scripts/mp
@@ -13,11 +13,12 @@ then shift
     path="$(test -e "$arg" && realpath "$arg" ||
       ( test -e "$MUSIC/$arg" && realpath "$MUSIC/$arg") ||
       ( test -e "$PLAYLISTS/$arg" && realpath "$PLAYLISTS/$arg") )"
-    test -n "$verbose" && echo "Scanning path '$path' $(test "$arg" != "$path" && echo "from '$arg' ")(MUSIC: '$MUSIC')" >&2
+    test -n "$verbose" && echo "Scanning path '$path' $(test "$arg" != "$path" && echo "from '$arg' ")(MUSIC: '$MUSIC', PWD: '$PWD')" >&2
     test -n "$path" || continue
-    if file "$path" | grep -i ' playlist' || expr "$path" : ".*\.m3u8\?$" >/dev/null
-    then pushd "$(dirname "$path")" >/dev/null && cat "$path" | xargs --delim='\n' "$0" $verbose -r && popd >/dev/null
+    if { file "$path" | grep -i ' playlist' || expr "$path" : ".*\.m3u8\?$"; } >/dev/null
+    then pushd "$(dirname "$path")" >/dev/null && cat "$path" | sed '/#.*/D' | xargs --delim='\n' "$0" -r $verbose && popd >/dev/null
     else
+      test -n "$verbose" && echo "Finding path '$path' $(test "$arg" != "$path" && echo "from '$arg' ")(MUSIC: '$MUSIC', PWD: '$PWD')" >&2
       find "$path" -name "*.flac" -o -name "*.mp3" | sort | while read file
         do case "$path" in
           ($MUSIC/*) echo "${file#$MUSIC/}";;
@@ -28,7 +29,7 @@ then shift
 else
   test "$1" = "-q" && quiet=-q && shift
   test -n "$(mpc playlist)" && next=-q
-  { "$0" -r "$@" && mpc -q update --wait; } | #>/tmp/mp 2>&1
+  { "$0" -r "$@" && mpc -q update --wait; } | #tee /tmp/mp 2>&1
     xargs --delim='\n' mpc insert
   mpc ${quiet:-$next} play
   test -z "$next" || mpc $quiet next