Browse Source

App Delegate: save some objc selector dispatches

Felix Paul Kühne 12 years ago
parent
commit
947455e13c
1 changed files with 14 additions and 14 deletions
  1. 14 14
      AspenProject/VLCAppDelegate.m

+ 14 - 14
AspenProject/VLCAppDelegate.m

@@ -130,28 +130,32 @@
 - (void)addFileTimerFired
 - (void)addFileTimerFired
 {
 {
     NSArray *allKeys = [_addedFiles allKeys];
     NSArray *allKeys = [_addedFiles allKeys];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    MLMediaLibrary *sharedLibrary = [MLMediaLibrary sharedMediaLibrary];
     for (NSString *fileURL in allKeys) {
     for (NSString *fileURL in allKeys) {
-        NSDictionary *attribs = [[NSFileManager defaultManager] attributesOfItemAtPath:fileURL error:nil];
+        if (![fileManager fileExistsAtPath:fileURL])
+            continue;
+
+        NSDictionary *attribs = [fileManager attributesOfItemAtPath:fileURL error:nil];
 
 
         NSNumber *prevFetchedSize = [_addedFiles objectForKey:fileURL];
         NSNumber *prevFetchedSize = [_addedFiles objectForKey:fileURL];
         NSNumber *updatedSize = [attribs objectForKey:NSFileSize];
         NSNumber *updatedSize = [attribs objectForKey:NSFileSize];
-        if (!updatedSize || updatedSize.intValue == 0)
+        if (!updatedSize)
             continue;
             continue;
 
 
         if ([prevFetchedSize compare:updatedSize] == NSOrderedSame) {
         if ([prevFetchedSize compare:updatedSize] == NSOrderedSame) {
             [_addedFiles removeObjectForKey:fileURL];
             [_addedFiles removeObjectForKey:fileURL];
-            [[MLMediaLibrary sharedMediaLibrary] addFilePaths:@[fileURL]];
+            [sharedLibrary addFilePaths:@[fileURL]];
 
 
             /* exclude media files from backup (QA1719) */
             /* exclude media files from backup (QA1719) */
             NSURL *excludeURL = [NSURL fileURLWithPath:fileURL];
             NSURL *excludeURL = [NSURL fileURLWithPath:fileURL];
             [excludeURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
             [excludeURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
 
 
             // TODO Should we update media db after adding new files?
             // TODO Should we update media db after adding new files?
-            [[MLMediaLibrary sharedMediaLibrary] updateMediaDatabase];
+            [sharedLibrary updateMediaDatabase];
             [_playlistViewController updateViewContents];
             [_playlistViewController updateViewContents];
-        } else {
+        } else
             [_addedFiles setObject:updatedSize forKey:fileURL];
             [_addedFiles setObject:updatedSize forKey:fileURL];
-        }
     }
     }
 
 
     if (_addedFiles.count == 0) {
     if (_addedFiles.count == 0) {
@@ -165,9 +169,8 @@
     NSArray *foundFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[self directoryPath] error:nil];
     NSArray *foundFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[self directoryPath] error:nil];
     NSMutableArray *matchedFiles = [NSMutableArray arrayWithCapacity:foundFiles.count];
     NSMutableArray *matchedFiles = [NSMutableArray arrayWithCapacity:foundFiles.count];
     for (NSString *fileName in foundFiles) {
     for (NSString *fileName in foundFiles) {
-        if ([fileName isSupportedMediaFormat]) {
+        if ([fileName isSupportedMediaFormat])
             [matchedFiles addObject:[[self directoryPath] stringByAppendingPathComponent:fileName]];
             [matchedFiles addObject:[[self directoryPath] stringByAppendingPathComponent:fileName]];
-        }
     }
     }
 
 
     NSArray *mediaFiles = [MLFile allFiles];
     NSArray *mediaFiles = [MLFile allFiles];
@@ -182,20 +185,17 @@
 
 
             BOOL found = NO;
             BOOL found = NO;
             for (MLFile *mediaFile in mediaFiles) {
             for (MLFile *mediaFile in mediaFiles) {
-                if ([mediaFile.url isEqualToString:fileURL.absoluteString]) {
+                if ([mediaFile.url isEqualToString:fileURL.absoluteString])
                     found = YES;
                     found = YES;
-                }
             }
             }
 
 
-            if (!found) {
+            if (!found)
                 [addedFiles addObject:fileName];
                 [addedFiles addObject:fileName];
-            }
         }
         }
 
 
         _addedFiles = [NSMutableDictionary dictionaryWithCapacity:[addedFiles count]];
         _addedFiles = [NSMutableDictionary dictionaryWithCapacity:[addedFiles count]];
-        for (NSString *fileURL in addedFiles) {
+        for (NSString *fileURL in addedFiles)
             [_addedFiles setObject:@(0) forKey:fileURL];
             [_addedFiles setObject:@(0) forKey:fileURL];
-        }
 
 
         _addMediaTimer = [NSTimer scheduledTimerWithTimeInterval:2. target:self
         _addMediaTimer = [NSTimer scheduledTimerWithTimeInterval:2. target:self
                                                         selector:@selector(addFileTimerFired)
                                                         selector:@selector(addFileTimerFired)