MacDialog chnages like Linux

Author: kimbtech

core/Recorder.php

@@ -1,7 +1,8 @@
 <?php
 class Recorder {
 
-	const PID_FILE = '/run/lock/TaskTimeTerminate';
+	const PID_FILE_LINUX = '/run/lock/TaskTimeTerminate';
+	const PID_FILE_MAC = '/private/tmp/TaskTimeTerminate';
 
 	public Dialog $dialog;
 
@@ -95,27 +96,28 @@ private function recordNew(JSONReader $r) : void {
 	}
 
 	public static function runOnlyOnce() : void {
-		if( Utilities::getOS() === Utilities::OS_LINUX ){
+		if( Utilities::getOS() === Utilities::OS_LINUX || Utilities::getOS() === Utilities::OS_MAC ){
+			$osPidFile = Utilities::getOS() === Utilities::OS_LINUX ? self::PID_FILE_LINUX : self::PID_FILE_MAC;
 			$pid = getmypid();
 			if( $pid !== false ){
 				// check if other running
-				if( is_file( self::PID_FILE ) ){
-					$otherPid = file_get_contents(self::PID_FILE);
+				if( is_file( $osPidFile ) ){
+					$otherPid = file_get_contents($osPidFile);
 					if( is_numeric($otherPid) ){
 						if( !posix_kill( intval($otherPid), SIGQUIT ) ){
 							posix_kill( intval($otherPid), SIGKILL );
 						}
 					}
 				}
 				// set yourself running
-				file_put_contents( self::PID_FILE, $pid, LOCK_EX );
+				file_put_contents( $osPidFile, $pid, LOCK_EX );
 
 				// delete run file on exit
-				register_shutdown_function( function ($pid) {
-					if( is_file( self::PID_FILE ) && file_get_contents(self::PID_FILE) == $pid ){
-						unlink(self::PID_FILE);
+				register_shutdown_function( function ($pid, $osPidFile) {
+					if( is_file( $osPidFile ) && file_get_contents($osPidFile) == $pid ){
+						unlink($osPidFile);
 					}
-				}, $pid);
+				}, $pid, $osPidFile);
 			}
 		}
 	}

core/Utilities.php

@@ -4,7 +4,7 @@
  */
 class Utilities {
 
-	const VERSION = 'v0.8.1 alpha';
+	const VERSION = 'v0.8.2 alpha';
 
 	/**
 	 * OS Consts

core/platform/MacDialog.php

@@ -10,10 +10,12 @@ public function open() : void {
 			'-cats',
 			'"'. implode(',', $this->categories) .'"'
 		);
-		exec(implode(' ', $cmd), $stdout, $return);
+		$handle = popen(implode(' ', $cmd), 'r');
+		$stdout = fgets($handle);
+		pclose($handle);
 
-		if( $return === 0 && !empty($stdout) ){
-			$stdout = json_decode($stdout[0], true);
+		if( !empty($stdout) ){
+			$stdout = json_decode(trim($stdout), true);
 
 			if( $stdout['pause'] ){
 				$this->shortBreak = true;

core/platform/macos/TaskTimeTerminate.app/Contents/MacOS/TaskTimeTerminate

@@ -6,19 +6,19 @@
 	<dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		DiSUbmXvQvqY7x2/oE96H2NEtUw=
+		e18yfL9mWFXba/Nk6jOoFUizYxU=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		IQsFH80gY6fBchH0ef9VMMLdZUk=
+		tKB3zm0oh092IIKVC3Griz18ELI=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		f+UKI1tIL0DBtbFgZJg1asfp4pY=
+		m4BjeFcFksMYrmZcmCXz+4nzRFI=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
-		RQhhd8f6VNGPeZ//rXqtwUIL+Jo=
+		ait94q3Y199A/Y3/71T9WhYNvaQ=
 		</data>
 		<key>Resources/en.lproj/Main.strings</key>
 		<dict>
@@ -36,28 +36,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			fdTh9cwTl5YcU1c3bL4sqi1dUzrpHagjFZzlRzmAv7s=
+			qugeW59zcSFxOuxVdS9d7wiuOmkgOkyELumX0/qY7qs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			2sHlhd/y5zaoN304U/77mvq4CKxgomuu3ZmquXYFMZ8=
+			HhsQHpomDddTuX/KNf9U3lCGB6JTz6JyJvVT17jf534=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			w2aeIh12aIFgj58/49oNDNHmnQLt1r4ysmnx8sQ8dJI=
+			0gI4orTZXo+QU82I7RhehE/rTe1r3ql3zp8AIg8xy4w=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			6QebTVxtaLwhGPCIsNq8mM2tb4VwOe0KFKestIphND0=
+			WNUjdwKoG+2YblGRy/ULWQxgeN4ihtPFQw06ciX0DQo=
 			</data>
 		</dict>
 		<key>Resources/en.lproj/Main.strings</key>

core/platform/macos/TaskTimeTerminate.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist

@@ -16,12 +16,4 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationWillTerminate(_ aNotification: Notification) {
     }
-    
-    private func tapplicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-        return true;
-    }
-    
-    func windowShouldClose(_ sender: Any) {
-        NSApplication.shared.terminate(self)
-    }
 }