Changeset 670

Timestamp:

09/21/08 21:28:10 (4 months ago)

Author:

gbooker

Message:

Added ability to reset decisions made on a file (means importer will have to ask again). Useful if you selected the wrong thing

Files:

• branches/CoreData/SapphireFrappliance/Browser/SapphireMarkMenu.m (modified) (7 diffs)
• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCategoryDirectory.m (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h (modified) (2 diffs)
• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (2 diffs)
• branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireDirectory.h (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireDirectory.m (modified) (1 diff)

branches/CoreData/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -37 +37 @@
-        COMMAND_MARK_TO_REFETCH_MOVIE,
-        COMMAND_MARK_TO_DELETE_METADATA,
+        COMMAND_MARK_TO_RESET_IMPORT,
+        //File Only Commands
-        COMMAND_MARK_TO_JOIN,
-        COMMAND_MARK_AND_JOIN,
-        COMMAND_CLEAR_JOIN_MARK,
-        COMMAND_JOIN,
-c
+Only C
-        COMMAND_MARK_WATCHED,
-        COMMAND_MARK_UNWATCHED,
@@ -78 +80 @@
-                        BRLocalizedString(@"Mark All to Refetch Movie Data", @"Mark whole directory to re-fetch its movie data"),
-                        BRLocalizedString(@"Mark All to Clear Metadata", @"Mark whole directory to delete the metadata"),
+                        BRLocalizedString(@"Mark All to Reset Import Decisions", @"Mark whole directory to reset import decisions"),
-                        nil];
-                markDescriptions = [[NSMutableArray alloc] initWithObjects:
@@ -87 +90 @@
-                        BRLocalizedString(@"Tells Sapphire to refetch Movie metadata for this directory the next time an import is run.", @"Mark whole directory to re-fetch its movie data"),
-                        BRLocalizedString(@"Tells Sapphire to remove all metadata for this directory.", @"Mark directory to delete metadata description"),
+                        BRLocalizedString(@"Tells Sapphire to forget import decisions made on files in this directory.", @"Mark directory to reset import decisions description"),
-                        nil];
-                commands = [[NSMutableArray alloc] initWithObjects:
@@ -96 +100 @@
-                                        [NSNumber numberWithInt:COMMAND_MARK_TO_REFETCH_MOVIE],
-                                        [NSNumber numberWithInt:COMMAND_MARK_TO_DELETE_METADATA],
+                                        [NSNumber numberWithInt:COMMAND_MARK_TO_RESET_IMPORT],
-                                        nil];
-                id <SapphireDirectory> dirMeta = (id <SapphireDirectory>)meta;
@@ -182 +187 @@
-
-                        [commands addObject:[NSNumber numberWithInt:COMMAND_MARK_TO_DELETE_METADATA]];
+                        
+                        [names addObject:BRLocalizedString(@"Mark to Reset Import Decisions", @"Mark a file to reset import decisions")];
+                        [markDescriptions addObject:BRLocalizedString(@"Tells Sapphire to forget import decisions made on this file.", @"Mark a file to reset import decisions description")];
+                        
+                        [commands addObject:[NSNumber numberWithInt:COMMAND_MARK_TO_RESET_IMPORT]];
-                }
-                if(![joinList containsObject:fileMeta])
@@ -426 +436 @@
-                                setSubtreeToClearMetaData(dirMeta);
-                                break;
+                        case COMMAND_MARK_TO_RESET_IMPORT:
+                                setSubtreeToResetImportDecisions(dirMeta);
+                                break;
-                        case COMMAND_TOGGLE_SKIP:
-                                if(collection == nil)
@@ -459 +472 @@
-                        case COMMAND_MARK_TO_DELETE_METADATA:
-                                [fileMeta clearMetaData];
+                                break;
+                        case COMMAND_MARK_TO_RESET_IMPORT:
+                                [fileMeta setToResetImportDecisions];
-                                break;
-                        case COMMAND_MARK_TO_JOIN:

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCategoryDirectory.m

@@ -121 +121 @@
-        {
-                NSString *fileNameKey = [self fileNameValue];
-
+!
-                {
-                        self.sortMethodValue = 0;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h

@@ -48 +48 @@
-        IMPORT_TYPE_TVSHOW_MASK = 4,
-        IMPORT_TYPE_MOVIE_MASK = 8,
+        IMPORT_TYPE_ALL_MASK = 0xf,
-} ImportTypeMask;
-
@@ -131 +132 @@
-
-/*!
+ * @brief Reset import decisions for this file (also mark to re-import)
+ */
+- (void)setToResetImportDecisions;
+
+/*!
- * @brief Get the overridden season number
- *

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -9 +9 @@
-#import "SapphireMediaPreview.h"
-#import "SapphireFileSymLink.h"
+
+#import "SapphireTVShow.h"
+#import "SapphireTVTranslation.h"
+#import "SapphireMovieTranslation.h"
-
-#import <QTKit/QTKit.h>
@@ -457 +461 @@
-}
-
+- (void)setToResetImportDecisions
+{
+        NSManagedObjectContext *moc = [self managedObjectContext];
+        NSString *lowerFileName = [[self.path lastPathComponent] lowercaseString];
+
+        SapphireEpisode *ep = self.tvEpisode;
+        if(ep != nil)
+        {
+                NSSet *translations = ep.tvShow.translationsSet;
+                SapphireTVTranslation *tran;
+                NSEnumerator *tranEnum = [translations objectEnumerator];
+                while((tran = [tranEnum nextObject]) != nil)
+                {
+                        if([lowerFileName hasPrefix:tran.name])
+                                [moc deleteObject:tran];
+                }
+        }
+        SapphireMovieTranslation *movieTran = [SapphireMovieTranslation movieTranslationWithName:lowerFileName inContext:moc];
+        if(movieTran != nil)
+                [moc deleteObject:movieTran];
+        
+        [self setToReimportFromMask:IMPORT_TYPE_ALL_MASK];
+}
+
-- (void)clearMetaData
-{

branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireDirectory.h

@@ -329 +329 @@
- */
-void setSubtreeToClearMetaData(id <SapphireDirectory> dir);
+
+/*!
+ * @brief Reset import decisions for this file (also mark to re-import) for an entire subtree with restriction as to predicate.  Does not follow symlinks
+ */
+void setSubtreeToResetImportDecisions(id <SapphireDirectory> dir);

branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireDirectory.m

@@ -66 +66 @@
-        doSubtreeInvokation(dir, select, nil);
-}
+
+void setSubtreeToResetImportDecisions(id <SapphireDirectory> dir)
+{
+        SEL select = @selector(setToResetImportDecisions);
+        doSubtreeInvokation(dir, select, nil);
+}