Changeset 1269

Timestamp:

06/06/10 18:45:50 (2 years ago)

Author:

gbooker

Message:

Run calculations on auto-sort dirs for TV shows and present it in a nice UI.

Location:

trunk/SapphireFrappliance

Files:

• Browser/SapphireMarkMenu.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireSeason.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireSeason.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVShow.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVShow.m (modified) (2 diffs)
• MetaData/Support/SapphireOtherInformation.m (modified) (1 diff)
• Settings/SapphireSettings.m (modified) (5 diffs)

trunk/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -697 +697 @@
                                 [invoke setTarget:self];
                                 [invoke setArgument:&dirMeta atIndex:3];
+                                [invoke retainArguments];
                                 
                                 SapphireConfirmPrompt *confirm = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Delete Directory?", @"Delete Directory Prompt Title") subtitle:[NSString stringWithFormat:BRLocalizedString(@"Are you sure you wish to delete %@?", @"parameter is file/dir that is being deleted"), [[dirMeta path] lastPathComponent]] invokation:invoke];
@@ -787 +788 @@
                                 [invoke setTarget:self];
                                 [invoke setArgument:&fileMeta atIndex:3];
+                                [invoke retainArguments];
                                 
                                 SapphireConfirmPrompt *confirm = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Delete File?", @"Delete File Prompt Title") subtitle:[NSString stringWithFormat:BRLocalizedString(@"Are you sure you wish to delete %@?", @"parameter is file/dir that is being deleted"), [[fileMeta path] lastPathComponent]] invokation:invoke];

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSeason.h

@@ -9 +9 @@
 - (NSComparisonResult)compare:(SapphireSeason *)other;
 - (NSString *)seasonName;
+- (NSString *)autoSortPath;
 @end

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSeason.m

@@ -62 +62 @@
 }
 
+- (NSString *)autoSortPath
+{
+        NSString *showPath = [self.tvShow autoSortPath];
+        if(showPath == nil)
+                return nil;
+        
+        return [showPath stringByAppendingPathComponent:[self seasonName]];
+}
+
 - (NSPredicate *)metaFileFetchPredicate
 {

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.h

@@ -10 +10 @@
 - (NSComparisonResult)compare:(SapphireTVShow *)other;
 - (NSString *)calculateAutoSortPath;
+- (NSString *)autoSortPath;
+- (void)setAutoSortPath:(NSString *)path;
 @end

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.m

@@ -9 +9 @@
 #import "SapphireTVTranslation.h"
 #import "SapphireFileMetaData.h"
+#import "SapphireOtherInformation.h"
+
+NSString *autoSortPathKey = @"autoSortPath";
 
 @implementation SapphireTVShow
@@ -179 +182 @@
         }
         
+        if(!cropTwoDirs)
+        {
+                NSString *lastPathComponent = [sortPath lastPathComponent];
+                if([[lastPathComponent lowercaseString] hasPrefix:@"season"])
+                        sortPath = [sortPath stringByDeletingLastPathComponent];
+        }
+        
         return sortPath;
 }
 
+- (NSString *)autoSortPath
+{
+        return [self otherInformationForKey:autoSortPathKey];
+}
+
+- (void)setAutoSortPath:(NSString *)path
+{
+        [self setOtherObject:path forKey:autoSortPathKey];
+}
+
 @end

trunk/SapphireFrappliance/MetaData/Support/SapphireOtherInformation.m

