Changeset 1146 for branches/PlayerFramework

Timestamp:

02/18/10 21:54:49 (2 years ago)

Author:

gbooker

Message:

Merged changes from trunk

Location:

branches/PlayerFramework

Files:

• . (modified) (1 prop)
• Doxyfile (modified) (1 prop)
• SapphireCompatibilityClasses (modified) (1 prop)
• SapphireFrappliance (modified) (1 prop)
• SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m (modified) (1 diff)
• SapphireFrappliance/MetaDataImporting/SapphireScraper.m (modified) (1 diff)
• SapphireFrappliance/MetaDataImporting/Scrapers/tvrage.xml (modified) (2 diffs)
• Software Loader (modified) (1 prop)

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -284 +284 @@
                 thumbs = [thumbs arrayByAddingObjectsFromArray:[fanart elementsForName:@"thumb"]];
         
-        if([thumbs count] && [delegate canDisplayChooser])
+        BOOL canDisplay = [delegate canDisplayChooser];
+        if(canDisplay && [thumbs count])
                 [self getMoviePostersForState:state translation:tran thumbElements:thumbs];
         else
-                [self completeWithState:state withStatus:ImportStateUpdated importComplete:YES];
+                [self completeWithState:state withStatus:ImportStateUpdated importComplete:canDisplay];
 }
 

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireScraper.m

@@ -315 +315 @@
 NSString *cleanedString(NSString *str)
 {
+        NSMutableString *mutStr = [[NSMutableString alloc] init];
+        NSScanner *scanner = [NSScanner scannerWithString:str];
+        [scanner setCharactersToBeSkipped:[NSCharacterSet characterSetWithCharactersInString:@""]];
+        while(![scanner isAtEnd])
+        {
+                NSString *append = nil;
+                [scanner scanUpToString:@"<" intoString:&append];
+                if(append)
+                        [mutStr appendString:append];
+                NSString *tag = nil;
+                [scanner scanUpToString:@">" intoString:&tag];
+                if([tag hasPrefix:@"<br"] && ([tag length] == 3 || [tag characterAtIndex:3] == ' ' || [tag characterAtIndex:3] == '/'))
+                        [mutStr appendString:@"\n"];
+                [scanner scanString:@">" intoString:nil];
+        }
         /*TV Rage doesn't understand that an & needs to be &amp; in the HTML, not just '&', so we have to work around yet another instance of their stupidity.  Decoding entities and then re-encoding them seems to be the safest way to do this*/
-        NSString *decoded = (NSString *)CFXMLCreateStringByUnescapingEntities(NULL, (CFStringRef)str, NULL);
+        NSString *decoded = (NSString *)CFXMLCreateStringByUnescapingEntities(NULL, (CFStringRef)mutStr, NULL);
         NSString *reencoded = (NSString *)CFXMLCreateStringByEscapingEntities(NULL, (CFStringRef)decoded, NULL);
         [decoded release];
-        NSXMLDocument *doc = [[NSXMLDocument alloc] initWithXMLString:reencoded options:NSXMLDocumentTidyHTML error:nil];
-        if(doc)
-        {
-                str = (NSString *)CFXMLCreateStringByEscapingEntities(NULL, (CFStringRef)[doc stringValue], NULL);
-                [str autorelease];
-                [doc release];
-        }
-        [reencoded release];
-        return trimmedString(str);
+        [mutStr release];
+        [reencoded autorelease];
+        return trimmedString(reencoded);
 }
 

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/Scrapers/tvrage.xml

@@ -25 +25 @@
                 <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="7">
                         <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
-                                <expression>&lt;/a&gt;&quot;([^&quot;]*)&quot; Summary&lt;/h5&gt;</expression>
+                                <expression>&lt;a name=&apos;summary&apos;&gt;.*?&lt;/a&gt;(.*?) Summary&lt;/h5&gt;</expression>
                         </RegExp>
                         <RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">                             
-                                <expression>\n&lt;/script&gt;&lt;table.*?\n&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;(.*)&lt;br&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</expression>
+                                <expression> &lt;td&gt;&lt;table.*?\n&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;br&gt;.*?\n&lt;/script&gt;(?:&lt;div [^&gt;]*id=&apos;sft_1&apos;&gt;)?(.*?)(?:\n&lt;br&gt;\n&lt;a onclick=.*?|\n)&lt;br&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</expression>
                         </RegExp>                                               
                         <RegExp input="$$1" output="&lt;rating&gt;\1&lt;/rating&gt;&lt;votes&gt;\2&lt;/votes&gt;" dest="5+">
@@ -77 +77 @@
                         </RegExp>       
                         <RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
-                                <expression>&lt;td&gt;&lt;table width='100%'&gt;&lt;tr&gt;&lt;td valign='top'&gt;&lt;table width='100%'&gt;&lt;tr&gt;&lt;td&gt;.*?&lt;/script&gt;&lt;br&gt;([^&lt;]*)</expression>
+                                <expression>&lt;td&gt;&lt;table width=&apos;100%&apos;&gt;&lt;tr&gt;&lt;td valign=&apos;top&apos;&gt;&lt;table width=&apos;100%&apos;&gt;&lt;tr&gt;&lt;td&gt;.*?&lt;/script&gt;&lt;br&gt;(.*?)&lt;br&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;</expression>
                         </RegExp>
                         <RegExp input="$$1" output="&lt;rating&gt;\1&lt;/rating&gt;&lt;votes&gt;\2&lt;/votes&gt;" dest="5+">