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

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Nov  1 13:11:24 2006
New Revision: 10546

URL: http://svn.slimdevices.com?rev=10546&view=rev
Log:
Bug: 4422
Description: Decode Playlists & Duplicates from UTF-8 on Windows.

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

Modified: trunk/server/Changelog6.html
URL: http://svn.slimdevices.com/trunk/server/Changelog6.html?rev=10546&r1=10545&r2=10546&view=diff
==============================================================================
--- trunk/server/Changelog6.html (original)
+++ trunk/server/Changelog6.html Wed Nov  1 13:11:24 2006
@@ -106,6 +106,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4389">#4389</a> - Following genre link on the Nokia770 skin Now Playing page crashes SlimServer</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4393">#4393</a> - Dark Skin displays albums in Gallery view in a single column</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4413">#4413</a> - registerParser api not working - breaks some AlienBBC streams</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4422">#4422</a> - MusicIP playlist containing files with accented characters generates duplicates in Slimserver</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4430">#4430</a> - Snow.pm loading Text Display on all player types</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4431">#4431</a> - Scanner fills up FileCache, causing disk issues and slows scanning speed.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4432">#4432</a> - Purge of FileCache stalls slimserver for large collections</li>

Modified: trunk/server/Plugins/MusicMagic/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Importer.pm?rev=10546&r1=10545&r2=10546&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Importer.pm (original)
+++ trunk/server/Plugins/MusicMagic/Importer.pm Wed Nov  1 13:11:24 2006
@@ -390,7 +390,7 @@
 
 	$log->info(sprintf("Finished export (%d records)", scalar @songs));
 }
-	
+
 sub _updatePlaylist {
 	my ($class, $name, $songs) = @_;
 
@@ -407,12 +407,24 @@
 		$name,
 		Slim::Utils::Prefs::get('MusicMagicplaylistsuffix'),
 	);
-	
-	$attributes{'LIST'}  = [ map { Slim::Utils::Misc::fileURLFromPath(
-
-		Plugins::MusicMagic::Common::convertPath($_)
-
-	) } @{$songs} ];
+
+	$attributes{'LIST'}  = [];
+
+	for my $song (@$songs) {
+
+		if ($OS eq 'win') {
+
+			$song = Slim::Utils::Unicode::utf8decode_guess(
+				$song, Slim::Utils::Unicode::encodingFromString($song),
+			);
+		}
+
+		$song = Slim::Utils::Misc::fileURLFromPath(
+			Plugins::MusicMagic::Common::convertPath($song)
+		);
+
+		push @{$attributes{'LIST'}}, $song;
+	}
 
 	$attributes{'CT'}                 = 'mmp';
 	$attributes{'TAG'}                = 1;