mpdmenu: Update title menu cases.

[fvwmconf.git] / scripts / mpdmenu.pl

diff --git a/scripts/mpdmenu.pl b/scripts/mpdmenu.pl
index 4639211c0a62f00b946c4e254dddf2dc60e90a29..d2c4c2cc8584876ce096e972fcf85dc46fc67108 100755 (executable)
--- a/scripts/mpdmenu.pl
+++ b/scripts/mpdmenu.pl
@@ -3,7 +3,7 @@
 use strict;
 
 use Getopt::Long;
-use IO::Socket;
+use IO::Socket::INET6;
 
 use constant {
        MPD_MJR_MIN => 0,
@@ -46,7 +46,7 @@ $artist = decode_utf8($artist) if defined($artist);
 $title  = decode_utf8($title)  if defined($title);;
 
 # Connect to MPD.
-my $sock = new IO::Socket::INET(
+my $sock = new IO::Socket::INET6(
        PeerAddr => $host,
        PeerPort => $port,
        Proto => 'tcp'
@@ -138,11 +138,11 @@ if (defined $album) {
                my $key      = $_;
                my $a_album  = sanitise($key);
 
-               open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
+               open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
                                         "--small", "--music", $albums{$key};
                my $thumb = <THUMB>;
                close THUMB;
-               die("Incompetent use of thumbnail.sh") if ($?);
+               die("Incompetent use of thumbnail.zsh") if ($?);
 
                $thumb =~ s/\n//sg;
                $thumb = "%$thumb%" if (-f $thumb);
@@ -186,6 +186,7 @@ if (defined $album) {
        s/ -Practice Track-//;                        # Fair Heaven
        s/〜世界で一番アナタが好き〜//;               # Pure Heart
        s/〜彼方への哀歌//;                           # 十二幻夢
+       s/　sora no uta ver.//;                       # 美しい星
 
        s/\s*-remix-$//; # Otherwise "D-THREAD -remix-" doesn't work right.
 
@@ -193,10 +194,10 @@ if (defined $album) {
        s/\s*$ob.*(style|mix|edit|edition|ver\.?|version|カラオケ)$cb?$//i;
 
        # Deal with titles like "blah (without XYZ)".
-       s/\s*$ob((e\.)?piano|english|japanese|inst|tv|without|w\/o|off|back|short|karaoke|game).*//i;
+       s/\s*$ob\s*((e\.)?piano|english|japanese|inst|tv|without|w\/o|off|back|short|karaoke|game).*//i;
 
        # Deal with titles like "blah instrumental".
-       s/\s+(instrumental|off vocal|short)(\s+(size|version|s))?$//i;
+       s/\s+(instrumental|off vocal|short|tv)([\s-]+(mix|size|version))?$//i;
        s/\s+without\s+\w+$//i;
 
        my $basetitle  = $_;
@@ -230,15 +231,16 @@ if (defined $album) {
                );
 
                # MPD searches are case-insensitive.
-               next if (!($t_title =~ m/(\P{Latin}|^)\Q$basetitle\E(\P{Latin}|$)/));
+               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);
 
-               open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
+               open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
                                         "--small", "--music", $t_file;
                my $thumb = <THUMB>;
                close(THUMB);
-               die("Incompetent use of thumbnail.sh") if ($?);
+               die("Incompetent use of thumbnail.zsh") if ($?);
 
                $thumb =~ s/\n//sg;
                $thumb = "%$thumb%" if (-f $thumb);
@@ -281,7 +283,7 @@ if (defined $album) {
                }
                die("Failed data query\n") unless (keys(%entry) > 0);
 
-               open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
+               open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
                                         "--image", "--music",  $entry{file};
                my $thumb = <THUMB>;
                my $scan  = <THUMB>;