Changeset 226

Timestamp:

09/18/07 23:35:28 (1 year ago)

Author:

pmerrill

Message:

• Implemented IMPAwards cover art fetching - Automated only.
  
• Initial framework for Movie support in the browser
  
• Initial framework for Movie support in the media preview
  

Files:

• trunk/SapphireBrowser.m (modified) (3 diffs)
• trunk/SapphireMediaPreview.m (modified) (2 diffs)
• trunk/SapphireMetaData.h (modified) (3 diffs)
• trunk/SapphireMetaData.m (modified) (4 diffs)
• trunk/SapphireMovieImporter.m (modified) (8 diffs)
• trunk/SapphireTVShowImporter.m (modified) (1 diff)

trunk/SapphireBrowser.m

@@ -409 +409 @@
-*/
-        NSString * displayName=nil ;
+        int fileCls=0 ;
-        /*Check for no items*/
-        int nameCount = [_names count];
@@ -445 +446 @@
-                if(meta != nil)
-                {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        watched = [meta watched];
-                        favorite = [meta favorite] ;
@@ -468 +489 @@
-        else if(!watched) [result setLeftIcon:[theme gem:BLUE_GEM_KEY]];
-        else if(favorite)[result setLeftIcon:[theme gem:YELLOW_GEM_KEY]];
+        else if(fileCls==FILE_CLASS_AUDIO)[result setLeftIcon:[theme gem:GREEN_GEM_KEY]];
-        else [result setLeftIcon:[theme gem:RED_GEM_KEY]];
-                        

trunk/SapphireMediaPreview.m

@@ -183 +183 @@
-}
-
-
-
+
+
+
+
- */
-- (void)_populateMetadata
@@ -197 +199 @@
-        NSMutableDictionary *allMeta = [meta getDisplayedMetaDataInOrder:&order];
-        /*Pull out the special ones*/
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
-}
-
-/*Get the rating*/
-value = [allMeta objectForKey:META_RATING_KEY
-
-[_metadataLayer setRating:value];
-
-/*Get the description*/
-value = [allMeta objectForKey:META_DESCRIPTION_KEY];
-if(value != nil)
-
-       [_metadataLayer setSummary:value];
-
-/*Get the copyright*/
-value = [allMeta objectForKey:META_COPYRIGHT_KEY
-if(value != nil)
-[_metadataLayer setCopyright:value];
-
-/*Get the season and epsiodes*/
-value = [allMeta objectForKey:META_EPISODE_AND_SEASON_KEY];
-if(value != nil)
-{
-/*Remove the individuals so we don't display them*/
-[allMeta removeObjectForKey:META_EPISODE_NUMBER_KEY];
-
-}
+
+       /*Get the rating*/
+
+       if(value != nil)
+               [_metadataLayer setRating:value
+
+/*Get the description*/
+
+       if(value != nil)
+               if([[SapphireSettings sharedSettings] displaySpoilers])
+                       [_metadataLayer setSummary:value];
+
+/*Get the copyright*/
+
+       if(value != nil)
+               [_metadataLayer setCopyright:value
+
+/*Get the season and epsiodes*/
+       value = [allMeta objectForKey:META_EPISODE_AND_SEASON_KEY];
+       if(value != nil)
+       {
+               /*Remove the individuals so we don't display them*/
+               [allMeta removeObjectForKey:META_EPISODE_NUMBER_KEY];
+       [allMeta removeObjectForKey:META_SEASON_NUMBER_KEY];
+}
+
+
-        
-        NSMutableArray *values = [NSMutableArray array];

trunk/SapphireMetaData.h

@@ -35 +35 @@
-
-//IMDB Type Info
-
+
+
-
-//Special Display Only Info
@@ -46 +47 @@
-#define META_DATA_FILE_INFO_KIND                                                @"MetaDataFileInfoKind"
-
+#define FILE_CLASS_KEY                          @"File Class"
-typedef enum {
-        FILE_CLASS_UNKNOWN = 0,
@@ -181 +183 @@
-- (int)seasonNumber;
-- (NSString *)episodeTitle;
+- (NSString *)movieTitle;
-- (NSString *)showID;
-- (NSString *)showName ;

trunk/SapphireMetaData.m

@@ -36 +36 @@
-#define VIDEO_DESC_KEY                          @"Video Description"
-#define AUDIO_FORMAT_KEY                        @"Audio Format"
-
+//
-
-@implementation NSString (episodeSorting)
@@ -1376 +1376 @@
-                META_COPYRIGHT_KEY,
-                META_TITLE_KEY,
+                META_MOVIE_TITLE_KEY,
-                META_SHOW_AIR_DATE,
-                //These are displayed as line items
@@ -1722 +1723 @@
-        NSMutableDictionary *ret = [metaData mutableCopy];
-        [ret addEntriesFromDictionary:[ret objectForKey:META_TVRAGE_IMPORT_KEY]];
+        [ret addEntriesFromDictionary:[ret objectForKey:META_IMDB_IMPORT_KEY]];
-        [ret addEntriesFromDictionary:[ret objectForKey:META_XML_IMPORT_KEY]];
-        combinedInfo = ret;
@@ -1765 +1767 @@
-        [self constructCombinedData];
-        return [combinedInfo objectForKey:META_TITLE_KEY] ;
+}
+
+/*!
+* @brief Returns the title of the file
+ *
+ * @return The title of the file
+ */
+- (NSString *)movieTitle
+{
+        [self constructCombinedData];
+        return [combinedInfo objectForKey:META_MOVIE_TITLE_KEY] ;
-}
-

trunk/SapphireMovieImporter.m

@@ -13 +13 @@
-
- /* IMDB XPATHS */
-
-
-
+
+
+
+
- 
- 
@@ -25 +26 @@
-{
-        NSString *destination;
-
-
+
+
+
+
+
-@end
-
@@ -33 +37 @@
-* @brief Initialize a cover art downloader
- *
+ * @param reqList The list of url requests to try
- * @param dest The path to save the file
- */
-Dest:(NSString *)dest
+Request:(NSArray*)reqList withDestination:(NSString *)dest;
-{
-        self = [super init];
@@ -42 +47 @@
-        
-        destination = [dest retain];
+        requestList = [reqList retain];
-        
-        return self;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-- (void)dealloc
-{
-        [destination release];
+        [requestList release];
-        [super dealloc];
-}
@@ -61 +87 @@
-- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
-@end
-
@@ -116 +151 @@
- * @return A cached dictionary of the movie info
- */
-
+ withPath:(NSString*)moviePath
-{
-        NSError *error = nil;
@@ -123 +158 @@
-        NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://www.IMDB.com%@",movieName]];
-        NSXMLDocument *document = [[NSXMLDocument alloc] initWithContentsOfURL:url options:NSXMLDocumentTidyHTML error:&error];
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Dump XML document to disk (Dev Only) */
-
-
-
-
-
-
+
+
+
+
+
+
+
-        return ret;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/*!
@@ -295 +373 @@
-        }
-        
-
-
-
-
-
-
+
-        NSMutableDictionary *info = nil;
-
+ withPath:path
-        if(!info)
-
-
-
-
+
-        [info removeObjectForKey:LINK_KEY];
-        [metaData importInfo:info fromSource:META_IMDB_IMPORT_KEY withTime:[[NSDate date] timeIntervalSince1970]];

trunk/SapphireTVShowImporter.m

@@ -20 +20 @@
-#define TVRAGE_SEARCH_XPATH @"//*[@class='b1']/a"
-#define TVRAGE_UNKNOWN_XPATH @"//*[contains(text(), 'Unknown Page')]"
- 
-/* IMDB XPATHS */
-#define IMDB_SEARCH_XPATH @"//td[starts-with(a/@href,'/title')]"
-#define IMDB_RESULT_LINK_XPATH @"a/@href"
-#define IMDB_RESULT_NAME_XPATH @"normalize-space(string())"
-
-#define TRANSLATIONS_KEY                @"Translations"