Changeset 827

Timestamp:

04/26/2009 05:24:48 PM (3 years ago)

Author:

gbooker

Message:

Added screen capture ability thanks to patch by wazza. Does not work on ATV since ATV is broken.
Fixes #45

Location:

branches/CoreData/SapphireFrappliance

Files:

• Browser/SapphireMarkMenu.m (modified) (5 diffs)
• Extension/NSFileManager-Extensions.h (modified) (1 diff)
• Extension/NSFileManager-Extensions.m (modified) (2 diffs)
• Extension/NSImage-Extensions.h (added)
• Extension/NSImage-Extensions.m (added)
• MetaDataImporting/SapphirePosterChooser.h (modified) (2 diffs)
• MetaDataImporting/SapphirePosterChooser.m (modified) (9 diffs)
• MetaDataImporting/SapphireTVShowImporter.m (modified) (3 diffs)
• MetaDataImporting/SapphireXMLFileDataImporter.m (modified) (3 diffs)
• Players/SapphireMedia.h (modified) (2 diffs)
• Players/SapphireMedia.m (modified) (4 diffs)
• Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)

branches/CoreData/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -33 +33 @@
 #import "SapphireConfirmPrompt.h"
 #import "SapphireApplianceController.h"
+#import "SapphirePosterChooser.h"
+#import "NSImage-Extensions.h"
+#import "NSFileManager-Extensions.h"
+
+BOOL allowCoverArtChange( NSString * const path )
+{
+        if ( [[NSFileManager defaultManager] hasVIDEO_TS:path] )
+                return NO;
+        
+        const NSSet * const disallowedFormats = [[NSSet alloc] initWithObjects:@"mkv", @"flv", nil];
+        
+        return ![disallowedFormats containsObject:[path pathExtension]];
+}
 
 @implementation SapphireMarkMenu
@@ -51 +64 @@
         COMMAND_CUT_PATH,
         COMMAND_DELETE_PATH,
+        COMMAND_CHANGE_ARTWORK,
         //File Only Commands
         COMMAND_MARK_TO_JOIN,
@@ -365 +379 @@
                                 [NSNumber numberWithInt:COMMAND_DELETE_PATH], MARK_COMMAND,
                                 nil]];
+                // Allow cover art change for all formats except for DVD, .mkv, and .flv
+                // QTMovie is broken on the ATV, don't do it there
+                if ( [SapphireFrontRowCompat usingFrontRow] && ![SapphireFrontRowCompat usingTakeTwo] && allowCoverArtChange( [meta path] ) )
+                {
+                        [marks addObject:
+                                [NSDictionary dictionaryWithObjectsAndKeys:
+                                        BRLocalizedString(@"Change artwork", @"Change artwork"), MARK_NAME,
+                                        BRLocalizedString(@"Select displayed artwork", @""), MARK_DESCRIPTION,
+                                        [NSNumber numberWithInt:COMMAND_CHANGE_ARTWORK], MARK_COMMAND,
+                                        nil]];
+                }
         }
         else
@@ -384 +409 @@
 }
 
-- (NSController *)doJoin:(SapphireWaitDisplay *)wait
+- (BRLayerController *)loadArtwork:(SapphireFileMetaData *)fileMeta
+{
+        NSInvocation *invoke = [NSInvocation invocationWithMethodSignature: [self methodSignatureForSelector: @selector(doChangeArtwork:)]];
+        [invoke setSelector: @selector(doChangeArtwork:)];
+        [invoke setTarget:   self];
+        
+        SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene: [self scene]
+                                                                                                                                         title: BRLocalizedString(@"Getting artwork selection", @"Getting artwork selection")
+                                                                                                                                invokation: invoke];
+        
+        [invoke setArgument: &fileMeta atIndex: 2];
+        return [wait autorelease];
+}
+
+- (BRLayerController *)doChangeArtwork:(SapphireFileMetaData *)fileMeta
+{
+        SapphirePosterChooser *controller = [[SapphirePosterChooser alloc] initWithScene:[self scene]];
+
+        [controller setListTitle:BRLocalizedString(@"Select cover art", @"Select cover art")];
+        [controller setMovieTitle:@" "];
+        [controller setFile:fileMeta];
+        [controller setPosterImages:[NSImage imagesFromMovie:[fileMeta path] forArraySize:10]];
+        
+        NSInvocation *invoke = [NSInvocation invocationWithMethodSignature: [self methodSignatureForSelector:@selector(loadArtwork:)]];
+        [invoke setSelector:@selector(loadArtwork:)];
+        [invoke setTarget: self];
+        [invoke setArgument:&fileMeta atIndex:2];
+        [controller setRefreshInvokation:invoke];
+        
+        return [controller autorelease];
+}
+
+- (BRLayerController *)doJoin:(SapphireWaitDisplay *)wait
 {
         @try {
@@ -704 +761 @@
                                 replaceController = [confirm autorelease];
                         }
+                                break;
+                        case COMMAND_CHANGE_ARTWORK:
+                                replaceController = [self loadArtwork:fileMeta];
+                                break;
                 }
         }