@@ -54 +54 @@
 {
         NSMutableDictionary *mutOther = [[self otherInformation] mutableCopy];
+        if(mutOther == nil)
+                mutOther = [[NSMutableDictionary alloc] init];
         [mutOther setObject:obj forKey:key];
         NSDictionary *dict = [mutOther copy];

trunk/SapphireFrappliance/Settings/SapphireSettings.m

@@ -34 +34 @@
 #import "SapphireDirectoryMetaData.h"
 #import "SapphireMetaDataSupport.h"
+#import "SapphireTVShow.h"
+#import "SapphireConfirmPrompt.h"
+#import "CoreDataSupportFunctions.h"
+#import "SapphireErrorDisplayController.h"
+
 #import <SapphireCompatClasses/SapphireFrontRowCompat.h>
 #import "NSString-Extensions.h"
@@ -68 +73 @@
         COMMAND_IMPORT_TV_DATA,
         COMMAND_IMPORT_MOVIE_DATA,
+        COMMAND_IMPORT_TV_AUTOSORT_CALCULATE,
         COMMAND_IMPORT_HIDE_POSTER_CHOOSER,
         COMMAND_IMPORT_USE_DIR_NAME,
@@ -134 +140 @@
                         [theme gem:IMDB_GEM_KEY], SETTING_GEM,
                         [NSNumber numberWithInt:COMMAND_IMPORT_MOVIE_DATA], SETTING_COMMAND,
+                        nil],
+                [NSDictionary dictionaryWithObjectsAndKeys:
+                        BRLocalizedString(@"  Calculate TV Directories", @"Calculate TV Dirs menu item"), SETTING_NAME,
+                        BRLocalizedString(@"Tells Sapphire to calculate directories where each TV show is stored.", @"Calculate TV Dirs description"), SETTING_DESCRIPTION,
+                        [theme gem:TVR_GEM_KEY], SETTING_GEM,
+                        [NSNumber numberWithInt:COMMAND_IMPORT_TV_AUTOSORT_CALCULATE], SETTING_COMMAND,
                         nil],
 /*              [NSDictionary dictionaryWithObjectsAndKeys:
@@ -424 +436 @@
 }
 
+- (SapphireConfirmPrompt *)nextAutoSortPathConfirm:(NSArray *)shows
+{
+        int i, count = [shows count];
+        SapphireTVShow *show;
+        NSString *calcAutoPath;
+        NSString *autoPath;
+        for(i=0; i<count; i++)
+        {
+                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;
+        }
+        
+        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:)]];
+        [invoke setTarget:self];
+        [invoke setSelector:@selector(promptResult:forShow:remaining:)];
+        [invoke setArgument:&show atIndex:3];
+        [invoke setArgument:&newArray atIndex:4];
+        [invoke retainArguments];
+        
+        NSString *question;
+        if(calcAutoPath != nil)
+                question = [NSString stringWithFormat:BRLocalizedString(@"Do you want to set the show path for %@ to %@?", @"Prompt for setting a show's path, arguments are show name and path"), [show name], calcAutoPath];
+        else
+                question = [NSString stringWithFormat:BRLocalizedString(@"Do you want to delete the show path for %@?", @"Prompt for deleting a show's path, argument is show name"), [show name]];
+        
+        SapphireConfirmPrompt *prompt = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Show Path", @"Show Path") subtitle:question invokation:invoke];
+        return [prompt autorelease];
+}
+
+- (BRLayerController *)promptResult:(SapphireConfirmPromptResult)result forShow:(SapphireTVShow *)show remaining:(NSArray *)remain
+{
+        if(result == SapphireConfirmPromptResultAbort)
+                return nil;
+        
+        if(result == SapphireConfirmPromptResultOK)
+        {
+                [show setAutoSortPath:[show calculateAutoSortPath]];
+                [SapphireMetaDataSupport save:moc];
+        }
+        
+        return [self nextAutoSortPathConfirm:remain];
+}
+
 - (void)wasExhumed
 {
@@ -546 +613 @@
                         [menu release];
                         [importer release];
+                        break;
+                }
+                case COMMAND_IMPORT_TV_AUTOSORT_CALCULATE:
+                {
+                        NSArray *shows = doFetchRequest(SapphireTVShowName, moc, nil);
+                        SapphireConfirmPrompt *confirm = [self nextAutoSortPathConfirm:shows];
+                        if(confirm != nil)
+                                [[self stack] pushController:confirm];
+                        else
+                        {
+                                SapphireErrorDisplayController *error = [[SapphireErrorDisplayController alloc] initWithScene:[self scene] error:BRLocalizedString(@"No Changes", @"No Changes") longError:BRLocalizedString(@"Sapphire didn't detect any changes to show paths", @"Display info for no show path changes detected")];
+                                [[self stack] pushController:error];
+                                [error release];
+                        }
                         break;
                 }