]> git.draconx.ca Git - mpdhacks.git/blobdiff - mpdmenu.pl
projects / mpdhacks.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mpdmenu: Use FindBin module to locate auxiliary scripts.
[mpdhacks.git] / mpdmenu.pl
diff --git a/mpdmenu.pl b/mpdmenu.pl
index 65d0c588d0cc5e71ed1b16a7b5c3afac79d9933c..be2c08fb46f8ed0f6cebb7a3f0651610e1fc7e9b 100755 (executable)
--- a/mpdmenu.pl
+++ b/mpdmenu.pl
@@ -1,9 +1,19 @@
 #!/usr/bin/perl
+#
+# Copyright © 2008,2010,2012,2019 Nick Bowler
+#
+# Silly little script to generate an FVWM menu with various bits of MPD
+# status information and controls.
+#
+# License GPLv3+: GNU General Public License version 3 or any later version.
+# This is free software: you are free to change and redistribute it.
+# There is NO WARRANTY, to the extent permitted by law.
 
 use strict;
 
 use Getopt::Long;
 use IO::Socket::INET6;
+use FindBin;
 
 use constant {
        MPD_MJR_MIN => 0,
@@ -12,9 +22,12 @@ use constant {
 };
 
 use utf8;
-use encoding 'utf8';
+use open qw(:std :utf8);
+binmode(STDOUT, ":utf8");
 use Encode;
 
+my $SELF = "$FindBin::Bin/$FindBin::Script";
+
 sub cmd
 {
        print "$_[0]\n";
@@ -49,7 +62,8 @@ $title  = decode_utf8($title)  if defined($title);;
 my $sock = new IO::Socket::INET6(
        PeerAddr => $host,
        PeerPort => $port,
-       Proto => 'tcp'
+       Proto => 'tcp',
+       Timeout => 2
 ) or die("could not open socket: $!.\n");
 binmode($sock, ":utf8");
 
@@ -100,11 +114,12 @@ if (defined $album) {
 
                next if (defined $artist && !$accept{albumdir($t_file)});
 
-               $t_artist = sanitise($t_artist);
-               $t_title  = sanitise($t_title);
+               $t_artist = sanitise($t_artist, 0);
+               $t_title  = sanitise($t_title, 0);
 
                my $cmd = sprintf "AddToMenu $menu \"%d\t%s - %s\""
-                                 ." Exec mpc playid %d",
+                                 ." Exec exec $FindBin::Bin/mpdexec.pl"
+                                 ." playid %d",
                                  $t_trackno, $t_artist, $t_title, $t_id;
 
                cmd($cmd);
@@ -136,9 +151,9 @@ if (defined $album) {
        use locale;
        foreach (sort keys(%albums)) {
                my $key      = $_;
-               my $a_album  = sanitise($key);
+               my $a_album  = sanitise($key, 1);
 
-               open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
+               open THUMB, "-|", "$FindBin::Bin/thumbnail.zsh",
                                         "--small", "--music", $albums{$key};
                my $thumb = <THUMB>;
                close THUMB;
@@ -154,7 +169,7 @@ if (defined $album) {
                cmd("DestroyFunc MakeMenuMPDArt_$i");
                cmd("AddToFunc   MakeMenuMPDArt_$i
                     + I DestroyMenu MenuMPDArt_$i
-                    + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
+                    + I -PipeRead \"exec $SELF "
                           ."--menu MenuMPDArt_$i "
                           ."--album  ".shellify($key, 1)." "
                           ."--artist ".shellify($artist, 1)."\"");
@@ -200,6 +215,9 @@ if (defined $album) {
        s/\s+(instrumental|off vocal|short|tv)([\s-]+(mix|size|version))?$//i;
        s/\s+without\s+\w+$//i;
 
+       # Deal with separate movements in classical pieces.
+       s/: [IVX]+\..*//;
+
        my $basetitle  = $_;
        my $_basetitle = $basetitle;
 
@@ -233,10 +251,10 @@ if (defined $album) {
                # MPD searches are case-insensitive.
                next if (!($t_title =~ m/(\P{Latin}|^)\Q$basetitle\E(\P{Latin}|$)/ || $t_title =~ m/\Q$basetitle\E/i));
 
-               $t_artist = sanitise($t_artist);
-               $t_title  = sanitise($t_title);
+               $t_artist = sanitise($t_artist, 1);
+               $t_title  = sanitise($t_title, 1);
 
-               open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
+               open THUMB, "-|", "$FindBin::Bin/thumbnail.zsh",
                                         "--small", "--music", $t_file;
                my $thumb = <THUMB>;
                close(THUMB);
@@ -245,7 +263,9 @@ if (defined $album) {
                $thumb =~ s/\n//sg;
                $thumb = "%$thumb%" if (-f $thumb);
 
-               cmd("AddToMenu $menu \"$thumb$t_artist - $t_title\" Exec mpc playid $t_id");
+               cmd("AddToMenu $menu \"$thumb$t_artist - $t_title\""
+                   ." Exec exec $FindBin::Bin/mpdexec.pl"
+                   ." playid $t_id");
        }
 } # end use locale workaround
 } else {
@@ -283,7 +303,7 @@ if (defined $album) {
                }
                die("Failed data query\n") unless (keys(%entry) > 0);
 
-               open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
+               open THUMB, "-|", "$FindBin::Bin/thumbnail.zsh",
                                         "--image", "--music",  $entry{file};
                my $thumb = <THUMB>;
                my $scan  = <THUMB>;
@@ -295,14 +315,14 @@ if (defined $album) {
 
                if (-f $thumb) {
                        cmd("AddToMenu $menu \"*$thumb*\" "
-                               ."Exec exec gqview ".shellify($scan, 0));
+                               ."Exec exec geeqie ".shellify($scan, 0));
                }
-               cmd("AddToMenu $menu \"Title:   ".sanitise($entry{Title})."\" "
-                       ."Popup MenuMPDTitle");
-               cmd("AddToMenu $menu \"Artist:  ".sanitise($entry{Artist})."\" "
-                       ."Popup MenuMPDArtist");
-               cmd("AddToMenu $menu \"Album:   ".sanitise($entry{Album})."\" "
-                       ."Popup MenuMPDAlbum");
+               cmd("AddToMenu $menu \"Title:   ".sanitise($entry{Title}, 0)
+                       ."\" Popup MenuMPDTitle");
+               cmd("AddToMenu $menu \"Artist:  ".sanitise($entry{Artist}, 0)
+                       ."\" Popup MenuMPDArtist");
+               cmd("AddToMenu $menu \"Album:   ".sanitise($entry{Album}, 0)
+                       ."\" Popup MenuMPDAlbum");
                cmd("AddToMenu $menu \"\" Nop");
        } else {
                cmd("AddToMenu $menu \"<Song info unavailable>\"");
@@ -311,25 +331,25 @@ if (defined $album) {
 
        if ($state eq "play" || $state eq "pause") {
                cmd("AddToMenu $menu \"\t\tNext%$icons/next.svg:16x16%\" "
-                       ."Exec exec mpc next");
+                       ."Exec exec $FindBin::Bin/mpdexec.pl next");
                cmd("AddToMenu $menu \"\t\tPause%$icons/pause.svg:16x16%\" "
-                       ."Exec exec mpc pause") if ($state eq "play");
+                       ."Exec exec $FindBin::Bin/mpdexec.pl pause");
                cmd("AddToMenu $menu \"\t\tPlay%$icons/play.svg:16x16%\" "
-                       ."Exec exec mpc play") if ($state eq "pause");
+                       ."Exec exec $FindBin::Bin/mpdexec.pl play");
                cmd("AddToMenu $menu \"\t\tStop%$icons/stop.svg:16x16%\" "
-                       ."Exec exec mpc stop");
+                       ."Exec exec $FindBin::Bin/mpdexec.pl stop");
                cmd("AddToMenu $menu \"\t\tPrev%$icons/prev.svg:16x16%\" "
-                       ."Exec exec mpc prev");
+                       ."Exec exec $FindBin::Bin/mpdexec.pl previous");
        } elsif ($state eq "stop") {
                cmd("AddToMenu $menu \"\t\tPlay%$icons/play.svg:16x16%\" "
-                       ."Exec exec mpc play");
+                       ."Exec exec $FindBin::Bin/mpdexec.pl play");
        } else {
                die("Unknown MPD state!\n");
        }
 
        cmd("AddToMenu $menu \"\" Nop");
        cmd("AddToMenu $menu \"\t\tShuffle%$icons/shuffle.svg:16x16%\" "
-               ."Exec exec mpc shuffle");
+               ."Exec exec $FindBin::Bin/mpdexec.pl shuffle");
 
        cmd("DestroyMenu MenuMPDTitle");
        cmd("AddToMenu   MenuMPDTitle  DynamicPopUpAction MakeMenuMPDTitle");
@@ -341,14 +361,14 @@ if (defined $album) {
        cmd("DestroyFunc MakeMenuMPDTitle");
        cmd("AddToFunc   MakeMenuMPDTitle
             + I DestroyMenu MenuMPDTitle
-            + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
+            + I -PipeRead \"exec $SELF "
                           ."--menu MenuMPDTitle "
                           ."--title ".shellify($entry{Title}, 1)."\"");
 
        cmd("DestroyFunc MakeMenuMPDAlbum");
        cmd("AddToFunc   MakeMenuMPDAlbum
             + I DestroyMenu MenuMPDAlbum
-            + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
+            + I -PipeRead \"exec $SELF "
                           ."--menu MenuMPDAlbum "
                           ."--album  ".shellify($entry{Album}, 1)." "
                           ."--artist ".shellify($entry{Artist}, 1)."\"");
@@ -356,7 +376,7 @@ if (defined $album) {
        cmd("DestroyFunc MakeMenuMPDArtist");
        cmd("AddToFunc   MakeMenuMPDArtist
             + I DestroyMenu MenuMPDArtist
-            + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
+            + I -PipeRead \"exec $SELF "
                           ."--menu MenuMPDArtist "
                           ."--artist ".shellify($entry{Artist}, 1)."\"");
 
@@ -370,7 +390,8 @@ print $sock "close\n";
 sub sanitise
 {
        $_ = $_[0];
-       s/([\$&@%^*])/\1\1/g;
+       s/&/&&/g if ($_[1]);
+       s/([\$@%^*])/\1\1/g;
        s/"/\\"/g;
        return $_;
 }
MPD-related utility programs.