branches/CoreData/SapphireFrappliance/Extension/NSFileManager-Extensions.h

@@ -72 +72 @@
 - (BOOL)acceptFilePath:(NSString *)path;
 
+/*!
+ * @brief Returns the cover art path for a TV show & season
+ *
+ * @param[in] show      TV Show name
+ * @param[in] seasonNum Season number
+ *
+ * @return cover art path
+ */
++ (NSString *)previewArtPathForTV:(NSString *)show season:(unsigned int)seasonNum;
 @end

branches/CoreData/SapphireFrappliance/Extension/NSFileManager-Extensions.m

@@ -20 +20 @@
 
 #import "NSFileManager-Extensions.h"
+#import "SapphireMetaDataSupport.h"
 
 @implementation NSFileManager (SapphireExtensions)
@@ -123 +124 @@
 }
 
++ (NSString *)previewArtPathForTV:(NSString *)show season:(unsigned int)seasonNum
+{
+        return [NSString stringWithFormat:@"%@/@TV/%@/%@",      [SapphireMetaDataSupport collectionArtPath],
+                                                                                                                show,
+                                                                                                                [NSString stringWithFormat:@"Season %d", seasonNum]];
+}
 @end

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.h

@@ -42 +42 @@
         BRBlurryImageLayer              *defaultImage;  /*!< @brief The image to use when the poster isn't loaded yet*/
         SapphireFileMetaData    *meta;                  /*!< @brief The file's meta*/
+        NSInvocation                    *refreshInvoke; /*!< @brief Should the chooser allow a refresh of the available cover art*/
 }
+
+/*!
+ * @brief Sets the invokation to refresh
+ *
+ * @param[in] invoke The invokation to refresh
+ */
+- (void)setRefreshInvokation: (NSInvocation *)invoke;
 
 /*!
@@ -61 +69 @@
  * @brief Sets the posters to choose from
  *
- * @param posterList The list of movies to choose from
+ * @param posterList The list of movies to choose from specified as paths
  */
 - (void)setPosters:(NSArray *)posterList;
+
+/*!
+ * @brief Sets the posters to choose from
+ *
+ * @param posterList The cover art to choose from specified as image objects
+ */
+- (void)setPosterImages:(NSArray *)posterList;
 
 /*!

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.m

@@ -25 +25 @@
 #import "SapphireMedia.h"
 #import "SapphireMetaData.h"
+#import "SapphireWaitDisplay.h"
 #import "SapphireDirectoryMetaData.h"
 #import <SapphireCompatClasses/SapphireFrontRowCompat.h>
 #import "SapphireApplianceController.h"
+
+#import "NSImage-Extensions.h"
 
 NSData *CreateBitmapDataFromImage(CGImageRef image, unsigned int width, unsigned int height);
@@ -94 +97 @@
 }
 
+- (void)setRefreshInvokation: (NSInvocation *)invoke;
+{
+        [refreshInvoke release];
+        refreshInvoke = [invoke retain];
+}
+
 - (void) resetLayout
 {
@@ -147 +156 @@
 }
 
+- (BRLayerController *)doRefresh
+{
+        [refreshInvoke invoke];
+        BRLayerController *ret = nil;
+        [refreshInvoke getReturnValue:&ret];
+        return ret;
+}
+
 - (void) itemSelected: (long) row
 {
         /*User made a selection*/
