X-Git-Url: https://git.draconx.ca/gitweb/mpdhacks.git/blobdiff_plain/5def4ff4970eacb03be862d0b30f5e859313e6f4..200944f7b4ce6325a62064dfeeb483bba9c45743:/mpdmenu.pl

diff --git a/mpdmenu.pl b/mpdmenu.pl
index ffe2f92..65d0c58 100755
--- a/mpdmenu.pl
+++ b/mpdmenu.pl
@@ -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  = $_;
@@ -230,7 +231,8 @@ 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);