[Slim-Checkins] r8757 - in /trunk/server/Slim: Schema/Track.pm Web/Graphics.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Aug  1 12:42:36 2006
New Revision: 8757

URL: http://svn.slimdevices.com?rev=8757&view=rev
Log:
Bug: N/A
Description: Slight simplification of artwork caching now that trackid
is used as the key

Modified:
    trunk/server/Slim/Schema/Track.pm
    trunk/server/Slim/Web/Graphics.pm

Modified: trunk/server/Slim/Schema/Track.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/Track.pm?rev=8757&r1=8756&r2=8757&view=diff
==============================================================================
--- trunk/server/Slim/Schema/Track.pm (original)
+++ trunk/server/Slim/Schema/Track.pm Tue Aug  1 12:42:36 2006
@@ -307,18 +307,17 @@
 	}
 }
 
-sub coverArtPath {
+sub coverArtMtime {
 	my $self = shift;
 	my $artType = shift || 'cover';
 
 	my $artwork = $self->get_column($artType);
 
 	if ($artwork && -r $artwork) {
-		my $mtime = (stat($artwork))[9];
-		return ($artwork, $mtime);
-	}
-
-	return undef;
+		return (stat($artwork))[9];
+	}
+
+	return -1;
 }
 
 sub coverArtExists {

Modified: trunk/server/Slim/Web/Graphics.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Graphics.pm?rev=8757&r1=8756&r2=8757&view=diff
==============================================================================
--- trunk/server/Slim/Web/Graphics.pm (original)
+++ trunk/server/Slim/Web/Graphics.pm Tue Aug  1 12:42:36 2006
@@ -65,7 +65,7 @@
 		$resizeMode = "squash";
 	}
 
-	my ($obj, $imagePath, $imageData, $cachedImage, $cacheKey);
+	my ($obj, $imageData, $cachedImage, $cacheKey);
 
 	if ($trackid eq "current" && defined $client) {
 
@@ -76,24 +76,19 @@
 		$obj = Slim::Schema->find('Track', $trackid);
 	}
 
-	$::d_artwork && msg("Cover Art asking for: $image" . 
+	$::d_artwork && msg("Cover Art asking for trackid: $trackid - $image" . 
 		($requestedWidth ? (" at size " . $requestedWidth . "x" . $requestedHeight) : "") . "\n");
 
-	if (blessed($obj) && $obj->can('coverArtPath')) {
-
-		($imagePath, $mtime) = $obj->coverArtPath($image);
-
-		if ($trackid) {
-
-			$cacheKey = "$trackid-$resizeMode-$requestedWidth-$requestedHeight-$requestedBackColour";	
-
-			$::d_artwork && msg("  artwork cache key: $cacheKey\n");
-
-			$cachedImage = Slim::Utils::Cache->new()->get($cacheKey);
+	if (blessed($obj) && $obj->can('coverArt')) {
+
+		$cacheKey = "$trackid-$resizeMode-$requestedWidth-$requestedHeight-$requestedBackColour";	
+
+		$::d_artwork && msg("  artwork cache key: $cacheKey\n");
+
+		$cachedImage = Slim::Utils::Cache->new()->get($cacheKey);
 		
-			if ($cachedImage && $cachedImage->{'mtime'} != $mtime) {
-				$cachedImage = undef;
-			}
+		if ($cachedImage && $cachedImage->{'mtime'} != $obj->coverArtMtime($image)) {
+			$cachedImage = undef;
 		}
 
 		unless ($cachedImage) {