Changeset 445

Timestamp:

01/03/08 21:08:45 (1 year ago)

Author:

gbooker

Message:

• Fixed clearing of metadata on dirs
  
• Added ability to skip directories on import
  
• Hooked up code to add/remove arbitrary dirs as collections (will not remove a mount)
  

(Not tested)
Fixes #15, #76

Files:

• trunk/SapphireImporterDataMenu.m (modified) (1 diff)
• trunk/SapphireMarkMenu.m (modified) (4 diffs)
• trunk/SapphireMetaData.h (modified) (1 diff)
• trunk/SapphireMetaData.m (modified) (1 diff)

trunk/SapphireImporterDataMenu.m

@@ -173 +173 @@
-        }
-        SapphireDirectoryMetaData *meta = [metaCollection directoryForPath:path];
-
+WithSet:[metaCollection skipDirectories]
-        collectionIndex++;
-}

trunk/SapphireMarkMenu.m

@@ -57 +57 @@
-        /*Create the menu*/
-        if(isDir)
+        {
-                names = [[NSMutableArray alloc] initWithObjects:
-                        BRLocalizedString(@"Mark All as Watched", @"Mark whole directory as watched"),
@@ -66 +67 @@
-                        BRLocalizedString(@"Mark All to Clear Metadata", @"Mark whole directory to delete the metadata"),
-                        nil];
+                SapphireMetaDataCollection *collection = [meta collection];
+                NSString *path = [meta path];
+                if([collection skipCollection:path])
+                        [names addObject:BRLocalizedString(@"Mark this Directory to Not Skip Import", @"Marks this directory to be no longer be skipped during import")];
+                else
+                        [names addObject:BRLocalizedString(@"Mark this Directory to Skip Import", @"Marks this directory to be skipped during import")];
+                if([collection isCollectionDirectory:path])
+                        [names addObject:BRLocalizedString(@"Mark this Directory to Not be a Collection", @"Marks the directory to no longer be a collection")];
+                else
+                        [names addObject:BRLocalizedString(@"Mark this Directory as a Collection", @"Marks the directory to be a collection")];
+        }
-        else if([meta isKindOfClass:[SapphireFileMetaData class]])
-        {
@@ -307 +319 @@
-        {
-                SapphireDirectoryMetaData *dirMeta = (SapphireDirectoryMetaData *)metaData;
+                SapphireMetaDataCollection *collection = [dirMeta collection];
+                NSString *path = [dirMeta path];
-                switch(row)
-                {
@@ -326 +340 @@
-                                [dirMeta setToImportFromSource:META_IMDB_IMPORT_KEY forPredicate:predicate];
-                                break;
+                        case 6:
+                                [dirMeta clearMetaDataForPredicate:predicate];
+                                break;
+                        case 7:
+                                [collection setSkip:![collection skipCollection:path] forCollection:path];
+                                break;
+                        case 8:
+                                if([collection isCollectionDirectory:path])
+                                        [collection removeCollectionDirectory:path];
+                                else
+                                        [collection addCollectionDirectory:path];
+                                break;
-                }
-        }

trunk/SapphireMetaData.h

@@ -389 +389 @@
-
-/*!
+ * @brief The set of directories to skip during import
+ *
+ * @return An NSSet of directories to not import
+ */
+- (NSSet *)skipDirectories;
+
+/*!
- * @brief Add a collection
- *

trunk/SapphireMetaData.m

@@ -645 +645 @@
-        [skipCollection setObject:[NSNumber numberWithBool:skip] forKey:collection];
-        [self writeMetaData];
+}
+
+- (NSSet *)skipDirectories
+{
+        NSMutableSet *ret = [NSMutableSet set];
+        NSEnumerator *colEnum = [[self collectionDirectories] objectEnumerator];
+        NSString *collection;
+        while((collection = [colEnum nextObject]) != nil)
+        {
+                if(![self skipCollection:collection])
+                        [ret addObject:collection];
+        }
+        
+        return ret;
-}
-