X-Git-Url: https://git.draconx.ca/gitweb/mpdhacks.git/blobdiff_plain/d9b445c9f21cba5539cdc2f1103ca686a71e8a29..5657bb1ca0815712d16dd4a9cb993e40d08cecf2:/mpdmenu.pl

diff --git a/mpdmenu.pl b/mpdmenu.pl
index 2b593b0..eab65f0 100755
--- a/mpdmenu.pl
+++ b/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'
@@ -67,27 +67,27 @@ if (defined $album) {
 	my $entry;
 
 	$menu = "MenuMPDAlbum" unless defined $menu;
-	
+
 	$album =~ s/"/\\"/g;
 	print $sock "playlistfind album \"$album\"\n";
 	while (<$sock>) {
 		last if (/^OK/);
 		die($_) if (/^ACK/);
-	
+
 		if (/^(\w+): (.*)$/) {
 			if ($1 eq "file") {
 				if (keys(%$entry) > 0) {
 					addalbumentry(\@playlist, $entry)
 				}
-	
+
 				$entry = {};
 			}
-	
+
 			$entry->{$1} = $2;
 		}
 	}
 	addalbumentry(\@playlist, $entry) if (keys(%$entry) > 0);
-	
+
 	die("No tracks found.\n") if (!@playlist);
 	foreach (sort albumsort @playlist) {
 		my ($t_file, $t_trackno, $t_artist, $t_title, $t_id) = (
@@ -97,16 +97,16 @@ if (defined $album) {
 			$_->{Title},
 			$_->{Id},
 		);
-	
+
 		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",
 		                  $t_trackno, $t_artist, $t_title, $t_id;
-	
+
 		cmd($cmd);
 	}
 } elsif (defined $artist) {
@@ -122,7 +122,7 @@ if (defined $album) {
 	while (<$sock>) {
 		last if (/^OK/);
 		die($_) if (/^ACK/);
-	
+
 		if (/^(\w+): (.*)$/) {
 			$file       = $2    if ($1 eq "file");
 			$albums{$2} = $file if ($1 eq "Album");
@@ -136,13 +136,13 @@ 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.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);
@@ -154,7 +154,7 @@ if (defined $album) {
 		cmd("DestroyFunc MakeMenuMPDArt_$i");
 		cmd("AddToFunc   MakeMenuMPDArt_$i
 		     + I DestroyMenu MenuMPDArt_$i
-		     + I -PipeRead \"exec $FVWM/mpdmenu.pl "
+		     + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
 		           ."--menu MenuMPDArt_$i "
 		           ."--album  ".shellify($key, 1)." "
 		           ."--artist ".shellify($artist, 1)."\"");
@@ -173,7 +173,7 @@ if (defined $album) {
 	$menu = "MenuMPDTitle" unless defined $menu;
 
 	# Open and close brackets.
-	my ($ob, $cb) = ("[\[~〜<(ー−-]", "[\]~〜>)ー−-]");
+	my ($ob, $cb) = ("[\[~〜<〈(ー−-]", "[\]~〜>〉)ー−-]");
 
 	$_ = $title;
 
@@ -186,17 +186,18 @@ 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.
 
 	# Deal with titles like "blah (ABC version)".
-	s/\s*$ob.*(style|mix|edit|edition|ver\.?|version|カラオケ)$cb?$//i;
+	s/\s*$ob.*(style|mix|edit|edition|ver\.?|version|melody|カラオケ)$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  = $_;
@@ -207,13 +208,13 @@ if (defined $album) {
 	while (<$sock>) {
 		last if (/^OK/);
 		die($_) if (/^ACK/);
-	
+
 		if (/^(\w+): (.*)$/) {
 			if ($1 eq "file") {
 				push @titles, $entry if (keys(%$entry) > 0);
 				$entry = {};
 			}
-	
+
 			$entry->{$1} = $2;
 		}
 	}
@@ -230,15 +231,16 @@ if (defined $album) {
 		);
 
 		# MPD searches are case-insensitive.
-		next if (!($t_title =~ m/(\P{Latin}|^)\Q$basetitle\E(\P{Latin}|$)/));
-		$t_artist = sanitise($t_artist);
-		$t_title  = sanitise($t_title);
+		next if (!($t_title =~ m/(\P{Latin}|^)\Q$basetitle\E(\P{Latin}|$)/ || $t_title =~ m/\Q$basetitle\E/i));
+
+		$t_artist = sanitise($t_artist, 1);
+		$t_title  = sanitise($t_title, 1);
 
-		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);
@@ -263,43 +265,49 @@ if (defined $album) {
 			$songid = $2 if ($1 eq "songid");
 		}
 	}
-	die("Failed status query\n") unless (defined $state && defined $songid);
+	die("Failed status query\n") unless (defined $state);
 
-	print $sock "playlistid $songid\n";
-	while (<$sock>) {
-		last if (/^OK/);
-		die($_) if (/^ACK/);
+	cmd("AddToMenu $menu Playing Title") if ($state eq "play");
+	cmd("AddToMenu $menu Paused Title")  if ($state eq "pause");
+	cmd("AddToMenu $menu Stopped Title") if ($state eq "stop");
 
-		if (/^(\w+): (.*)$/) {
-			$entry{$1} = $2;
+	if (defined $songid) {
+		print $sock "playlistid $songid\n";
+		while (<$sock>) {
+			last if (/^OK/);
+			die($_) if (/^ACK/);
+
+			if (/^(\w+): (.*)$/) {
+				$entry{$1} = $2;
+			}
 		}
-	}
-	die("Failed data query\n") unless (keys(%entry) > 0);
+		die("Failed data query\n") unless (keys(%entry) > 0);
 
-	open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
-	                         "--image", "--music",  $entry{file};
-	my $thumb = <THUMB>;
-	my $scan  = <THUMB>;
-	close(THUMB);
-	die("Incompetent use of thumbnail.sh") if ($?);
+		open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
+		                         "--image", "--music",  $entry{file};
+		my $thumb = <THUMB>;
+		my $scan  = <THUMB>;
+		close(THUMB);
+		die("Incompetent use of thumbnail.zsh") if ($?);
 
-	$thumb =~ s/\n//sg;
-	$scan  =~ s/\n//sg;
+		$thumb =~ s/\n//sg;
+		$scan  =~ s/\n//sg;
 
-	cmd("AddToMenu $menu Playing Title") if ($state eq "play");
-	cmd("AddToMenu $menu Paused Title")  if ($state eq "pause");
-	cmd("AddToMenu $menu Stopped Title") if ($state eq "stop");
-	if (-f $thumb) {
-		cmd("AddToMenu $menu \"*$thumb*\" "
-			."Exec exec gqview ".shellify($scan, 0));
+		if (-f $thumb) {
+			cmd("AddToMenu $menu \"*$thumb*\" "
+				."Exec exec gqview ".shellify($scan, 0));
+		}
+		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>\"");
+		cmd("AddToMenu $menu \"\" Nop");
 	}
-	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 \"\" Nop");
 
 	if ($state eq "play" || $state eq "pause") {
 		cmd("AddToMenu $menu \"\t\tNext%$icons/next.svg:16x16%\" "
@@ -333,22 +341,22 @@ if (defined $album) {
 	cmd("DestroyFunc MakeMenuMPDTitle");
 	cmd("AddToFunc   MakeMenuMPDTitle
 	     + I DestroyMenu MenuMPDTitle
-	     + I -PipeRead \"exec $FVWM/mpdmenu.pl "
+	     + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
 	                   ."--menu MenuMPDTitle "
 	                   ."--title ".shellify($entry{Title}, 1)."\"");
 
 	cmd("DestroyFunc MakeMenuMPDAlbum");
 	cmd("AddToFunc   MakeMenuMPDAlbum
 	     + I DestroyMenu MenuMPDAlbum
-	     + I -PipeRead \"exec $FVWM/mpdmenu.pl "
+	     + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
 	                   ."--menu MenuMPDAlbum "
 	                   ."--album  ".shellify($entry{Album}, 1)." "
 	                   ."--artist ".shellify($entry{Artist}, 1)."\"");
-	
+
 	cmd("DestroyFunc MakeMenuMPDArtist");
 	cmd("AddToFunc   MakeMenuMPDArtist
 	     + I DestroyMenu MenuMPDArtist
-	     + I -PipeRead \"exec $FVWM/mpdmenu.pl "
+	     + I -PipeRead \"exec $FVWM/scripts/mpdmenu.pl "
 	                   ."--menu MenuMPDArtist "
 			   ."--artist ".shellify($entry{Artist}, 1)."\"");
 
@@ -362,7 +370,8 @@ print $sock "close\n";
 sub sanitise
 {
 	$_ = $_[0];
-	s/([\$&@%^*])/\1\1/g;
+	s/&/&&/g if ($_[1]);
+	s/([\$@%^*])/\1\1/g;
 	s/"/\\"/g;
 	return $_;
 }