Changeset 451

Timestamp:

01/10/08 11:10:56 (11 months ago)

Author:

gbooker

Message:

Two episode in a file support
Refs #14

Files:

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

trunk/SapphireBrowser.m

@@ -353 +353 @@
-                                /*Display episode number if availble*/
-                                int eps= [meta episodeNumber] ;
+                                int ep2= [meta secondEpisodeNumber] ;
-                                displayName=[meta episodeTitle] ;
-                                if(eps>0)
-                                {
-
+
+
+
+
-                                        rightTextSet = YES;
-                                }

trunk/SapphireMediaPreview.m

@@ -212 +212 @@
-                /*Remove the individuals so we don't display them*/
-                [allMeta removeObjectForKey:META_EPISODE_NUMBER_KEY];
+                [allMeta removeObjectForKey:META_EPISODE_2_NUMBER_KEY];
-                [allMeta removeObjectForKey:META_SEASON_NUMBER_KEY];
-        }

trunk/SapphireMetaData.h

@@ -38 +38 @@
-#define META_ABSOLUTE_EP_NUMBER_KEY             @"Episode Number"
-#define META_SHOW_IDENTIFIER_KEY                @"Show ID"
+#define META_EPISODE_2_NUMBER_KEY               @"Episode 2"
+#define META_ABSOLUTE_EP_2_NUMBER_KEY   @"Episode Number 2"
-
-//ATV Extra Info
@@ -872 +874 @@
-
-/*!
+ * @brief Returns the second epsiode number of the file for a two part file
+ *
+ * @return The second episode number of the file
+ */
+- (int)secondEpisodeNumber;
+
+/*!
- * @brief Returns the season number of the file
- *

trunk/SapphireMetaData.m

@@ -1865 +1865 @@
-}
-
+- (int)secondEpisodeNumber
+{
+        [self constructCombinedData];
+        return [[combinedInfo objectForKey:META_EPISODE_2_NUMBER_KEY] intValue];
+}
+
-- (int)seasonNumber
-{
@@ -2045 +2051 @@
-        int ep = [self episodeNumber];
-        if(season != 0 && ep != 0) 
-
+
+
+
+
+
+
+
-        return ret;
-}

trunk/SapphireTVShowImporter.m

@@ -105 +105 @@
-        
-        /*Initialize the regexes*/
-
-
+(-E[0-9]+)?
+(-[0-9]+)?
-        regcomp(&seasonEpisodeTriple, "[\\. -][0-9]{1,3}[S0-9]{2}[\\. -]", REG_EXTENDED | REG_ICASE);   
-        return self;
@@ -449 +449 @@
-}
-
+- (void)combine:(NSMutableDictionary *)info with:(NSMutableDictionary *)info2
+{
+        NSMutableDictionary *tdict = [info2 mutableCopy];
+        [tdict addEntriesFromDictionary:info];
+        NSString *secname = [info2 objectForKey:META_TITLE_KEY];
+        NSString *origname = [info objectForKey:META_TITLE_KEY];
+        if(secname != nil && origname != nil)
+                [tdict setObject:[NSString stringWithFormat:@"%@ / %@", origname, secname] forKey:META_TITLE_KEY];
+
+        if([info objectForKey:META_EPISODE_NUMBER_KEY] != nil)
+        {
+                NSNumber *secondEp = [info2 objectForKey:META_EPISODE_NUMBER_KEY];
+                [tdict setObject:secondEp forKey:META_EPISODE_2_NUMBER_KEY];
+        }
+        NSString *secdesc = [info2 objectForKey:META_DESCRIPTION_KEY];
+        NSString *origdesc = [info objectForKey:META_DESCRIPTION_KEY];
+        if(secdesc != nil && origdesc != nil)
+                [tdict setObject:[NSString stringWithFormat:@"%@ / %@", origdesc, secdesc] forKey:META_DESCRIPTION_KEY];
+
+        if([info objectForKey:META_ABSOLUTE_EP_NUMBER_KEY] != nil)
+        {
+                NSNumber *secondEp = [info2 objectForKey:META_ABSOLUTE_EP_NUMBER_KEY];
+                [tdict setObject:secondEp forKey:META_ABSOLUTE_EP_2_NUMBER_KEY];
+        }
+        
+        [info addEntriesFromDictionary:tdict];
+        [tdict release];
+}
+
-- (BOOL) importMetaData:(id <SapphireFileMetaDataProtocol>)metaData
-{
@@ -469 +498 @@
-        /*Check regexes to see if this is a tv show*/
-        int index = NSNotFound;
+        int secondEp = -1;
-        regmatch_t matches[3];
-        NSData *fileNameData = [fileName dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES];
@@ -477 +507 @@
-                index = matches[0].rm_so;
-                scanString = [fileName substringFromIndex:index];
+                secondEp = matches[1].rm_so;
-        }
-        else if(!regexec(&seasonByEpisode, theFileName, 3, matches, 0))
@@ -482 +513 @@
-                index = matches[0].rm_so;
-                scanString = [fileName substringFromIndex:index];
+                secondEp = matches[1].rm_so;
-        }
-        else if(!regexec(&seasonEpisodeTriple, theFileName, 3, matches, 0))
@@ -541 +573 @@
-                return NO;
-        
+        int otherEp = 0;
+        if(secondEp != -1)
+        {
+                [scanner setScanLocation:secondEp - index];
+                [scanner scanUpToCharactersFromSet:digits intoString:nil];
+                [scanner scanInt:&otherEp];
+        }
+        
-        /*Get the episode's info*/
-
+, *info2 = nil
-        if(ep != 0)
+        {
-                /*Match on s/e*/
-                info = [self getInfo:show forSeason:season episode:ep];
+                if(otherEp != 0)
+                        info2 = [self getInfo:show forSeason:season episode:otherEp];
+        }
-        else
-        {
@@ -564 +608 @@
-                                                                        [NSString stringWithFormat:@"Season %d",[[info objectForKey:META_SEASON_NUMBER_KEY] intValue]]];
-                                                
-
+ 
-        /*Check for screen cap locally and on server*/
-        NSString *showInfoUrl = [info objectForKey:LINK_KEY];
@@ -585 +629 @@
-        }
-        
+        if(info2 != nil)
+                [self combine:info with:info2];
-        /*Import the info*/
-        [info removeObjectForKey:LINK_KEY];