-        //      if(selection==0)
-        //      {
-        /*User requested a menu refresh*/
-        //              [self resetLayout];
-        //      }
-        //      else
-        //      {
-        selectedPoster = row;
-        [[self stack] popController];
-        //      }
+        if ( refreshInvoke != nil && row == [posters count] )
+        {
+                NSInvocation *invoke = [NSInvocation invocationWithMethodSignature: [self methodSignatureForSelector: @selector(doRefresh)]];
+                [invoke setSelector: @selector(doRefresh)];
+                [invoke setTarget:   self];
+                
+                SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene: [self scene]
+                                                                                                                                                 title: BRLocalizedString(@"Getting artwork selection", @"Getting artwork selection")
+                                                                                                                                        invokation: invoke];
+                [[self stack] swapController:wait];
+        }
+        else
+        {
+                selectedPoster = row;
+                if ( [[posters objectAtIndex:selectedPoster] isKindOfClass:[NSImage class]] )
+                        [[posters objectAtIndex:row] writeToFile:[meta coverArtPath] atomically:YES];
+                [[self stack] popController];
+        }
 }
 
@@ -186 +211 @@
     [posterMarch setIconSource: self];
         [[self list] setDatasource:self];
+}
+
+- (void)setPosterImages:(NSArray *)posterList
+{
+        posters = [posterList retain];
+
+        [posterMarch release];
+        posterMarch = nil;
+
+        [[self list] setDatasource: self];
 }
 
@@ -234 +269 @@
         
         NSRect master = [SapphireFrontRowCompat frameOfController:self];
-        [fileInfoText setMaximumSize:NSMakeSize(master.size.width * 2.0f/3.0f, master.size.height * 0.4f)];
-        NSSize txtSize = [fileInfoText renderedSize];
+        NSSize txtSize = [SapphireFrontRowCompat textControl:fileInfoText renderedSizeWithMaxSize:NSMakeSize(master.size.width * 2.0f/3.0f, master.size.height * 0.4f)];
         NSRect frame;
         frame.origin.x = (master.size.width - txtSize.width) * 0.5f;
@@ -274 +308 @@
 - (long) itemCount
 {
+        if ( refreshInvoke != nil ) 
+                return [posters count] + 1;
+        
         return [posters count];
 }
@@ -281 +318 @@
 {
         BRAdornedMenuItemLayer *result = [SapphireFrontRowCompat textMenuItemForScene:[self scene] folder:NO];
-        //      if(row==0)
-        //              [SapphireFrontRowCompat setTitle:BRLocalizedString(@"< Refresh Posters >", @"Reload poster images") forMenu:result];
-        //      else
-        [SapphireFrontRowCompat setTitle:[NSString stringWithFormat:@"Version %2d",row+1] forMenu:result];
+        if ( refreshInvoke != nil && row == [posters count] )
+                [SapphireFrontRowCompat setTitle:BRLocalizedString(@"Refresh", @"Reload images") forMenu:result];
+        else
+                [SapphireFrontRowCompat setTitle:[NSString stringWithFormat:@"Version %2d",row+1] forMenu:result];
         return result;
 }
@@ -292 +329 @@
         if(row > [posters count])
                 return nil;
-        else
-                return [NSString stringWithFormat:@"Version %2d",row+1];
+
+        if (refreshInvoke != nil && row == [posters count])
+                return BRLocalizedString(@"Refresh", @"Reload images");
+
+        return [NSString stringWithFormat:@"Version %2d",row+1];
 }
 
@@ -438 +478 @@
         if(posterMarch != nil)
                 return nil;
+
         SapphireMediaPreview *preview = [[SapphireMediaPreview alloc] initWithScene:[self scene]];
-        SapphireMedia *asset = [[SapphireMedia alloc] initWithMediaURL:[NSURL fileURLWithPath:@"none"]];
-        NSString *poster = [posters objectAtIndex:row];
-        NSString *posterDest=[NSString stringWithFormat:@"%@/%@",
-                                                  [applicationSupportDir() stringByAppendingPathComponent:@"Poster_Buffer"],
-                                                  [poster lastPathComponent]];
-        [preview setShowsMetadataImmediately:NO];
-        SapphireDirectoryMetaData *parent = [meta parent];
-        [preview setMetaData:meta inMetaData:parent];
         [preview setShowsMetadataImmediately:YES];
