Changeset 650

Timestamp:

08/02/08 14:03:58 (4 months ago)

Author:

gbooker

Message:

Some changes to the directory scanning. This is a bit faster, but still not fast enough

Files:

• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.h (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (10 diffs)
• branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataScanner.h (modified) (4 diffs)
• branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataScanner.m (modified) (6 diffs)
• branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.h (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.m (modified) (4 diffs)

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

@@ -21 +21 @@
-+ (SapphireDirectoryMetaData *)createDirectoryWithPath:(NSString *)path parent:(SapphireDirectoryMetaData *)parent inContext:(NSManagedObjectContext *)moc;
-- (void)insertDictionary:(NSDictionary *)dict withDefer:(NSMutableDictionary *)defer andDisplay:(SapphireMetaDataUpgrading *)display;
+- (void)rescanDirWithExistingDirs:(NSMutableArray *)existingDirs files:(NSMutableArray *)existingFiles symDirs:(NSMutableArray *)existingSymDirs symFiles:(NSMutableArray *)existingSymFiles;
-@end

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

@@ -242 +242 @@
-}
-
-
-
-
-
-
+
+
-        [importArray release];
-        importArray = [[NSMutableArray alloc] init];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        NSFileManager *fm = [NSFileManager defaultManager];
+        NSManagedObjectContext *moc = [self managedObjectContext];
-        
-        NSArray *names = [fm directoryContentsAtPath:self.path];
-        NSEnumerator *nameEnum = [names objectEnumerator];
-        NSString *name;
-
+    
-        while((name = [nameEnum nextObject]) != nil)
-        {
@@ -282 +288 @@
-                if(![fm acceptFilePath:filePath])
-                        continue;
-
+
-                NSDictionary *attributes = [fm fileAttributesAtPath:filePath traverseLink:NO];
-                if([[attributes fileType] isEqualToString:NSFileTypeSymbolicLink])
@@ -293 +299 @@
-                        if([fm isDirectory:resolvedPath])
-                        {
-containsObject:name]
+objectForKey:name] != nil
-                                {
-                                        //Dir moved, but original data is still here
@@ -299 +305 @@
-                                        if(resolved != nil)
-                                                [moc deleteObject:resolved];
-
+
-                                        resolved = (SapphireDirectoryMetaData *)[self metaDataForDirectory:name];
-                                        resolved.parent = [SapphireDirectoryMetaData createDirectoryWithPath:[resolvedPath stringByDeletingLastPathComponent] inContext:moc];
-                                        resolved.path = resolvedPath;
-
+ForKey
-                                }
-
-
+
+
+
+
+
-                        }
-                        else
-                        {
-containsObject:name]
+objectForKey:name] != nil
-                                {
-                                        //File moved, but original data is still here
@@ -316 +325 @@
-                                        if(resolved != nil)
-                                                [moc deleteObject:resolved];
-
+
-                                        resolved = [self metaDataForFile:name];
-                                        resolved.parent = [SapphireDirectoryMetaData createDirectoryWithPath:[resolvedPath stringByDeletingLastPathComponent] inContext:moc];
-                                        resolved.path = resolvedPath;
-
+ForKey
-                                }
-
-
+
+
+
+
+
-                        }
-                        /*      It's not always modified, but rather than figuring out all the cases where it is or isn't
-       
+ 
-                        modified = YES;
-                }
-                else if([fm isDirectory:filePath])
-                {
-
-
-
+
+
+
+
+
-                                modified = YES;
-                        }
-
+
+
-                }
-                else
-                {
-
-
-
-
+
+
+
+
+
+
-                                modified = YES;
-                        }
-                        else
-                        {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
-        if(modified)
-                [self clearPredicateCache];
-        
-        nameEnum = [files objectEnumerator];
-        while((name = [nameEnum nextObject]) != nil)
-        {
-                NSLog(@"Need to delete file %@ in %@", name, self.path);
-                SapphireFileMetaData *file = [SapphireFileMetaData fileWithPath:[self.path stringByAppendingPathComponent:name] inContext:moc];
-                if(file != nil)
-                        [moc deleteObject:file];
-        }
-        
-        nameEnum = [dirs objectEnumerator];
-        while((name = [nameEnum nextObject]) != nil)
-        {
-                NSLog(@"Need to delete dir %@ in %@", name, self.path);
-                SapphireDirectoryMetaData *dir = [SapphireDirectoryMetaData directoryWithPath:[self.path stringByAppendingPathComponent:name] inContext:moc];
-                if(dir != nil)
-                        [moc deleteObject:dir];
-        }
-        
-        nameEnum = [linkedFiles objectEnumerator];
-        while((name = [nameEnum nextObject]) != nil)
-        {
-                NSLog(@"Need to delete file link %@ in %@", name, self.path);
-                SapphireFileSymLink *link = [SapphireFileSymLink fileLinkWithPath:[self.path stringByAppendingPathComponent:name] inContext:moc];
-                [moc deleteObject:link];
-        }
-        
-        nameEnum = [linkedDirs objectEnumerator];
-        while((name = [nameEnum nextObject]) != nil)
-        {
-                NSLog(@"Need to delete dir link %@ in %@", name, self.path);
-                SapphireDirectorySymLink *link = [SapphireDirectorySymLink directoryLinkWithPath:[self.path stringByAppendingPathComponent:name] inContext:moc];
-                [moc deleteObject:link];
-        }
-        [SapphireMetaDataSupport save:moc];
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if(filterPredicate != nil)
-        {
-                [allFiles filterUsingPredicate:filterPredicate];
-
-       if([fileObject
-       
-       NSSet *files = [NSSet setWithArray:fileObject
-       NSSet *allEps = [files valueForKeyPath:@"tvEpisode.objectID"
-       if([allEps count])
-       {
-               NSPredicate *fetchPred = [NSPredicate predicateWithFormat:@"SELF IN %@", allEps];
-       NSArray *episodes = doFetchRequest(SapphireEpisodeName, moc, fetchPred)
-       if([episodes count])
-       {
-               fetchPred = [NSPredicate predicateWithFormat:@"episode IN %@", episodes];
-       doFetchRequest(SapphireSubEpisodeName, moc, fetchPred)
-}
-
-       NSSet *allMovies = [files valueForKeyPath:@"movie.objectID"];
-       if([allMovies count])
-       {
-               NSPredicate *fetchPred = [NSPredicate predicateWithFormat:@"SELF IN %@", allMovies];
-       doFetchRequest(SapphireMovieName, moc, fetchPred)
-}
-              
-
+
+if([allFile
+
+NSMutableSet *files = [NSMutableSet setWithArray:fetchedFile
+[files addObjectsFromArray:[linkedFiles valueForKey:@"file"]
+NSSet *allEps = [files valueForKeyPath:@"tvEpisode.objectID"];
+if([allEps count])
+{
+NSPredicate *fetchPred = [NSPredicate predicateWithFormat:@"SELF IN %@", allEps]
+NSArray *episodes = doFetchRequest(SapphireEpisodeName, moc, fetchPred);
+if([episodes count])
+{
+fetchPred = [NSPredicate predicateWithFormat:@"episode IN %@", episodes]
+doFetchRequest(SapphireSubEpisodeName, moc, fetchPred);
+
+}
+NSSet *allMovies = [files valueForKeyPath:@"movie.objectID"];
+if([allMovies count])
+{
+NSPredicate *fetchPred = [NSPredicate predicateWithFormat:@"SELF IN %@", allMovies]
+doFetchRequest(SapphireMovieName, moc, fetchPred);
+
+              
-        [allFiles sortUsingFunction:fileAndLinkEpisodeCompare context:nil];
-        [cachedFiles release];
@@ -435 +464 @@
-        }
-        [allFiles release];
-
-
+
+
+
+
-        if(filterPredicate != nil)
-        {
@@ -455 +486 @@
-                }
-        }
-        NSArray *linkedDirsObjects = [self.linkedDirsSet allObjects];
-        if(filterPredicate != nil)
-        {
-Objects
+
-                for(i=0; i<count; i++)
-                {
-Objects
+
-                        SapphireDirectoryMetaData *dir = [link directory];
-                        if([dir containsFileMatchingFilterPredicate:filterPredicate])
@@ -471 +501 @@
-        }
-        else
-Objects
+
-        [allDirs sortUsingFunction:dirAndLinkPathCompare context:nil];
-        [cachedDirs release];
@@ -484 +514 @@
-        }
-        [allDirs release];
+        [fetchedDirs release];
+        [linkedDirs release];
-        [delegate directoryContentsChanged];
-}
@@ -534 +566 @@
-}
-
-getSubFileMetasWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip
+conductScanWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip andResults:(BOOL)results
-{
-        /*Scan dir and create scanner*/
-        [self setFilterPredicate:[SapphireApplianceController unfilteredPredicate]];
-        [self reloadDirectoryContents];
-        SapphireMetaDataScanner *scanner = [[SapphireMetaDataScanner alloc] initWithDirectoryMetaData:self delegate:subDelegate];
+        
+        NSPredicate *fetchPredicate = [NSPredicate predicateWithFormat:@"parent = %@", self];
+        NSSortDescriptor *sort = [[NSSortDescriptor alloc] initWithKey:@"path" ascending:YES];
+        NSManagedObjectContext *moc = [self managedObjectContext];
+        NSArray *dirs = doSortedFetchRequest(SapphireDirectoryMetaDataName, moc, fetchPredicate, sort);
+        NSArray *files = doSortedFetchRequest(SapphireFileMetaDataName, moc, fetchPredicate, sort);
+        fetchPredicate = [NSPredicate predicateWithFormat:@"containingDirectory = %@", self];
+        NSArray *symDirs = doSortedFetchRequest(SapphireDirectorySymLinkName, moc, fetchPredicate, sort);
+        NSArray *symFiles = doSortedFetchRequest(SapphireFileSymLinkName, moc, fetchPredicate, sort);
+        [sort release];
+        
+        [scanner setSubDirs:dirs files:files symDirs:symDirs symFiles:symFiles];
+        
-        /*Add ourselves to not rescan*/
-        [skip addObject:self.path];
-        [scanner setSkipDirectories:skip];
-        /*We want results*/
-YES
+results
-        [scanner release];
-}
-
+- (void)getSubFileMetasWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip
+{
+        [self conductScanWithDelegate:subDelegate skipDirectories:skip andResults:YES];
+}
+
-- (void)scanForNewFilesWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip
-{
-
-
-
-
-
-
-
-
-
+
-}
-

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

