Changeset 527

Timestamp:

05/03/08 16:44:03 (8 months ago)

Author:

gbooker

Message:

Switched to getting the screenshot url out of the ep list. This is far faster, and actually more reliable now that tvrage is doing the preview movies on the ep page.

Files:

• trunk/SapphireFrappliance/SapphireTVShowImporter.m (modified) (9 diffs)

trunk/SapphireFrappliance/SapphireTVShowImporter.m

@@ -31 +31 @@
-#define TVRAGE_EP_INFO @".//*[@class='b2']/*"
-#define TVRAGE_EP_TEXT @".//*[@class='b2']/text()"
-
+.
-#define TVRAGE_SEARCH_XPATH @"//*[@class='b1']/a"
-#define TVRAGE_UNKNOWN_XPATH @"//*[contains(text(), 'Unknown Page')]"
@@ -37 +37 @@
-#define TRANSLATIONS_KEY                @"Translations"
-#define LINK_KEY                                @"Link"
+#define IMG_URL                                 @"imgURL"
-
-/*Delegate class to download cover art*/
@@ -128 +129 @@
-
-/*!
- * @brief Fetches the screencap URL from a show's info URL
- *
- * @param epUrl The show's info URL
- * @return The screencap URL if it exists, nil otherwise
- */
-- (NSString *)getScreencapUrl:(NSString *)epUrl
-{
-        /*Get the HTML document*/
-        NSURL *url = [NSURL URLWithString:epUrl];
-        NSError *error = nil;
-        NSXMLDocument *document = [[NSXMLDocument alloc] initWithContentsOfURL:url options:NSXMLDocumentTidyHTML error:&error];
-        
-        /*Search for a screencap*/
-        NSXMLElement *html = [document rootElement];
-        NSArray *caps = [html objectsForXQuery:TVRAGE_SCREEN_CAP_XPATH error:&error];
-        if([caps count])
-                /*Found one; return it*/
-                return [[(NSXMLElement *)[caps objectAtIndex:0] attributeForName:@"src"] stringValue];
-        /*None found*/
-        return nil;
-}
-
-/*!
- * @brief Add an episode's info into our cache dict
- *
@@ -161 +139 @@
- * @param epNumber The absolute episode number
- * @param airDate The episode's air date
+ * @param imgURL The episode's screenshot URL
- * @param dict The cache dictionary
- */
-
+imgURL:(NSString *)imgURL 
-{
-        /*Set the key by which to store this.  Either by season/ep or season/title*/
@@ -203 +182 @@
-        if(airDate != nil)
-                [epDict setObject:airDate forKey:META_SHOW_AIR_DATE];
+        if(imgURL != nil)
+                [epDict setObject:imgURL forKey:IMG_URL];
-}
-
@@ -254 +235 @@
-                NSMutableString *summary = nil;
-                NSDate *airDate = nil;
+                NSString *imageURL = nil;
-                
-                /*Get the info pieces*/
@@ -313 +295 @@
-                                        summary = nil;
-                        }
+                        else if(imageURL == nil)
+                        {
+                                NSArray *images = [epInfo objectsForXQuery:TVRAGE_SCREEN_CAP_XPATH error:&error];
+                                if([images count])
+                                {
+                                        imageURL = [[(NSXMLElement *)[images objectAtIndex:0] attributeForName:@"src"] stringValue];
+                                }
+                        }
-                }
-                epInfos = [epNode objectsForXQuery:TVRAGE_EP_TEXT error:&error];
@@ -333 +323 @@
-                }
-                /*Add to cache*/
-
+imgURL:imageURL 
-        }
-        return ret;
@@ -621 +611 @@
-        [[NSFileManager defaultManager] constructPath:previewArtPath];
-        /*Check for screen cap locally and on server*/
-
-
+
-        NSString *newPath = [previewArtPath stringByAppendingPathComponent:fileName];
-        NSString *imageDestination = [[newPath stringByDeletingPathExtension] stringByAppendingPathExtension:@"jpg"];
-        BOOL isDir = NO;
-        BOOL imageExists = [[NSFileManager defaultManager] fileExistsAtPath:imageDestination isDirectory:&isDir] && !isDir;
-
-
-
-
+
-        {
-                /*Download the screen cap*/
-age
+gURL
-                NSURLRequest *request = [NSURLRequest requestWithURL:imageURL];
-                SapphireTVShowDataMenuDownloadDelegate *myDelegate = [[SapphireTVShowDataMenuDownloadDelegate alloc] initWithDest:imageDestination];