-        [asset setImagePath:posterDest];
-        [preview setAsset:asset];
-        [asset release];
-        
+        
+        if ( row < [posters count] )
+        {
+                [preview setMetaData:meta inMetaData:[meta parent]];
+                
+                SapphireMedia *asset = [[SapphireMedia alloc] initWithMediaURL:[NSURL fileURLWithPath:@"none"]];
+                id poster = [posters objectAtIndex:row];
+
+                if ( [poster isKindOfClass:[NSString class]] )
+                {
+                        NSString *posterDest = [NSString stringWithFormat:@"%@/%@",     [applicationSupportDir() stringByAppendingPathComponent:@"Poster_Buffer"],
+                                                                                                                                                [poster lastPathComponent]];
+                        [asset setImagePath: posterDest];
+                }
+                else
+                {
+                        [asset setImage: poster];
+                }
+
+                [preview setAsset:asset];
+                [asset release];
+        }
+        else if ( row == [posters count] )
+        {
+                NSMutableDictionary *refreshMeta = [[NSMutableDictionary alloc] init];
+                [refreshMeta setObject: BRLocalizedString( @"Refresh the artwork selection", @"Refresh the artwork selection" ) forKey: META_TITLE_KEY];
+                [preview setUtilityData: refreshMeta];
+        }
+
         return [preview autorelease];
 }

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

@@ -29 +29 @@
 #import "SapphireEpisode.h"
 #import "SapphireSettings.h"
+#import "NSImage-Extensions.h"
+
 
 /* TVRage XPATHS  */
@@ -631 +633 @@
                 
         /* Lets process the cover art directory structure */
-        NSString * previewArtPath=[NSString stringWithFormat:@"%@/@TV/%@/%@",
-                                                                        [SapphireMetaDataSupport collectionArtPath],
-                                                                        [info objectForKey:META_SHOW_NAME_KEY],
-                                                                        [NSString stringWithFormat:@"Season %d",[[info objectForKey:META_SEASON_NUMBER_KEY] intValue]]];
+        NSString * previewArtPath = [NSFileManager previewArtPathForTV:[info objectForKey:META_SHOW_NAME_KEY] season:[[info objectForKey:META_SEASON_NUMBER_KEY] intValue]];
                                                 
         [[NSFileManager defaultManager] constructPath:previewArtPath];
@@ -656 +655 @@
                 [myDelegate release];
         }
+        else if(!imageExists)
+        {
+                //QTMovie is broken on ATV, don't fetch images there
+                if ([SapphireFrontRowCompat usingFrontRow] && ![SapphireFrontRowCompat usingTakeTwo] && [metaData fileContainerType] == FILE_CONTAINER_TYPE_QT_MOVIE)
+                {
+                        // NSImage-Extensions
+                        [[NSImage imageFromMovie:path] writeToFile:imageDestination atomically:YES];
+                }
+        }
         
         /*Import the info*/

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m

@@ -23 +23 @@
 #import "SapphireMediaPreview.h"
 #import "SapphireXMLData.h"
+#import "NSImage-Extensions.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46 +47 @@
 #define SEARCH_EPISODE_XML_QUERY        @"/media/searchEpisode/text()"
 #define SEARCH_IMDB_XML_QUERY           @"/media/searchIMDB/text()"
+#define SCREENCAP_XML_QUERY                     @"/media/imageTime/text()"
+
 //Multi Attributes              
 #define TITLE_XML_QUERY                         @"/media/title/text()"
@@ -177 +180 @@
         }
         /*Special cases*/
+        /* Screen Cap */
+        NSArray *imageCaps = [root objectsForXQuery:SCREENCAP_XML_QUERY error:&error];
+        if ( [imageCaps count] && [metaData fileContainerType] == FILE_CONTAINER_TYPE_QT_MOVIE )
+        {
+                unsigned int hour;
+                unsigned int minute;
+                unsigned int second;
+                
+                sscanf( [[[imageCaps objectAtIndex:0] stringValue] cString], "%u:%u:%u", &hour, &minute, &second );
+                NSData * image = [NSImage imageFromMovie: [metaData path] atTime: ((60*60*hour) + (60*minute) + second)];
+                [image writeToFile:[metaData coverArtPath] atomically:YES];
+        }
+
         /*The air date*/
         NSString *value = [newMetaData objectForKey:META_SHOW_AIR_DATE];

