Changeset 658

Timestamp:

08/17/08 18:10:53 (4 months ago)

Author:

gbooker

Message:

Properly background import instead of waiting on background process to complete. This was the intended operation from the beginning

Files:

• branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.m (modified) (4 diffs)

branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.m

@@ -308 +308 @@
-}
-
+- (void)updateDisplay
+{
+        /*Check for completion*/
+        if(current == max)
+        {
+                [self setListTitle:BRLocalizedString(@"Import Complete", @"The import is complete")];
+                [self setFileProgress:[NSString stringWithFormat:BRLocalizedString(@"Updated %0.0f Entries.", @"Import complete format with number updated"), updated]];
+                [self setCurrentFile:@""];
+                [self setCompletionText];
+                [bar setPercentage:100.0f];
+                [self setButtonTitle:nil];
+                action = NULL;
+
+                [SapphireMetaDataSupport save:moc];
+                
+                NSEnumerator *colEnum = [collectionDirectories objectEnumerator];
+                SapphireCollectionDirectory *col;
+                while((col = [colEnum nextObject]) != nil)
+                        [col.directory refreshAllObjects];
+        }
+        else
+        {
+                if([importItems count])
+                {
+                        SapphireFileMetaData *fileMeta = [importItems objectAtIndex:0];
+                        NSString * fileName=[[fileMeta path] lastPathComponent] ;
+                        [self setCurrentFile:[NSString stringWithFormat:BRLocalizedString(@"Fetching For: %@", "Current TV Show import process format, filename"),fileName]];           
+                }
+                else
+                {
+                        [self setCurrentFile:BRLocalizedString(@"Waiting for background import to complete", @"The import is complete, just waiting on background processes")];
+                }
+                [self setFileProgress:[NSString stringWithFormat:BRLocalizedString(@"Finished Processing: %0.0f / %0.0f", @"Import progress format, current and the max"), current, max,updated]];
+                [bar setPercentage:current/max * 100.0f];
+        }
+        [SapphireFrontRowCompat renderScene:[self scene]];              
+}
+
-/*!
- * @brief Timer function to start the import of the next file
@@ -319 +357 @@
-                [importTimer invalidate];
-                importTimer = nil;
+
+                /*Update the display*/
+                [self updateDisplay];
+
-                if([importItems count])
-                {
-                        /*Update the display*/
-                        SapphireFileMetaData *fileMeta = [importItems objectAtIndex:0];
-                        NSString * fileName=[[fileMeta path] lastPathComponent] ;
-                        [self setCurrentFile:[NSString stringWithFormat:BRLocalizedString(@"Fetching For: %@", "Current TV Show import process format, filename"),fileName]];
-                        
-                        current++ ;
-                        /*Update the imported count*/
@@ -336 +373 @@
-                                backgrounded = NO;
-                                current--;
-
+
+
-                        }
-                        
-                        /*Start with the first item*/
-                        [importItems removeObjectAtIndex:0];
-                }
-                else
-                        [self setCurrentFile:BRLocalizedString(@"Waiting for background import to complete", @"The import is complete, just waiting on background processes")];
-                [self setFileProgress:[NSString stringWithFormat:BRLocalizedString(@"Finished Processing: %0.0f / %0.0f", @"Import progress format, current and the max"), current, max,updated]];
-                [bar setPercentage:current/max * 100.0f];
-                
-                /*Check for completion*/
-                if(current == max)
-                {
-                        [SapphireMetaDataSupport save:moc];
-                        /*Update display*/
-                        [self setButtonTitle:nil];
-                        action = NULL;
-                        [self setListTitle:BRLocalizedString(@"Import Complete", @"The import is complete")];
-                        [self setFileProgress:[NSString stringWithFormat:BRLocalizedString(@"Updated %0.0f Entries.", @"Import complete format with number updated"), updated]];
-                        [self setCurrentFile:@""];
-                        [self setCompletionText];
-                        [SapphireFrontRowCompat renderScene:[self scene]];
-                        
-                        NSEnumerator *colEnum = [collectionDirectories objectEnumerator];
-                        SapphireCollectionDirectory *col;
-                        while((col = [colEnum nextObject]) != nil)
-                                [col.directory refreshAllObjects];
-                }
-                else
-                {
-                        importTimer = [NSTimer scheduledTimerWithTimeInterval:0.0f target:self selector:@selector(importNextItem:) userInfo:nil repeats:NO];
-                }
@@ -412 +424 @@
-                updated++;
-        current++;
-importNextItem:nil
+updateDisplay
-}
-
-- (void)itemImportBackgrounded
-{
-        if([importItems count] && !suspended)
-                [importItems removeObjectAtIndex:0];
-        backgrounded = YES;
-}