4 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh b/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh
index fa1cac49..6c96a9d9 100755
--- a/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh
+++ b/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh
@@ -16,6 +16,6 @@ die() {
 }
 
 cd "$XDG_MUSIC_DIR/beets" || die "No music dir!"
-exiftool "$(mpc --format '%file%' current)" -json | jq '.[0].Lyrics' --raw-output | less
+exiftool "$(mpc --format '%file%' current)" -json | jq '.[0] | if has("Lyrics") then .Lyrics elif has("Lyrics-xxx") then ."Lyrics-xxx" else "<No lyrics key>" end' --raw-output | less
 
 # vim: ft=sh
diff --git a/pkgs/by-name/mp/mpp-searchadd/mpp-searchadd.sh b/pkgs/by-name/mp/mpp-searchadd/mpp-searchadd.sh
index d76e73b8..89909ed9 100755
--- a/pkgs/by-name/mp/mpp-searchadd/mpp-searchadd.sh
+++ b/pkgs/by-name/mp/mpp-searchadd/mpp-searchadd.sh
@@ -10,6 +10,11 @@
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 
+# Run `beets` once, to trigger eventual beets migrations.
+# Otherwise, these might screw with our file adding (because `beets` prints them on stdout,
+# for some reason !?)
+beet --version >/dev/null
+
 beet list "$@" --path | while read -r track; do
     mpc add "$track"
 done
diff --git a/pkgs/by-name/mp/mpp/mpp.sh b/pkgs/by-name/mp/mpp/mpp.sh
index 3ac98ddb..e52bfcdc 100755
--- a/pkgs/by-name/mp/mpp/mpp.sh
+++ b/pkgs/by-name/mp/mpp/mpp.sh
@@ -23,6 +23,10 @@ case "${1-}" in
     shift 1
     mpp-beetrm "$@"
     ;;
+"popm")
+    shift 1
+    mpdpopm "$@"
+    ;;
 *)
     mpc "$@"
     ;;
diff --git a/pkgs/by-name/mp/mpp/package.nix b/pkgs/by-name/mp/mpp/package.nix
index f0e454f7..fe08ba46 100644
--- a/pkgs/by-name/mp/mpp/package.nix
+++ b/pkgs/by-name/mp/mpp/package.nix
@@ -16,6 +16,7 @@
   mpp-searchadd,
   mpp-lyrics,
   mpp-beetrm,
+  mpdpopm,
   # Build dependencies
   fd,
   zsh,
@@ -30,6 +31,7 @@
       mpp-searchadd
       mpp-lyrics
       mpp-beetrm
+      mpdpopm
     ];
   };