branches/CoreData/SapphireFrappliance/Players/SapphireMedia.h

@@ -28 +28 @@
         unsigned int            resumeTime;             /*!< @brief The resume time to use, 0 to use super*/
         NSString                        *imagePath;             /*!< @brief The cover art path to use, nil to use super*/
+        NSImage                         *coverart;              /*!< @brief The cover art as image data */
 }
 
@@ -52 +53 @@
 - (void)setImagePath:(NSString *)path;
 
+/*!
+ * @brief Sets the image for cover art so it can be displayed
+ *
+ * param[in] image The cover art as an NSImage object
+ */
+- (void)setImage:(NSImage *)image;
+
 @end

branches/CoreData/SapphireFrappliance/Players/SapphireMedia.m

@@ -20 +20 @@
 
 #import "SapphireMedia.h"
+#import "NSImage-Extensions.h"
 #import <SapphireCompatClasses/SapphireFrontRowCompat.h>
 
@@ -40 +41 @@
 {
         [imagePath release];
+        [coverart release];
         [super dealloc];
 }
@@ -64 +66 @@
 }
 
+- (void)setImage:(NSImage *)image
+{
+        [coverart release];
+        coverart = [image retain];
+}
+
 - (id)mediaType
 {
@@ -79 +87 @@
 - (id)coverArt
 {
-        return [SapphireFrontRowCompat imageAtPath:imagePath];
+        if (imagePath)
+                return [SapphireFrontRowCompat imageAtPath:imagePath];
+        
+        if (coverart)
+                return [SapphireFrontRowCompat coverartAsImage:[coverart asImageRef]];
+
+        return nil;
 }
 

branches/CoreData/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

@@ -54 +54 @@
                 38FAFC320C012A7800853CFE /* SapphireAppliance.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FAFC2F0C012A7800853CFE /* SapphireAppliance.m */; };
                 38FAFC330C012A7800853CFE /* SapphireBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FAFC310C012A7800853CFE /* SapphireBrowser.m */; };
+                805420AA0F94FA7E002D2DBF /* NSImage-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 805420A90F94FA7E002D2DBF /* NSImage-Extensions.m */; };
                 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
                 F500400B0D1998B4003FEA08 /* SapphireLeopardOnly.h in Headers */ = {isa = PBXBuildFile; fileRef = F50040090D1998B4003FEA08 /* SapphireLeopardOnly.h */; };
@@ -358 +359 @@
                 38FAFC300C012A7800853CFE /* SapphireAppliance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SapphireAppliance.h; sourceTree = "<group>"; };
                 38FAFC310C012A7800853CFE /* SapphireBrowser.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SapphireBrowser.m; sourceTree = "<group>"; };
+                805420A80F94FA7E002D2DBF /* NSImage-Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage-Extensions.h"; sourceTree = "<group>"; };
+                805420A90F94FA7E002D2DBF /* NSImage-Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSImage-Extensions.m"; sourceTree = "<group>"; };
                 8D5B49B6048680CD000E48DA /* Sapphire.frappliance */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Sapphire.frappliance; sourceTree = BUILT_PRODUCTS_DIR; };
                 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -820 +823 @@
                                 FE076E3E0D0CCAA40053FF1A /* NSFileManager-Extensions.h */,
                                 FE076E3F0D0CCAA40053FF1A /* NSFileManager-Extensions.m */,
+                                805420A80F94FA7E002D2DBF /* NSImage-Extensions.h */,
+                                805420A90F94FA7E002D2DBF /* NSImage-Extensions.m */,
                                 F571B7AC0E9C360500B7FD9D /* NSManagedObject-Extensions.h */,
                                 F571B7AD0E9C360500B7FD9D /* NSManagedObject-Extensions.m */,
@@ -1354 +1359 @@
                                 F52E4E2F0F4397D700AC6C52 /* SapphireWaitDisplay.m in Sources */,
                                 F52E4EAA0F43B53F00AC6C52 /* SapphireConfirmPrompt.m in Sources */,
+                                805420AA0F94FA7E002D2DBF /* NSImage-Extensions.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;