Changeset 1345 for trunk

Timestamp:

05/08/11 15:38:59 (13 months ago)

Author:

gbooker

Message:

Made computed auto sort paths into a set, and ask about each item in the set.

Location:

trunk/SapphireFrappliance

Files:

• MetaData/SapphireMObjects/SapphireTVShow.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVShow.m (modified) (2 diffs)
• Settings/SapphireSettings.m (modified) (4 diffs)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.h

@@ -9 +9 @@
 
 - (NSComparisonResult)compare:(SapphireTVShow *)other;
-- (NSString *)calculateAutoSortPath;
+- (NSSet *)calculateAutoSortPaths;
 - (NSString *)autoSortPath;
 - (void)setAutoSortPath:(NSString *)path;

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.m

@@ -151 +151 @@
 }
 
-- (NSString *)calculateAutoSortPath
+- (NSSet *)calculateAutoSortPaths
 {
         NSArray *files = doFetchRequest(SapphireFileMetaDataName, [self managedObjectContext], [self metaFileFetchPredicate]);
@@ -157 +157 @@
                 return nil;
         
-        NSString *sortPath = [[(SapphireFileMetaData *)[files objectAtIndex:0] path] stringByDeletingLastPathComponent];
-        BOOL cropTwoDirs = NO;
         NSEnumerator *fileEnum = [files objectEnumerator];
         SapphireFileMetaData *file;
+        NSMutableSet *paths = [NSMutableSet set];
         while((file = [fileEnum nextObject]) != nil)
         {
                 NSString *dirPath = [[file path] stringByDeletingLastPathComponent];
-                if(cropTwoDirs)
+                NSString *dirName = [dirPath lastPathComponent];
+                if([[dirName lowercaseString] hasPrefix:@"season"])
                         dirPath = [dirPath stringByDeletingLastPathComponent];
                 
-                if([dirPath isEqualToString:sortPath])
-                        continue;
-                
-                if(!cropTwoDirs)
-                {
-                        sortPath = [sortPath stringByDeletingLastPathComponent];
-                        dirPath = [dirPath stringByDeletingLastPathComponent];
-                        cropTwoDirs = YES;
-                        if([dirPath isEqualToString:sortPath])
-                                continue;
-                }
-                
-                return nil;
+                [paths addObject:dirPath];
         }
         
-        if(!cropTwoDirs)
-        {
-                NSString *lastPathComponent = [sortPath lastPathComponent];
-                if([[lastPathComponent lowercaseString] hasPrefix:@"season"])
-                        sortPath = [sortPath stringByDeletingLastPathComponent];
-        }
-        
-        return sortPath;
+        return paths;
 }
 

trunk/SapphireFrappliance/Settings/SapphireSettings.m

@@ -491 +491 @@
 }
 
-- (SapphireConfirmPrompt *)nextAutoSortPathConfirm:(NSArray *)shows
-{
-        int i, count = [shows count];
-        SapphireTVShow *show;
+int checkPaths(NSString *autoPath, NSArray *computedPaths, int startIndex)
+{
+        int i, count = [computedPaths count];
+        for (i=startIndex; i<count; i++) {
+                if(![autoPath isEqualToString:[computedPaths objectAtIndex:i]])
+                        break;
+        }
+        return i;
+}
+
+- (SapphireConfirmPrompt *)nextAutoSortPathConfirm:(NSArray *)paths forShow:(SapphireTVShow *)show remaining:(NSArray *)remaining
+{
         NSString *calcAutoPath = nil;
-        NSString *autoPath;
-        for(i=0; i<count; i++)
+        NSString *autoPath = [show autoSortPath];
+        if([paths count] > 0)
         {
-                show = [shows objectAtIndex:i];
-                calcAutoPath = [show calculateAutoSortPath];
-                autoPath = [show autoSortPath];
-                if(autoPath == nil && calcAutoPath == nil)
-                        continue;
-                if(autoPath == nil || calcAutoPath == nil)
-                        //Only one of them is nil
-                        break;
-                if(![autoPath isEqualToString:calcAutoPath])
-                        break;
+                int skipCount = checkPaths(autoPath, paths, 1);  //We had just checked the first one, continue after that.
+                paths = [paths subarrayWithRange:NSMakeRange(skipCount, [paths count]-skipCount)];
         }
-        
-        if(i == count)
-                return nil;
-        
-        NSArray *newArray = [shows subarrayWithRange:NSMakeRange(i+1, count-i-1)];
-        NSInvocation *invoke = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:@selector(promptResult:forShow:remaining:)]];
+        if([paths count] != 0)
+                calcAutoPath = [paths objectAtIndex:0];
+        else
+        {
+                int i, count = [remaining count];
+                for(i=0; i<count; i++)
+                {
+                        show = [remaining objectAtIndex:i];
+                        autoPath = [show autoSortPath];
+                        paths = [[show calculateAutoSortPaths] allObjects];
+                        NSLog(@"Paths for %@ are %@", [show name], paths);
+                        if([paths count])
+                        {
+                                int skipCount = checkPaths(autoPath, paths, 0);
+                                if(skipCount > 0)
+                                        paths = [paths subarrayWithRange:NSMakeRange(skipCount, [paths count]-skipCount)];
+                        }
+                        if([paths count])
+                        {
+                                calcAutoPath = [paths objectAtIndex:0];
+                                break;
+                        }
+                }
+                if(i == count)
+                        return nil;
+                remaining = [remaining subarrayWithRange:NSMakeRange(i + 1, [remaining count] - i - 1)];
+        }
+        
+        NSInvocation *invoke = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:@selector(promptResult:forShow:paths:remaining:)]];
         [invoke setTarget:self];
-        [invoke setSelector:@selector(promptResult:forShow:remaining:)];
+        [invoke setSelector:@selector(promptResult:forShow:paths:remaining:)];
         [invoke setArgument:&show atIndex:3];
-        [invoke setArgument:&newArray atIndex:4];
+        [invoke setArgument:&paths atIndex:4];
+        [invoke setArgument:&remaining atIndex:5];
         [invoke retainArguments];
         
@@ -532 +556 @@
 }
 
-- (BRLayerController *)promptResult:(SapphireConfirmPromptResult)result forShow:(SapphireTVShow *)show remaining:(NSArray *)remain
+- (BRLayerController *)promptResult:(SapphireConfirmPromptResult)result forShow:(SapphireTVShow *)show paths:(NSArray *)paths remaining:(NSArray *)remain
 {
         if(result == SapphireConfirmPromptResultAbort)
@@ -539 +563 @@
         if(result == SapphireConfirmPromptResultOK)
         {
-                [show setAutoSortPath:[show calculateAutoSortPath]];
+                [show setAutoSortPath:[paths objectAtIndex:0]];
                 [SapphireMetaDataSupport save:moc];
+                return [self nextAutoSortPathConfirm:nil forShow:nil remaining:remain];
         }
         
-        return [self nextAutoSortPathConfirm:remain];
+        return [self nextAutoSortPathConfirm:paths forShow:show remaining:remain];
 }
 
@@ -683 +708 @@
                 {
                         NSArray *shows = doFetchRequest(SapphireTVShowName, moc, nil);
-                        SapphireConfirmPrompt *confirm = [self nextAutoSortPathConfirm:shows];
+                        SapphireConfirmPrompt *confirm = [self nextAutoSortPathConfirm:nil forShow:nil remaining:shows];
                         if(confirm != nil)
                                 [[self stack] pushController:confirm];