[Slim-Checkins] r11166 - in /trunk/server: Plugins/MusicMagic/Importer.pm Plugins/iTunes/Importer.pm Slim/Music/Artwork.pm Slim/Schema.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Mon Jan  8 18:54:45 2007
New Revision: 11166

URL: http://svn.slimdevices.com?rev=11166&view=rev
Log:
Bug: n/a
Description: 
 	- "if $progress" shouldn't be required any more.
	- add info where possible to progress updates


Modified:
    trunk/server/Plugins/MusicMagic/Importer.pm
    trunk/server/Plugins/iTunes/Importer.pm
    trunk/server/Slim/Music/Artwork.pm
    trunk/server/Slim/Schema.pm

Modified: trunk/server/Plugins/MusicMagic/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Importer.pm?rev=11166&r1=11165&r2=11166&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Importer.pm (original)
+++ trunk/server/Plugins/MusicMagic/Importer.pm Mon Jan  8 18:54:45 2007
@@ -332,7 +332,7 @@
 
 		$log->warn("Couldn't create track for $fileurl");
 
-		$progress->update($songInfo{'file'}) if $progress;
+		$progress->update($songInfo{'file'});
 
 		return;
 	};
@@ -355,7 +355,7 @@
 		}
 	}
 
-	$progress->update($songInfo{'file'}) if $progress;
+	$progress->update($songInfo{'file'});
 }
 
 sub exportPlaylists {

Modified: trunk/server/Plugins/iTunes/Importer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/iTunes/Importer.pm?rev=11166&r1=11165&r2=11166&view=diff
==============================================================================
--- trunk/server/Plugins/iTunes/Importer.pm (original)
+++ trunk/server/Plugins/iTunes/Importer.pm Mon Jan  8 18:54:45 2007
@@ -182,7 +182,7 @@
 sub doneScanning {
 	my $class = shift;
 
-	$progress->final($class->getTotalPlaylistCount) if $progress;
+	$progress->final($class->getTotalPlaylistCount);
 
 	$log->info("Finished Scanning");
 
@@ -207,7 +207,7 @@
 	my $type     = undef;
 
 	# Always update the progress, even if we return.
-	$progress->update if $progress;
+	$progress->update;
 
 	# We got nothin
 	if (scalar keys %{$curTrack} == 0) {
@@ -422,11 +422,11 @@
 	my $class      = shift;
 	my $cacheEntry = shift;
 
-	# Always update the progress.
-	$progress->update if $progress;
-
 	my $name = Slim::Utils::Misc::unescape($cacheEntry->{'TITLE'});
 	my $url  = join('', 'itunesplaylist:', Slim::Utils::Misc::escape($name));
+
+	# Always update the progress.
+	$progress->update($name);
 
 	$log->info("Got a playlist ($url) named $name");
 
@@ -568,7 +568,7 @@
 			$inPlaylists = 1;
 
 			# Set the progress to final when we're done with tracks and have moved on to playlists.
-			$progress->final if $progress;
+			$progress->final;
 			
 			$progress = Slim::Utils::Progress->new({ 
 				'type'  => 'importer', 

Modified: trunk/server/Slim/Music/Artwork.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Artwork.pm?rev=11166&r1=11165&r2=11166&view=diff
==============================================================================
--- trunk/server/Slim/Music/Artwork.pm (original)
+++ trunk/server/Slim/Music/Artwork.pm Mon Jan  8 18:54:45 2007
@@ -95,7 +95,7 @@
 			$album->update;
 		}
 
-		$progress->update;
+		$progress->update($track->album->name);
 	}
 
 	$progress->final($count) if $count;

Modified: trunk/server/Slim/Schema.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema.pm?rev=11166&r1=11165&r2=11166&view=diff
==============================================================================
--- trunk/server/Slim/Schema.pm (original)
+++ trunk/server/Slim/Schema.pm Mon Jan  8 18:54:45 2007
@@ -1242,7 +1242,7 @@
 			$albumObj->update;
 		}
 
-		$progress->update;
+		$progress->update($albumObj->name);
 	}
 
 	$progress->final($count) if $progress;