[Slim-Checkins] r10161 - in /trunk/server: Changelog6.html Plugins/MusicMagic/Plugin.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Oct  3 14:45:09 2006
New Revision: 10161

URL: http://svn.slimdevices.com?rev=10161&view=rev
Log:
Bug: 4281
Description: Need to decode UTF-8 on Windows for MusicIP, now that they're using UTF-8

Modified:
    trunk/server/Changelog6.html
    trunk/server/Plugins/MusicMagic/Plugin.pm

Modified: trunk/server/Changelog6.html
URL: http://svn.slimdevices.com/trunk/server/Changelog6.html?rev=10161&r1=10160&r2=10161&view=diff
==============================================================================
--- trunk/server/Changelog6.html (original)
+++ trunk/server/Changelog6.html Tue Oct  3 14:45:09 2006
@@ -31,6 +31,7 @@
  		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4228">#4228</a> - Fishbone skin status doesn't update from an empty playlist</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4237">#4237</a> - in Help > Internet Radio there is a dead link to Settings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4245">#4245</a> - Pressing PLAY on top level browse pushes right</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4281">#4281</a> - Mix do not work with accented characters in filenames and paths</li>
 	<ul>
 </ul>
 

Modified: trunk/server/Plugins/MusicMagic/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Plugin.pm?rev=10161&r1=10160&r2=10161&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Plugin.pm (original)
+++ trunk/server/Plugins/MusicMagic/Plugin.pm Tue Oct  3 14:45:09 2006
@@ -9,10 +9,13 @@
 use Slim::Player::ProtocolHandlers;
 use Slim::Player::Protocols::HTTP;
 use Slim::Utils::Misc;
+use Slim::Utils::OSDetect;
 use Slim::Utils::Strings;
 
 use Plugins::MusicMagic::Common;
 use Plugins::MusicMagic::Settings;
+
+my $OS = Slim::Utils::OSDetect::OS();
 
 my $initialized = 0;
 my $MMSHost;
@@ -724,10 +727,12 @@
 	# Bug: 1938 - Don't encode to UTF-8 before escaping on Mac & Win
 	# We might need to do the same on Linux, but I can't get UTF-8 files
 	# to show up properly in MMM right now.
-	if (Slim::Utils::OSDetect::OS() eq 'win' || Slim::Utils::OSDetect::OS() eq 'mac') {
+	if ($OS eq 'win' || $OS eq 'mac') {
 
 		$mixArgs = URI::Escape::uri_escape($mixArgs);
+
 	} else {
+
 		$mixArgs = Slim::Utils::Misc::escape($mixArgs);
 	}
 	
@@ -738,7 +743,7 @@
 		'create' => 0,
 	});
 
-	unless ($http) {
+	if (!$http) {
 		# NYI
 		$::d_musicmagic && msg("Musicmagic Error - Couldn't get mix: $mixArgs\&$argString\n");
 		return @mix;
@@ -750,6 +755,14 @@
 	$http->close;
 
 	for (my $j = 0; $j < $count; $j++) {
+
+		# Bug 4281 - need to convert from UTF-8 on Windows.
+		if ($OS eq 'win') {
+
+			my $enc = Slim::Utils::Unicode::encodingFromString($songs[$j]);
+
+			$songs[$j] = Slim::Utils::Unicode::utf8decode_guess($songs[$j], $enc);
+		}
 
 		my $newPath = Plugins::MusicMagic::Common::convertPath($songs[$j]);