1.3.3 (022F)

Changes: * Fixed time preset bug in issue #3 * Added applescript command for activating RF with duration.
pkrll · Nov 2, 2015 · b9ff04e · b9ff04e
1 parent ab77b93
commit b9ff04e
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 13 deletions.
diff --git a/RocketFuel/AppDelegate.h b/RocketFuel/AppDelegate.h
@@ -1,13 +1,14 @@
 /*!
  *  @class AppDelegate
  *  @brief The Application Delegate.
- *  @version 1.1.0
+ *  @version 1.1.1
  *  @author Ardalan Samimi
  *  @copyright Saturn Five
  */
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
 - (NSNumber *)isActive;
 - (void)toggleRocketFuel;
+- (void)activateWithDuration:(NSInteger)duration;
 
 @end
diff --git a/RocketFuel/AppDelegate.m b/RocketFuel/AppDelegate.m
@@ -45,6 +45,14 @@ - (void)toggleRocketFuel {
     }
 }
 
+- (void)activateWithDuration:(NSInteger)duration {
+    if (!_statusItemController) {
+        [self loadStatusItemController];
+    }
+
+    [self.statusItemController requestActivationForDuration:duration];
+}
+
 - (NSNumber *)isActive {
     BOOL state = self.statusItemController.isActive;
     return [NSNumber numberWithBool:state];

diff --git a/RocketFuel/Info.plist b/RocketFuel/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>RkFl</string>
 	<key>CFBundleVersion</key>
-	<string>020F</string>
+	<string>022F</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

diff --git a/RocketFuel/RFAppleScript.h b/RocketFuel/RFAppleScript.h
@@ -1,7 +1,7 @@
 /*!
  *  @class RFAppleScript
  *  @brief This class adds ability to receive commands from an Apple Script.
- *  @version 1.0.0
+ *  @version 1.0.1
  *  @author Ardalan Samimi
  *  @copyright Saturn Five
  */

diff --git a/RocketFuel/RFAppleScript.m b/RocketFuel/RFAppleScript.m
@@ -16,6 +16,16 @@ - (void)toggle {
     [appDelegate toggleRocketFuel];
 }
 
+- (void)duration {
+    NSInteger duration = [self.directParameter integerValue];
+    if (!duration) {
+        duration = 1;
+    }
+
+    AppDelegate *appDelegate = NSApplication.sharedApplication.delegate;
+    [appDelegate activateWithDuration:duration];
+}
+
 - (id)performDefaultImplementation {
     SEL commandName = NSSelectorFromString(self.commandDescription.commandName);
     // Was it a valid command?
@@ -25,6 +35,8 @@ - (id)performDefaultImplementation {
         func(self, commandName);
     }
 
+
+
     return NO;
 }
 

diff --git a/RocketFuel/RFStatusItemController.h b/RocketFuel/RFStatusItemController.h
@@ -1,13 +1,14 @@
 /*!
  *  @class Status Item Controller
  *  @brief Manages the status item and the menu.
- *  @version 2.2.0
+ *  @version 2.3.0
  *  @author Ardalan Samimi
  *  @copyright Saturn Five
  */
 @interface RFStatusItemController : NSObject
 
 @property (nonatomic, readonly, getter = isActive) BOOL active;
+- (void)requestActivationForDuration:(NSInteger)duration;
 - (void)requestActivation;
 - (void)requestTermination;
 

diff --git a/RocketFuel/RFStatusItemController.m b/RocketFuel/RFStatusItemController.m
@@ -212,6 +212,11 @@ - (void)requestActivation {
     [self.rocketFuel toggleSleepMode];
 }
 
+- (void)requestActivationForDuration:(NSInteger)duration {
+    duration = duration * 60;
+    [self.rocketFuel activateWithDuration:duration];
+}
+
 #pragma mark MISC METHODS
 
 - (BOOL)isMenuDark {

diff --git a/RocketFuel/RocketFuel.h b/RocketFuel/RocketFuel.h
@@ -9,7 +9,7 @@
 /*!
  *  @class RocketFuel
  *  @brief The RocketFuel Object.
- *  @version 1.2.0
+ *  @version 1.3.0
  *  @author Ardalan Samimi
  *  @copyright Saturn Five
  */

diff --git a/RocketFuel/RocketFuel.m b/RocketFuel/RocketFuel.m
@@ -13,6 +13,7 @@ @interface RocketFuel ()
 @property (nonatomic) NSTask *task;
 @property (nonatomic) NSString *path;
 @property (nonatomic) NSArray *arguments;
+@property (nonatomic, getter = shouldRelaunch) BOOL relaunch;
 
 @end
 
@@ -36,28 +37,34 @@ - (void)toggleSleepMode {
     if (_task) {
         [self terminate];
     } else {
-        [self launch];
+        [self activate];
     }
 }
 
-- (void)launch {
+- (void)activate {
     [self task];
     __weak typeof(self) weakSelf = self;
     [_task setTerminationHandler:^(NSTask * _Nonnull task) {
         [weakSelf postTerminationCleanup];
+        if (weakSelf.shouldRelaunch) {
+            [weakSelf activate];
+            weakSelf.relaunch = NO;
+        }
     }];
 }
 
 - (void)activateWithDuration:(NSInteger)duration {
     self.duration = duration;
+    self.relaunch = YES;
+
     if (_task) {
         [self terminate];
         // Make sure the post termination cleanup method is called.
         // Termination handler of NSTask does not always do that.
         [self postTerminationCleanup];
+    } else {
+        [self activate];
     }
-
-    [self launch];
 }
 
 - (void)terminate {
@@ -69,9 +76,11 @@ - (void)terminate {
 }
 
 - (void)postTerminationCleanup {
-    _task = nil;
-    _arguments = nil;
-    self.active = self.isActive;
+    if (_task) {
+        _task = nil;
+        _arguments = nil;
+        self.active = self.isActive;
+    }
 }
 
 - (BOOL)active {

diff --git a/RocketFuel/RocketFuel.sdef b/RocketFuel/RocketFuel.sdef
@@ -11,5 +11,9 @@
         <command name="toggle" code="rkfltogl" description="Activate/deactivate Rocket Fuel.">
             <cocoa class="RFAppleScript"/>
         </command>
+        <command name="duration" code="rkfldura" description="Activate Rocket Fuel for a certain amount of time (in minutes).">
+            <cocoa class="RFAppleScript"/>
+            <direct-parameter name="minutes" description="Amount of time in minutes Rocket Fuel should stay active. Defaults to 1 if no argument is given." code="rkfldupa" type="text"></direct-parameter>
+        </command>
     </suite>
 </dictionary>