[Slim-Checkins] r11138 - in /trunk/server/Plugins: MusicMagic/Importer.pm iTunes/Importer.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sat Jan  6 14:17:08 2007
New Revision: 11138

URL: http://svn.slimdevices.com?rev=11138&view=rev
Log:
Bug: n/a
Description: rework progress handling for iTunes, use file name in MusicIP

Modified:
    trunk/server/Plugins/MusicMagic/Importer.pm
    trunk/server/Plugins/iTunes/Importer.pm

Modified: trunk/server/Plugins/MusicMagic/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Importer.pm?rev=11138&r1=11137&r2=11138&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Importer.pm (original)
+++ trunk/server/Plugins/MusicMagic/Importer.pm Sat Jan  6 14:17:08 2007
@@ -332,7 +332,7 @@
 
 		$log->warn("Couldn't create track for $fileurl");
 
-		$progress->update($fileurl) if $progress;
+		$progress->update($songinfo{'file'}) if $progress;
 
 		return;
 	};
@@ -355,7 +355,7 @@
 		}
 	}
 
-	$progress->update if $progress;
+	$progress->update($songinfo{'file'}) if $progress;
 }
 
 sub exportPlaylists {

Modified: trunk/server/Plugins/iTunes/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/iTunes/Importer.pm?rev=11138&r1=11137&r2=11138&view=diff
==============================================================================
--- trunk/server/Plugins/iTunes/Importer.pm (original)
+++ trunk/server/Plugins/iTunes/Importer.pm Sat Jan  6 14:17:08 2007
@@ -150,7 +150,7 @@
 		return;
 	}
 
-	my $progress = Slim::Utils::Progress->new({ 
+	$progress = Slim::Utils::Progress->new({ 
 		'type'  => 'importer', 
 		'name'  => 'itunes', 
 		'total' => $class->getTotalTrackCount($file), 
@@ -198,7 +198,6 @@
 sub handleTrack {
 	my $class    = shift;
 	my $curTrack = shift;
-	my $progress = shift;
 
 	my %cacheEntry = ();
 
@@ -596,7 +595,7 @@
 
 		$inDict = 0;
 
-		$class->handleTrack(\%item, $progress);
+		$class->handleTrack(\%item);
 
 		%item = ();
 	}