Manual/Auto inject mode?

Author: johnno1962

InjectionIII.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		BB439B801FABA64300B4F50B /* SwiftEvalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB439B7F1FABA64300B4F50B /* SwiftEvalTests.swift */; };
 		BB56393C1FD5C25A002FFCEF /* SignerService.m in Sources */ = {isa = PBXBuildFile; fileRef = BB67DBB61FB0D0F2000EAC8A /* SignerService.m */; };
 		BB6306FE1FCD1A410021D30C /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = BB6306FD1FCD1A410021D30C /* Credits.rtf */; };
+		BB877CE42186EB6E0070EEC7 /* DDHotKeyCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = BB6306F51FCD16600021D30C /* DDHotKeyCenter.m */; };
+		BB877CE52186EB6E0070EEC7 /* DDHotKeyUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = BB6306F61FCD16600021D30C /* DDHotKeyUtilities.m */; };
 		BBB040641FB17A6C007DDD0A /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB040631FB1798A007DDD0A /* ScriptingBridge.framework */; };
 		BBB64DC51FD450AF0020BE47 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = BB037DF31FAD808B004B267C /* README.md */; };
 		BBB64DC61FD450B40020BE47 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BB037DF41FAD80D0004B267C /* LICENSE */; };
@@ -606,6 +608,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BB877CE42186EB6E0070EEC7 /* DDHotKeyCenter.m in Sources */,
+				BB877CE52186EB6E0070EEC7 /* DDHotKeyUtilities.m in Sources */,
 				BBB64FEA1FD583B60020BE47 /* Xprobe.mm in Sources */,
 				BBB64DD31FD56F570020BE47 /* XprobePluginMenuController.m in Sources */,
 				BBB64DD41FD56F570020BE47 /* XprobeConsole.m in Sources */,

InjectionIII/AppDelegate.mm

@@ -13,9 +13,9 @@
 //#import "HelperInstaller.h"
 //#import "HelperProxy.h"
 
-//#import <Carbon/Carbon.h>
-//#import <AppKit/NSEvent.h>
-//#import "DDHotKeyCenter.h"
+#import <Carbon/Carbon.h>
+#import <AppKit/NSEvent.h>
+#import "DDHotKeyCenter.h"
 
 #import "InjectionIII-Swift.h"
 #import "UserDefaults.h"
@@ -55,11 +55,9 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
         : NSControlStateValueOff;
 
     [self setMenuIcon:@"InjectionIdle"];
-#if 0
     [[DDHotKeyCenter sharedHotKeyCenter] registerHotKeyWithKeyCode:kVK_ANSI_Equal
                                                      modifierFlags:NSEventModifierFlagControl
                                                             target:self action:@selector(autoInject:) object:nil];
-#endif
 }
 
 - (IBAction)openProject:sender {
@@ -125,6 +123,7 @@ - (IBAction)toggleState:(NSMenuItem *)sender {
 }
 
 - (IBAction)autoInject:(NSMenuItem *)sender {
+    [self.lastConnection injectPending];
 #if 0
     NSError *error = nil;
     // Install helper tool
@@ -180,10 +179,8 @@ - (IBAction)donate:sender {
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
     // Insert code here to tear down your application
-#if 0
     [[DDHotKeyCenter sharedHotKeyCenter] unregisterHotKeyWithKeyCode:kVK_ANSI_Equal
                                                        modifierFlags:NSEventModifierFlagControl];
-#endif
 }
 
 @end

InjectionIII/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2</string>
 	<key>CFBundleVersion</key>
-	<string>1335</string>
+	<string>1355</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

InjectionIII/InjectionServer.h

@@ -14,6 +14,7 @@
 @interface InjectionServer : SimpleSocket
 
 - (void)setProject:(NSString *)project;
+- (void)injectPending;
 
 @end
 

InjectionIII/InjectionServer.mm

@@ -27,6 +27,7 @@
 @implementation InjectionServer {
     void (^injector)(NSArray *changed);
     FileWatcher *fileWatcher;
+    NSMutableArray *pending;
 }
 
 + (int)error:(NSString *)message {
@@ -111,6 +112,7 @@ - (void)runInBackground {
 
     [appDelegate setMenuIcon:@"InjectionOK"];
     appDelegate.lastConnection = self;
+    pending = [NSMutableArray new];
 
     auto inject = ^(NSString *swiftSource) {
         NSControlStateValue watcherState = appDelegate.enableWatcher.state;
@@ -157,7 +159,6 @@ - (void)runInBackground {
     NSMutableDictionary<NSString *, NSArray *> *testCache = [NSMutableDictionary new];
 
     injector = ^(NSArray *changed) {
-        NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
         NSMutableArray *changedFiles = [NSMutableArray arrayWithArray:changed];
 
         if ([[NSUserDefaults standardUserDefaults] boolForKey:UserDefaultsTDDEnabled]) {
@@ -170,11 +171,16 @@ - (void)runInBackground {
             }
         }
 
+        NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
         for (NSString *swiftSource in changedFiles)
-            if (now > lastInjected[swiftSource].doubleValue + MIN_INJECTION_INTERVAL && now > pause) {
-                lastInjected[swiftSource] = [NSNumber numberWithDouble:now];
-                inject(swiftSource);
-            }
+            if (![pending containsObject:swiftSource])
+                if (now > lastInjected[swiftSource].doubleValue + MIN_INJECTION_INTERVAL && now > pause) {
+                    lastInjected[swiftSource] = [NSNumber numberWithDouble:now];
+                    [pending addObject:swiftSource];
+                }
+
+        if (appDelegate.enableWatcher.state == NSControlStateValueOn)
+            [self injectPending];
     };
 
     [self setProject:projectFile];
@@ -217,6 +223,14 @@ - (void)runInBackground {
     [appDelegate setMenuIcon:@"InjectionIdle"];
 }
 
+- (void)injectPending {
+    for (NSString *swiftSource in pending)
+        dispatch_async(injectionQueue, ^{
+            [self writeCommand:InjectionInject withString:swiftSource];
+        });
+    [pending removeAllObjects];
+}
+
 - (void)setProject:(NSString *)project {
     if (!injector) return;
     [self writeCommand:InjectionProject withString:project];