Changeset 2

Timestamp:

06/22/07 16:29:28 (2 years ago)

Author:

gbooker

Message:

Tracking metadata information.

Files:

• trunk/SapphireApplianceController.h (modified) (2 diffs)
• trunk/SapphireApplianceController.m (modified) (8 diffs)

trunk/SapphireApplianceController.h

@@ -15 +15 @@
-@interface SapphireApplianceController : BRMediaMenuController
-{
- 
- 
+                       
+         
-
+        NSMutableDictionary     *_metaData;
+        NSMutableDictionary     *_metaFiles;
+        NSMutableDictionary     *_metaDirs;
-}
-
@@ -24 +27 @@
-
-- (id) initWithScene: (BRRenderScene *) scene;
-dir
+ dir metaData: (NSMutableDictionary *)meta
-- (void) dealloc;
-- (BOOL)isDirectory:(NSString *)path;

trunk/SapphireApplianceController.m

@@ -10 +10 @@
-#import <BackRow/BackRow.h>
-
+#define FILES_KEY @"Files"
+#define DIRS_KEY @"Dirs"
+
+#define MODIFIED_KEY @"Modified"
+
-@implementation NSString (episodeSorting)
-
@@ -20 +25 @@
-@end
-
+@interface SapphireApplianceController (private)
+- (BOOL)pruneMetaDataWithFiles:(NSArray *)files andDirectories:(NSArray *)dirs;
+- (BOOL)updateMetaDataWithFiles:(NSArray *)files andDirectories:(NSArray *)dirs;
+@end
+
-@implementation SapphireApplianceController
-
-// Static set of file extensions to filter
-static NSArray *extensions = nil;
+static NSString *metaPath = nil;
+static NSMutableDictionary *mainMetaDictionary = nil;
-
-+(void)load
-{
-        extensions = [[NSArray alloc] initWithObjects:@"avi", @"mov", @"mpg", @"wmv", nil];
+        metaPath = [[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/metaData.plist"] retain];
+        mainMetaDictionary = [[NSMutableDictionary alloc] initWithContentsOfFile:metaPath];
+        if(mainMetaDictionary == nil)
+        {
+                mainMetaDictionary = [[NSMutableDictionary alloc] init];
+        }
-}
-
@@ -33 +51 @@
-{
-        return (@"net.pmerrill.recursivemenu.root" );
+}
+
+static void makeParentDir(NSFileManager *manager, NSString *dir)
+{
+        NSString *parent = [dir stringByDeletingLastPathComponent];
+        
+        BOOL isDir;
+        if(![manager fileExistsAtPath:parent isDirectory:&isDir])
+                makeParentDir(manager, parent);
+        else if(!isDir)
+                //Can't work with this
+                return;
+        
+        [manager createDirectoryAtPath:dir attributes:nil];
+}
+
++ (void)writeMetaData
+{
+        makeParentDir([NSFileManager defaultManager], [metaPath stringByDeletingLastPathComponent]);
+        [mainMetaDictionary writeToFile:metaPath atomically:YES];
-}
-
@@ -46 +84 @@
-    return ( self );
-*/
-
-
-
-
-
-
+ metaData:mainMetaDictionary
+
+
+
+
+
-        if ( [super initWithScene: scene] == nil ) return ( nil );
-        _dir = [dir retain];
-                
-        _names = [NSMutableArray new];
+        _metaData = [meta retain];
+        _metaFiles = [meta objectForKey:FILES_KEY];
+        if(_metaFiles == nil)
+        {
+                _metaFiles = [NSMutableDictionary dictionary];
+                [meta setObject:_metaFiles forKey:FILES_KEY];
+                modifiedMeta = YES;
+        }
+        _metaDirs = [meta objectForKey:DIRS_KEY];
+        if(_metaDirs == nil)
+        {
+                _metaDirs = [NSMutableDictionary dictionary];
+                [meta setObject:_metaDirs forKey:DIRS_KEY];
+                modifiedMeta = YES;
+        }
-        
-        NSMutableArray *files = [NSMutableArray array];
@@ -75 +128 @@
-                        [_names addObject:name];
-        }
+        modifiedMeta |= [self pruneMetaDataWithFiles:files andDirectories:_names];
+        modifiedMeta |= [self updateMetaDataWithFiles:files andDirectories:_names];
-        [_names sortUsingSelector:@selector(episodeCompare:)];
-        [files sortUsingSelector:@selector(episodeCompare:)];
-        [_names addObjectsFromArray:files];
+        
+        if(modifiedMeta)
+                [SapphireApplianceController writeMetaData];
-        
-        // set the datasource *after* you've setup your array
@@ -89 +147 @@
-    // always remember to deallocate your resources
-        [_dir release];
-
+
+
-    [super dealloc];
-}
@@ -98 +157 @@
-        BOOL isDir = NO;
-        return [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir] && isDir;
+}
+
+- (BOOL)pruneMetaDataWithFiles:(NSArray *)files andDirectories:(NSArray *)dirs
+{
+        BOOL ret = NO;
+        NSSet *existingSet = [NSSet setWithArray:files];
+        NSArray *metaArray = [_metaFiles allKeys];
+        NSMutableSet *pruneSet = [NSMutableSet setWithArray:metaArray];
+
+        [pruneSet minusSet:existingSet];
+        if([pruneSet anyObject] != nil)
+        {
+                NSEnumerator *pruneEnum = [pruneSet objectEnumerator];
+                NSString *pruneKey = nil;
+                while((pruneKey = [pruneEnum nextObject]) != nil)
+                        [_metaFiles removeObjectForKey:pruneKey];
+                ret = YES;              
+        }
+        
+        existingSet = [NSSet setWithArray:dirs];
+        metaArray = [_metaDirs allKeys];
+        pruneSet = [NSMutableSet setWithArray:metaArray];
+        
+        [pruneSet minusSet:existingSet];
+        if([pruneSet anyObject] != nil)
+        {
+                NSEnumerator *pruneEnum = [pruneSet objectEnumerator];
+                NSString *pruneKey = nil;
+                while((pruneKey = [pruneEnum nextObject]) != nil)
+                        [_metaDirs removeObjectForKey:pruneKey];
+                ret = YES;
+        }
+        
+        return ret;
+}
+
+- (BOOL)updateMetaDataWithFiles:(NSArray *)files andDirectories:(NSArray *)dirs
+{
+        BOOL ret = NO;
+        NSArray *metaArray = [_metaDirs allKeys];
+        NSSet *metaSet = [NSSet setWithArray:metaArray];
+        NSMutableSet *newSet = [NSMutableSet setWithArray:dirs];
+        
+        [newSet minusSet:metaSet];
+        if([newSet anyObject] != nil)
+        {
+                NSEnumerator *newEnum = [newSet objectEnumerator];
+                NSString *newKey = nil;
+                while((newKey = [newEnum nextObject]) != nil)
+                        [_metaDirs setObject:[NSMutableDictionary dictionary] forKey:newKey];
+                ret = YES;
+        }
+
+        NSEnumerator *fileEnum = [files objectEnumerator];
+        NSString *fileName = nil;
+        NSMutableArray *newFiles = [NSMutableArray array];
+        while((fileName = [fileEnum nextObject]) != nil)
+        {
+                NSDictionary *fileMeta = [_metaFiles objectForKey:fileName];
+                if(fileMeta == nil)
+                        [newFiles addObject:fileName];
+                else
+                {
+                        NSString *path = [_dir stringByAppendingPathComponent:fileName];
+                        NSDictionary *props = [[NSFileManager defaultManager] fileAttributesAtPath:path traverseLink:YES];
+                        NSDate *modDate = [props objectForKey:NSFileModificationDate];
+                        if([[fileMeta objectForKey:MODIFIED_KEY] intValue] != [modDate timeIntervalSince1970])
+                                [newFiles addObject:fileName];
+                }
+        }
+        //Do something in a thread to process newFiles
+        
+        return ret;
-}
-
@@ -229 +361 @@
-        if([self isDirectory:[_dir stringByAppendingPathComponent:name]])
-        {
-
+ metaData:[_metaDirs objectForKey:name]
-                [[self stack] pushController:controller];
-                [controller release];