@@ -19 +19 @@
- */
-
-<Cocoa/Cocoa.h>
+"SapphireDirectory.h"
-
-
+
-
-/*!
@@ -29 +29 @@
- */
-@interface SapphireMetaDataScanner : NSObject <SapphireMetaDataScannerDelegate> {
-id <SapphireDirectory>                                 
-object
+SapphireDirectoryMetaData                              *
+directorie
-        NSMutableArray                                                  *results;                       /*!< @brief The current results of the scan*/
-        NSMutableSet                                                    *skipDirectories;       /*!< @brief The directories to skip*/
-        id <SapphireMetaDataScannerDelegate>    delegate;                       /*!< @brief The delegate to inform about the results*/
-        NSTimer                                                                 *nextFileTimer;         /*!< @brief The timer to get the next file*/
+        
+        NSMutableArray                                                  *dirs;                          /*!< @brief The list of dirs in this directory*/
+        NSMutableArray                                                  *files;                         /*!< @brief The list of files in this directory*/
+        NSMutableArray                                                  *symDirs;                       /*!< @brief The list of symbolic linked dirs in this directory*/
+        NSMutableArray                                                  *symFiles;                      /*!< @brief The list of symbolic linked files in this directory*/
+        int                                                                             depth;                          /*!< @brief The directory depth of this scanner*/
-}
-
@@ -44 +50 @@
- * @return The scanner
- */
-id <SapphireDirectory>
+SapphireDirectoryMetaData *
-
-/*!
@@ -56 +62 @@
-
-/*!
+ * @brief Set the prefetched subdirs/files/etc for this scanner
+ *
+ * @param subDirs The prefetched dirs contained within this directory
+ * @param subFiles The prefetched files contained within this directory
+ * @param subSymDirs The prefetched symbolic linked dirs contained within this directory
+ * @param subSymFiles The prefetched symbolic linked files contained within this directory
+ */
+- (void)setSubDirs:(NSArray *)subDirs files:(NSArray *)subFiles symDirs:(NSArray *)subSymDirs symFiles:(NSArray *)subSymFiles;
+
+/*!
- * @brief Sets whether we wish results
- *

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

@@ -22 +22 @@
-#import "SapphireMetaData.h"
-#import "SapphireApplianceController.h"
+#import "SapphireDirectoryMetaData.h"
-
-@implementation SapphireMetaDataScanner
-
-id <SapphireDirectory>
+SapphireDirectoryMetaData *
-{
-        self = [super init];
-        if (self != nil) {
-                metaDir = [meta retain];
-[[meta directories] mutableCopy]
-[NSMutableArray new]
+nil
+nil
-                delegate = [newDelegate retain];
+                dirs = files = symDirs = symFiles = nil;
-        }
-        return self;
@@ -44 +46 @@
-        [skipDirectories release];
-        [delegate release];
+        [dirs release];
+        [files release];
+        [symDirs release];
+        [symFiles release];
-        [super dealloc];
-}
@@ -55 +61 @@
-        {
-                /*Remove any in our remaining that are to be skipped*/
-metaDir metaDataForDirectory:[remaining objectAtIndex:i]
+remaining objectAtIndex:i
-                if([skipDirectories containsObject:checkPath])
-                        [remaining removeObjectAtIndex:i];
@@ -62 +68 @@
-                        [skipDirectories addObject:checkPath];
-        }
+}
+
+- (void)setSubDirs:(NSArray *)subDirs files:(NSArray *)subFiles symDirs:(NSArray *)subSymDirs symFiles:(NSArray *)subSymFiles
+{
+        dirs = [subDirs mutableCopy];
+        files = [subFiles mutableCopy];
+        symDirs = [subSymDirs mutableCopy];
+        symFiles = [subSymFiles mutableCopy];
+        [metaDir rescanDirWithExistingDirs:dirs files:files symDirs:symDirs symFiles:symFiles];
+        remaining = [dirs mutableCopy];
+        [remaining addObjectsFromArray:[symDirs valueForKey:@"directory"]];
-}
-
@@ -79 +96 @@
-{
-        /*Include the files in this dir*/
-
-
-
+
-        {
-
-
-
+
+
-        }
-        /*Send results*/
-        [delegate gotSubFiles:results];
-        if([metaDir delegate] == nil)
-                [metaDir refreshAllObjects];
-        [self autorelease];
-}
@@ -142 +154 @@
-                {
-                        /*Scan the next directory*/
-id <SapphireDirectory> next = [metaDir metaDataForDirectory:[remaining objectAtIndex:0]
+SapphireDirectoryMetaData *next = [remaining objectAtIndex:0
-                        /*State whether we care for results*/
-                        if(results != nil)

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.h

@@ -119 +119 @@
-        int                                                             collectionIndex;                /*!< @brief The current index in the directories*/
-        NSMutableArray                                  *importItems;                   /*!< @brief The items remaining to import*/
+        NSMutableSet                                    *skipSet;                               /*!< @brief The directories to skip*/
-        NSTimer                                                 *importTimer;                   /*!< @brief The timer to do the next import (so we don't freeze the UI)*/
-        float                                                   max;                                    /*!< @brief The max number to import*/

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.m

@@ -82 +82 @@
-        [moc release];
-        [collectionDirectories release];
+        [skipSet release];
-        [importItems release];
-        [importTimer invalidate];
@@ -170 +171 @@
-                return;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
-        [meta getSubFileMetasWithDelegate:self skipDirectories:skipSet];
-        collectionIndex++;
@@ -207 +215 @@
-        [collectionDirectories release];
-        collectionDirectories = [[SapphireCollectionDirectory availableCollectionDirectoriesInContext:moc] retain];
+        NSArray *skipCol = [SapphireCollectionDirectory skippedCollectionDirectoriesInContext:moc];
+        [skipSet release];
+        skipSet = [NSMutableSet setWithSet:[skipCol valueForKeyPath:@"directory.path"]];
-        [self getItems];
-}
@@ -348 +359 @@
-                        [self setCompletionText];
-                        [SapphireFrontRowCompat renderScene:[self scene]];
+                        
+                        NSEnumerator *colEnum = [collectionDirectories objectEnumerator];
+                        SapphireCollectionDirectory *col;
+                        while((col = [colEnum nextObject]) != nil)
+                                [col.directory refreshAllObjects];
-                }
-                else