Changeset 74

Timestamp:

06/28/07 19:10:35 (1 year ago)

Author:

gbooker

Message:

Added the ability to rescan for new files in the predicated browser

Files:

• trunk/SapphireBrowser.h (modified) (2 diffs)
• trunk/SapphireBrowser.m (modified) (8 diffs)
• trunk/SapphireMetaData.h (modified) (2 diffs)
• trunk/SapphireMetaData.m (modified) (7 diffs)

trunk/SapphireBrowser.h

@@ -19 +19 @@
-{
-        NSMutableArray                          * _names ;
- 
+
-        SapphireDirectoryMetaData       *metaData;
-        SapphirePredicate                       *predicate;
@@ -25 +25 @@
-        SapphireFileMetaData            *currentPlayFile;
-        SapphireSettings                        *settings;
+        int                                                     dirCount;
+        int                                                     fileCount;
-}
-

trunk/SapphireBrowser.m

@@ -143 +143 @@
-        if(predicate == NULL)
-        {
-
+
+
-                divider = [_names count];
-
+
+
+
+
-        }
-        else
-        {
-
+
+
-                divider = [_names count];
-
+
+
+
+
+
-        }
-        int i=0, count=[_names count];
@@ -163 +172 @@
-        if(divider && divider != [_names count])
-                [list addDividerAtIndex:divider];
+        if(predicate != NULL)
+                [list addDividerAtIndex:[_names count] -1];
-        [[self scene] renderScene];
-}
@@ -302 +313 @@
-        BRAdornedMenuItemLayer * result = nil;
-        BOOL watched = NO;
- 
-[[metaData directories] count]
+
+dirCount
-        {
-                result = [BRAdornedMenuItemLayer adornedFolderMenuItemWithScene: [self scene]] ;
@@ -311 +322 @@
-                        favorite = [meta favoriteForPredicate:predicate];
-        }
-
+ if(row < dirCount + fileCount)
-        {
-                result = [BRAdornedMenuItemLayer adornedMenuItemWithScene: [self scene]] ;
@@ -321 +332 @@
-                        favorite = [meta favorite] ;
-                }
+        }
+        else
+        {
+                result = [BRAdornedMenuItemLayer adornedMenuItemWithScene:[self scene]];
+                [result setLeftIcon:[[SapphireTheme sharedTheme] gearGemForScene:[self scene]]];
+                watched = YES;
-        }
-        if(!watched)
@@ -388 +405 @@
-        }
-        
-[[metaData directories] containsObject:name]
+row < dirCount
-        {
-                id controller = [[SapphireBrowser alloc] initWithScene:[self scene] metaData:[metaData metaDataForDirectory:name] predicate:predicate];
@@ -396 +413 @@
-                [controller release];
-        }
-
+ if(row < dirCount + fileCount)
-        {
-                BRVideoPlayerController *controller = [[BRVideoPlayerController alloc] initWithScene:[self scene]];
@@ -436 +453 @@
-                [controller release];
-        }
-
-
-
+
+
+
+
+
+
+
+
-{
-    // If subclassing BRMediaMenuController, this function is called when the selection cursor
-    // passes over an item.
-item
+row
-                return nil;
-item
-[[metaData files] containsObject:name]
+row
+row >= dirCount && row < dirCount + fileCount
-        {
-                SapphireFileMetaData *fileMeta = [metaData metaDataForFile:name];

trunk/SapphireMetaData.h

@@ -53 +53 @@
-        NSTimer                         *importTimer;
-        NSMutableArray          *importArray;
+        BOOL                            scannedDirectory;
-}
-
@@ -73 +74 @@
-- (SapphireMetaData *)metaDataForSubPath:(NSString *)path;
-- (NSArray *)subFileMetas;
+- (void)scanForNewFiles;
-
-- (BOOL)watchedForPredicate:(SapphirePredicate *)predicate;

trunk/SapphireMetaData.m

@@ -233 +233 @@
-        if([importArray count])
-                [self writeMetaData];
+        scannedDirectory = YES;
-}
-
@@ -247 +248 @@
-- (BOOL)hasPredicatedFiles:(SapphirePredicate *)predicate
-{
-
+
+
+
+
-        NSString *file = nil;
-        while((file = [fileEnum nextObject]) != nil)
@@ -267 +271 @@
-- (BOOL)hasPredicatedDirectories:(SapphirePredicate *)predicate
-{
-
+
+
+
+
-        NSString *directory = nil;
-        while((directory = [directoryEnum nextObject]) != nil)
-        {
-                SapphireDirectoryMetaData *meta = [self metaDataForDirectory:directory];
-                [meta reloadDirectoryContents];
-                
-                if([meta hasPredicatedFiles:predicate] || [meta hasPredicatedDirectories:predicate])
@@ -283 +289 @@
-{
-        NSMutableArray *ret = [NSMutableArray array];
-
+
+
+
+
-        NSString *file = nil;
-        while((file = [fileEnum nextObject]) != nil)
@@ -303 +312 @@
-{
-        NSMutableArray *ret = [NSMutableArray array];
-
+
+
+
+
-        NSString *directory = nil;
-        while((directory = [directoryEnum nextObject]) != nil)
-        {
-                SapphireDirectoryMetaData *meta = [self metaDataForDirectory:directory];
-                [meta reloadDirectoryContents];
-
-                if([meta hasPredicatedFiles:predicate] || [meta hasPredicatedDirectories:predicate])
@@ -486 +497 @@
-}
-
+- (void)scanForNewFiles
+{
+        NSEnumerator *dirEnum = [directories objectEnumerator];
+        NSString *dir = nil;
+        while((dir = [dirEnum nextObject]) != nil)
+        {
+                SapphireDirectoryMetaData *dirMeta = [self metaDataForDirectory:dir];
+                if(dirMeta != nil)
+                        [dirMeta scanForNewFiles];
+        }
+        NSEnumerator *fileEnum = [files objectEnumerator];
+        NSString *file = nil;
+        while((file = [fileEnum nextObject]) != nil)
+                [self metaDataForFile:file];
+}
+
-- (void)setupFiles:(NSArray * *)filesToScan andDirectories:(NSArray * *)directoriesToScan arraysForPredicate:(SapphirePredicate *)predicate
-{
@@ -491 +518 @@
-        {
-                *filesToScan = [self predicatedFiles:predicate];
-
-
+
+
+
-        {
-                //Likely haven't scanned the directory yet, so use cached