Ticket #196: preview_jpg_fallback.diff

SapphireMediaPreview.m

@@ -146 +146 @@
  */
 - (NSString *)coverArtForPath
 {
+        NSString *ret = nil;
+
         /*See if this is a directory*/
         if([meta isKindOfClass:[SapphireDirectoryMetaData class]])
         {
-                NSString *ret = [(SapphireDirectoryMetaData *)meta coverArtPath];
-                if(ret != nil)
-                        return ret;
+                ret = [(SapphireDirectoryMetaData *)meta coverArtPath];
         } else {
-                NSString *ret = [(SapphireFileMetaData *)meta coverArtPath];
-                if(ret != nil)
-                        return ret;
-                else if ((ret = [dirMeta coverArtPath]) != nil)
-                        return ret;
+                ret = [(SapphireFileMetaData *)meta coverArtPath];
+                if(ret == nil)
+                        ret = [dirMeta coverArtPath];
+                if(ret == nil)
+                {
+                        /* If we have no cover art we check for a user specified FrontRow "Preview.jpg" */
+                        ret = [[meta path] stringByAppendingPathComponent:@"Preview.jpg"];
+                        if( ![[NSFileManager defaultManager] fileExistsAtPath:ret] )
+                                ret = nil;
+                }
         }
         /*Fallback to default*/
-        return [[NSBundle bundleForClass:[self class]] pathForResource:@"DefaultPreview" ofType:@"png"];
+        if( ret == nil )
+                ret = [[NSBundle bundleForClass:[self class]] pathForResource:@"DefaultPreview" ofType:@"png"];
+        
+        return ret;
 }
 
 /*!