Improve synchronization for pluginUpdateOrInstall()

This way we ensure that all GUI element functionality happens *after* the completion of this method.
MacEnhance · Dec 25, 2019 · 98656ac · 98656ac
1 parent 35c3d72
commit 98656ac
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/MacForge/MacForge/Views/Bundle/MF_bundleView.m b/MacForge/MacForge/Views/Bundle/MF_bundleView.m
@@ -668,14 +668,13 @@ - (void)donateDev {
 }
 
 - (void)pluginInstall {
-    [PluginManager.sharedInstance pluginUpdateOrInstall:item :repoPackages];
-    dispatch_async(dispatch_get_main_queue(), ^{
+    [PluginManager.sharedInstance pluginUpdateOrInstall:item :repoPackages withCompletionHandler:^(BOOL res) {
         [PluginManager.sharedInstance readPlugins:nil];
         [self.bundleInstall setTitle:@"Open"];
         [self.bundleInstall setAction:@selector(pluginFinder)];
         [self.bundleDelete setEnabled:true];
         [self viewWillDraw];
-    });
+    }];
 }
 
 - (void)pluginFinder {

diff --git a/MacForge/MacForge/Views/Tables/updatesTable.m b/MacForge/MacForge/Views/Tables/updatesTable.m
@@ -61,11 +61,19 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
 }
 
 - (IBAction)updateAll:(id)sender {
+    __block NSUInteger count = [needsUpdate count];
+
     for (NSString* key in [needsUpdate allKeys]) {
         NSDictionary *installDict = [needsUpdate objectForKey:key];
-        [self->sharedMethods pluginUpdateOrInstall:installDict :[installDict objectForKey:@"sourceURL"]];
+        [self->sharedMethods pluginUpdateOrInstall:installDict :[installDict objectForKey:@"sourceURL"] withCompletionHandler:^(BOOL res) {
+            count--;
+        }];
     }
 
+    /* wait until all installs have finished */
+    while (count != 0)
+        ;
+
     dispatch_queue_t backgroundQueue = dispatch_queue_create("com.w0lf.MacForge", 0);
     dispatch_async(backgroundQueue, ^{
         [needsUpdate removeAllObjects];
@@ -77,13 +85,20 @@ - (IBAction)updatePlugin:(id)sender {
     NSTableView *t = (NSTableView*)[[[sender superview] superview] superview];
     long selected = [t rowForView:sender];
     @try {
+        __block NSUInteger count = [needsUpdate count];
+
         NSString *key = [[needsUpdate allKeys] objectAtIndex:selected];
         NSDictionary *installDict = [needsUpdate objectForKey:key];
-        [self->sharedMethods pluginUpdateOrInstall:installDict :[installDict objectForKey:@"sourceURL"]];
+        [self->sharedMethods pluginUpdateOrInstall:installDict :[installDict objectForKey:@"sourceURL"] withCompletionHandler:^(BOOL res) {
+            count--;
+        }];
+
+        /* wait until all installs have finished */
+        while (count != 0)
+            ;
 
         dispatch_queue_t backgroundQueue = dispatch_queue_create("com.w0lf.MacForge", 0);
         dispatch_async(backgroundQueue, ^{
-//            [needsUpdate removeObjectForKey:key];
             [self->sharedMethods checkforPluginUpdates:self->_tblView :myDelegate.viewUpdateCounter];
         });
     } @catch (NSException *exception) {

diff --git a/MacForge/Shared Classes/MF_Purchase.m b/MacForge/Shared Classes/MF_Purchase.m
@@ -221,11 +221,10 @@ + (void)pluginInstallWithProgress:(MSPlugin*)plugin :(NSString*)repo :(NSButton*
 
 + (void)pluginInstall:(MSPlugin*)plugin :(NSButton*)theButton :(NSString*)repo {
     NSDictionary* item = plugin.webPlist;
-    [PluginManager.sharedInstance pluginUpdateOrInstall:item :repo];
-    dispatch_async(dispatch_get_main_queue(), ^{
+    [PluginManager.sharedInstance pluginUpdateOrInstall:item :repo withCompletionHandler:^(BOOL res) {
         [PluginManager.sharedInstance readPlugins:nil];
         [theButton setTitle:@"OPEN"];
-    });
+    }];
 }
 
 @end
diff --git a/MacForge/Shared Classes/PluginManager.h b/MacForge/Shared Classes/PluginManager.h
@@ -37,7 +37,7 @@
 
 - (void)installBundles:(NSArray*)pathArray;
 - (void)replaceFile:(NSString*)start :(NSString*)end;
-- (Boolean)pluginUpdateOrInstall:(NSDictionary*)item :(NSString*)repo;
+- (Boolean)pluginUpdateOrInstall:(NSDictionary*)item :(NSString*)repo withCompletionHandler:(void (^)(BOOL))completionBlock;
 - (Boolean)pluginDelete:(NSDictionary*)item;
 - (Boolean)pluginRevealFinder:(NSDictionary*)item;
 

diff --git a/MacForge/Shared Classes/PluginManager.m b/MacForge/Shared Classes/PluginManager.m
@@ -343,8 +343,8 @@ - (Boolean)pluginDownloaded:(NSData*)data {
 }
 
 // Try to update or install a plugin given a bundle plist and a repo
-- (Boolean)pluginUpdateOrInstall:(NSDictionary *)item :(NSString *)repo {
-    Boolean success = false;
+- (Boolean)pluginUpdateOrInstall:(NSDictionary *)item :(NSString *)repo withCompletionHandler:(void (^)(BOOL result))completionBlock {
+    __block Boolean success = false;
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         // Get installation URL
@@ -376,9 +376,7 @@ - (Boolean)pluginUpdateOrInstall:(NSDictionary *)item :(NSString *)repo {
             NSTask *task = [NSTask launchedTaskWithLaunchPath:@"/usr/bin/unzip" arguments:@[@"-o", temp, @"-d", unzipDir]];
             [task waitUntilExit];
             if ([task terminationStatus] == 0) {
-                // presumably the only case where we've successfully installed
-                // ???
-    //                success = true;
+                success = true;
             }
 
             // Try to install the contents
@@ -388,10 +386,11 @@ - (Boolean)pluginUpdateOrInstall:(NSDictionary *)item :(NSString *)repo {
             [self readPlugins:nil];
         }
 
-       //This is your completion handler
-       dispatch_sync(dispatch_get_main_queue(), ^{
-
-       });
+        // This is your completion handler
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            if (completionBlock)
+                completionBlock(success);
+        });
     });
 
     return success;
@@ -594,8 +593,10 @@ - (void)checkforPluginUpdatesAndInstall:(NSTableView*)table {
     if (needsUpdate.count > 0) {
         for (NSString *key in needsUpdate.allKeys) {
             NSDictionary *itemDict = [needsUpdate objectForKey:key];
-            if ([self pluginUpdateOrInstall:itemDict :[itemDict objectForKey:@"sourceURL"]])
-                [needsUpdate removeObjectForKey:key];
+            [self pluginUpdateOrInstall:itemDict :[itemDict objectForKey:@"sourceURL"] withCompletionHandler:^(BOOL res) {
+                if (res)
+                    [needsUpdate removeObjectForKey:key];
+            }];
         }
         [self updateApplicationIcon];
     }