Progressbar update taken out of FilesQueue

kornelski · kornelski · commit f5ea1c3cfa18 · 2013-09-08T19:37:41.000+01:00
diff --git a/imageoptim/FilesQueue.h b/imageoptim/FilesQueue.h
@@ -12,20 +12,18 @@
 @interface FilesQueue : NSArrayController <NSTableViewDelegate,NSTableViewDataSource> {
 	NSTableView *tableView;
 	NSArrayController *filesController;
-	BOOL isEnabled;
+	BOOL isEnabled, isBusy;
 	NSInteger nextInsertRow;
 	NSOperationQueue *cpuQueue;
     NSOperationQueue *fileIOQueue;
 	NSOperationQueue *dirWorkerQueue;	
 	
     NSHashTable *seenPathHashes;
     
-	NSProgressIndicator *progressBar;
-    
     NSLock *queueWaitingLock;
 }
 
--(id)configureWithTableView:(NSTableView*)a progressBar:(NSProgressIndicator *)p;
+-(id)configureWithTableView:(NSTableView*)a;
 
 - (NSString *)tableView:(NSTableView *)aTableView toolTipForCell:(NSCell *)aCell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)aTableColumn row:(int)row mouseLocation:(NSPoint)mouseLocation;
 -(void)addPaths:(NSArray *)paths;
@@ -51,5 +49,6 @@
 -(NSArray *)fileTypes;
 
 @property (readonly, nonatomic) NSNumber *queueCount;
+@property (readonly) BOOL isBusy;
 
 @end
diff --git a/imageoptim/FilesQueue.m b/imageoptim/FilesQueue.m
@@ -12,18 +12,19 @@ @interface FilesQueue ()
 
 -(NSArray*)extensions;
 -(BOOL)isAnyQueueBusy;
--(void)updateProgressbar;
+-(void)updateBusyState;
 -(void)deleteObjects:(NSArray*)objects;
 @end
 
 static NSString *kIMDraggedRowIndexesPboardType = @"com.imageoptim.rows";
 
 @implementation FilesQueue
 
--(id)configureWithTableView:(NSTableView*)inTableView progressBar:(NSProgressIndicator *)inBar
+@synthesize isBusy;
+
+-(id)configureWithTableView:(NSTableView*)inTableView
 {
     if (self = [super init]) {
-	progressBar = inBar;
 	tableView = inTableView;
 	seenPathHashes = [[NSHashTable alloc] initWithOptions:NSHashTableZeroingWeakMemory capacity:1000];
 
@@ -71,21 +72,15 @@ -(void)waitForQueuesToFinish {
 				[cpuQueue waitUntilAllOperationsAreFinished];
 
 			} while ([self isAnyQueueBusy]);
+            NSLog(@"wait thread loop end");
 		}
         @finally {
             [queueWaitingLock unlock];
         }
     }
-    [self performSelectorOnMainThread:@selector(updateProgressbar) withObject:nil waitUntilDone:NO];
+    [self performSelectorOnMainThread:@selector(updateBusyState) withObject:nil waitUntilDone:NO];
 }
 
--(void)waitInBackgroundForQueuesToFinish {
-    if ([queueWaitingLock tryLock]) // if it's locked, there's thread waiting for finish
-    {
-        [queueWaitingLock unlock]; // can't lock/unlock across threads, so new lock will have to be made
-        [self performSelectorInBackground:@selector(waitForQueuesToFinish) withObject:nil];
-    }
-}
 
 -(void)setRow:(NSInteger)row
 {
@@ -322,7 +317,7 @@ -(void)addFileObjects:(NSArray *)files
         }
     }
 
-    [self updateProgressbar];
+    [self updateBusyState];
 }
 
 -(void)addPaths:(NSArray*)paths
@@ -434,23 +429,26 @@ -(void)startAgainOptimized:(BOOL)optimized
 
 	if (!anyStarted) NSBeep();
 
-	[self updateProgressbar];
+	[self updateBusyState];
 }
 
--(void)updateProgressbar
+-(void)updateBusyState
 {
-	if (![self isAnyQueueBusy])
-	{
-		[progressBar stopAnimation:nil];
-        if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BounceDock"]) {
-            [NSApp requestUserAttention:NSInformationalRequest];
+    BOOL currentlyBusy = [self isAnyQueueBusy];
+
+    if (isBusy != currentlyBusy) {
+        [self willChangeValueForKey:@"isBusy"];
+        isBusy = currentlyBusy;
+        [self didChangeValueForKey:@"isBusy"];
+
+        if (isBusy) {
+            if ([queueWaitingLock tryLock]) // if it's locked, there's thread waiting for finish
+            {
+                [queueWaitingLock unlock]; // can't lock/unlock across threads, so new lock will have to be made
+                [self performSelectorInBackground:@selector(waitForQueuesToFinish) withObject:nil];
+            }
         }
-	}
-	else
-	{
-		[progressBar startAnimation:nil];
-        [self waitInBackgroundForQueuesToFinish];
-	}
+    }
 }
 
 #define PNG_ENABLED 1
diff --git a/imageoptim/ImageOptim.m b/imageoptim/ImageOptim.m
@@ -13,6 +13,7 @@ @implementation ImageOptim
 NSDictionary *statusImages;
 
 static NSString *kIMPreviewPanelContext = @"preview";
+static NSString *kIMQueueBusyContext = @"isBusy";
 
 @synthesize filesQueue=filesController;
 
@@ -28,7 +29,8 @@ - (void)applicationWillFinishLaunching:(NSNotification *)unused {
 
 	[[NSUserDefaults standardUserDefaults] registerDefaults:defs];
 
-    [filesController configureWithTableView:tableView progressBar:progressBar];
+    [filesController configureWithTableView:tableView];
+    [filesController addObserver:self forKeyPath:@"isBusy" options:nil context:kIMQueueBusyContext];
 
     [NSApp setServicesProvider:self];
     NSUpdateDynamicServices();
@@ -192,9 +194,19 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     if (context == kIMPreviewPanelContext) {
         [previewPanel reloadData];
     } else {
-    // Defer and coalesce statusbar updates
-    dispatch_source_merge_data(statusBarUpdateQueue, 1);
-}
+        if (context == kIMQueueBusyContext) {
+            if (filesController.isBusy) {
+                [progressBar startAnimation:self];
+            } else {
+                [progressBar stopAnimation:self];
+                if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BounceDock"]) {
+                    [NSApp requestUserAttention:NSInformationalRequest];
+                }
+            }
+        }
+        // Defer and coalesce statusbar updates
+        dispatch_source_merge_data(statusBarUpdateQueue, 1);
+    }
 }
 
 -(int)numberOfCPUs
