Changeset 458

Timestamp:

01/21/08 19:59:13 (10 months ago)

Author:

gbooker

Message:

Use data from XML to override filename's values when searching for a TV ep.
Fixes #8

Files:

• trunk/SapphireMetaData.h (modified) (2 diffs)
• trunk/SapphireMetaData.m (modified) (1 diff)
• trunk/SapphireTVShowImporter.m (modified) (2 diffs)
• trunk/SapphireXMLFileDataImporter.m (modified) (3 diffs)

trunk/SapphireMetaData.h

@@ -40 +40 @@
-#define META_EPISODE_2_NUMBER_KEY               @"Episode 2"
-#define META_ABSOLUTE_EP_2_NUMBER_KEY   @"Episode Number 2"
+#define META_SEARCH_SEASON_NUMBER_KEY   @"Search Season"
+#define META_SEARCH_EPISODE_NUMBER_KEY  @"Search Episode"
+#define META_SEARCH_EPISODE_2_NUMBER_KEY        @"Search Episode 2"
-
-//ATV Extra Info
@@ -704 +707 @@
-- (void)setFileContainerType:(FileContainerType)fileContainerType;
-
+/*!
+ * @brief Get the overridden season number
+ *
+ * Sometimes TVRage's information is horribly wrong (such as Firefly) and it would be a pain to correct.  This allows the user to provide a season number to override what is in the filename while not interferring with the number stored in the real season number.
+ *
+ * @return the season number to use, -1 if none exists
+ */
+- (int)overriddenSeasonNumber;
+
+/*!
+ * @brief Get the overridden episode number
+ *
+ * Sometimes TVRage's information is horribly wrong (such as Firefly) and it would be a pain to correct.  This allows the user to provide a episode number to override what is in the filename while not interferring with the number stored in the real episode number.
+ *
+ * @return the episode number to use, -1 if none exists
+ */
+- (int)overriddenEpisodeNumber;
+
+/*!
+ * @brief Get the overridden second episode number
+ *
+ * Sometimes TVRage's information is horribly wrong (such as Firefly) and it would be a pain to correct.  This allows the user to provide a second episode number to override what is in the filename while not interferring with the number stored in the real second episode number.
+ *
+ * @return the second episode number to use, -1 if none exists
+ */
+- (int)overriddenSecondEpisodeNumber;
-
-@end

trunk/SapphireMetaData.m

@@ -1877 +1877 @@
-}
-
+- (int)overriddenSeasonNumber
+{
+        [self constructCombinedData];
+        NSNumber *info = [combinedInfo objectForKey:META_SEARCH_SEASON_NUMBER_KEY];
+        if(info != nil)
+                return [info intValue];
+        return -1;
+}
+
+- (int)overriddenEpisodeNumber
+{
+        [self constructCombinedData];
+        NSNumber *info = [combinedInfo objectForKey:META_SEARCH_EPISODE_NUMBER_KEY];
+        if(info != nil)
+                return [info intValue];
+        return -1;
+}
+
+- (int)overriddenSecondEpisodeNumber
+{
+        [self constructCombinedData];
+        NSNumber *info = [combinedInfo objectForKey:META_SEARCH_EPISODE_2_NUMBER_KEY];
+        if(info != nil)
+                return [info intValue];
+        return -1;
+}
+
-- (int)oscarsWon
-{

trunk/SapphireTVShowImporter.m

@@ -567 +567 @@
-        if([skipped hasSuffix:@"S"])
-                ep = 0;
+        
+        int overriddenSeason = [metaData overriddenSeasonNumber];
+        if(overriddenSeason != -1)
+                season = overriddenSeason;
+
+        int overriddenEpisode = [metaData overriddenEpisodeNumber];
+        if(overriddenEpisode != -1)
+                ep = overriddenEpisode;
+
-        /*No season, no info*/
-        if(season == 0)
@@ -579 +588 @@
-        }
-        
+        overriddenEpisode = [metaData overriddenSecondEpisodeNumber];
+        if(overriddenEpisode != -1)
+                otherEp = overriddenEpisode;
+
-        /*Get the episode's info*/
-        NSMutableDictionary *info = nil, *info2 = nil;

trunk/SapphireXMLFileDataImporter.m

@@ -36 +36 @@
-#define EPISODE_NUMBER_XML_QUERY        @"/media/episodeNumber/text()"
-#define EPISODE_XML_QUERY                       @"/media/episode/text()"
+#define SEC_EPISODE_XML_QUERY           @"/media/secondEpisode/text()"
-#define SEASON_XML_QUERY                        @"/media/season/text()"
-#define PUBLISHED_XML_QUERY                     @"/media/published/text()"
+#define SEARCH_SEASON_XML_QUERY         @"/media/searchSeason/text()"
+#define SEARCH_SEC_EPISODE_XML_QUERY    @"/media/searchSecondEpisode/text()"
+#define SEARCH_EPISODE_XML_QUERY        @"/media/searchEpisode/text()"
-//Multi Attributes              
-#define TITLE_XML_QUERY                         @"/media/title/text()"
@@ -63 +67 @@
-                                                   META_SHOW_NAME_KEY,                          SERIES_NAME_XML_QUERY,
-                                                   META_SHOW_BROADCASTER_KEY,           BROADCASTER_XML_QUERY,
-
-
+
+
+
-                                                   META_SEASON_NUMBER_KEY,                      SEASON_XML_QUERY,
-
+
+
+
+
+
-        xmlMultiAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                                  @"Genres",                            GENRES_XML_QUERY,
@@ -170 +179 @@
-        }
-        /*Values which need to be converted to numbers*/
-
+META_EPISODE_2_NUMBER_KEY, META_SEARCH_SEASON_NUMBER_KEY, META_SEARCH_EPISODE_NUMBER_KEY, META_SEARCH_EPISODE_2_NUMBER_KEY, 
-        NSEnumerator *numEnum = [convertToNumbers objectEnumerator];
-        while((key = [numEnum nextObject]) != nil)