Changeset 1346 for trunk

Timestamp:

05/08/11 15:41:10 (13 months ago)

Author:

gbooker

Message:

Better importing of information from .nfo files.

Location:

trunk/SapphireFrappliance/MetaDataImporting

Files:

• SapphireTVShowImporter.m (modified) (2 diffs)
• Scrapers/tvrage.xml (modified) (2 diffs)

trunk/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

@@ -381 +381 @@
                 }
         }
+        NSString *showId = stringValueOfChild(root, @"id");
+        if(showId != nil)
+                [state->translation setItemID:showId];
         
         [self getTVShowEpisodeListForState:state];
@@ -727 +730 @@
                 if([showURL length])
                 {
-                        [tran setUrl:showURL];
-                        if([showID length])
-                                [tran setItemID:showID];
+                        if(tran == nil)
+                        {
+                                tran = [SapphireTVTranslation createTVTranslationForName:searchStr withURL:showURL itemID:showID importer:[[state->siteScraper scraper] name] inContext:moc];
+                                [state setTranslation:tran];
+                        }
+                        else
+                        {
+                                [tran setUrl:showURL];
+                                if([showID length])
+                                        [tran setItemID:showID];
+                        }
                 }
                 else

trunk/SapphireFrappliance/MetaDataImporting/Scrapers/tvrage.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2011-05-05" name="TV Rage" content="tvshows" thumb="tvrage.jpg" language="en">
+<scraper framework="1.0" date="2011-05-08" name="TV Rage" content="tvshows" thumb="tvrage.jpg" language="en">
         <NfoUrl dest="3">
                 <RegExp input="$$1" output="&lt;url&gt;http://www.tvrage.com/\1&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;"  dest="3">
@@ -6 +6 @@
                 </RegExp>
                 <RegExp input="$$1" output="&lt;url&gt;http://www.tvrage.com/\1&lt;/url&gt;"  dest="3+">
-                        <expression clear="yes" noclean="1">tvrage.com/([^/ ]*)(?!/id-[0-9])[/ ]</expression>
+                        <expression clear="yes" noclean="1">tvrage.com/([^/ ]*?)(?!/id-[0-9])[/\s]</expression>
                 </RegExp>
         </NfoUrl>