[Slim-Checkins] r10069 - in /branches/6.5/server: Changelog6.html Plugins/MusicMagic/Importer.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Sep 27 16:32:27 2006
New Revision: 10069

URL: http://svn.slimdevices.com?rev=10069&view=rev
Log:
Bug: 3318
Description: Merge from trunk -r 10067:10068

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Plugins/MusicMagic/Importer.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10069&r1=10068&r2=10069&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Sep 27 16:32:27 2006
@@ -3,6 +3,7 @@
 <ul>
 	<li>Bug Fixes:
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2985">#2985</a> - WMA transcoded to WAV truncated (not gapless)</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3318">#3318</a> - MusicMagic: Songs with national chars get duplicated</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4071">#4071</a> - Band Names in mp3 Tags don't always work</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4077">#4077</a> - CUE files YEAR and GENRE not always working</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4140">#4140</a> - Problem with the scanner parsing cue sheets in6.5b3</li>

Modified: branches/6.5/server/Plugins/MusicMagic/Importer.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/MusicMagic/Importer.pm?rev=10069&r1=10068&r2=10069&view=diff
==============================================================================
--- branches/6.5/server/Plugins/MusicMagic/Importer.pm (original)
+++ branches/6.5/server/Plugins/MusicMagic/Importer.pm Wed Sep 27 16:32:27 2006
@@ -263,9 +263,15 @@
 	$attributes{'AUDIO'} = 1;
 	$attributes{'SECS'}  = $songInfo{'seconds'} if $songInfo{'seconds'};
 
-	for my $key (qw(album artist genre name)) {
-
-		next if !$songInfo{$key};
+	# Bug 3318
+	# MiP 1.6+ encode filenames as UTF-8, even on Windows.
+	# So we need to turn the string from MiP to UTF-8, which then gets
+	# turned into the local charset below with utf8encode_locale
+	for my $key (qw(album artist genre name file)) {
+
+		if (!$songInfo{$key}) {
+			next;
+		}
 
 		my $enc = Slim::Utils::Unicode::encodingFromString($songInfo{$key});