Get additional time for last task (don't give name in dialog and write e.g. +5m as time)

Author: kimbtech

core/InputParser.php

@@ -1,7 +1,7 @@
 <?php
 class InputParser {
 
-	private const TIME_INPUT_PREG = '/^(((\d+h)?(\d+m)?)|(\d+:\d+))$/';
+	private const TIME_INPUT_PREG = '/^((\+?(\d+h)?(\d+m)?)|(\d+:\d+))$/';
 
 	private const CATEGORY_INPUT_PREG = '/^[A-Za-z\-]+$/';
 

core/Recorder.php

@@ -75,6 +75,11 @@ private function saveTaskTime(JSONReader $r) : void {
 			"name" => $r->getValue(['name']),
 			"category" => $r->getValue(['category'])
 		));
+		$this->dialog->setLastTask(
+			$r->getValue(['name']),
+			in_array($r->getValue(['category']), StatsData::getAllCategories()) ?
+				array_search($r->getValue(['category']), StatsData::getAllCategories()) : null
+		);
 	}
 
 	private function recordNew(JSONReader $r) : void {

core/Utilities.php

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

core/platform/Dialog.php

@@ -21,6 +21,16 @@ abstract class Dialog {
 	protected ?string $chTime = null;
 	protected bool $shortBreak = false;
 
+	/**
+	 * Set the last tasks name and category
+	 * 	User can enter +5m to get five minutes more
+	 * 	for last task.
+	 */
+	public function setLastTask(?string $name, ?int $category){
+		$this->chName = $name;
+		$this->chCategory = $category;
+	}
+
 	/**
 	 * Set an array of available categories [ID => CatName, ...]
 	 * 	No short break now, will be set in open().

core/platform/InTerminalDialog.php

@@ -30,14 +30,14 @@ public function open() : void {
 		echo "Give a name for the task:" . PHP_EOL;
 		do {
 			$name = readline("Name: ");
-		} while( empty($name) );
+		} while( !InputParser::checkNameInput($name) );
 		$this->chName = $name;
 
 		echo "-----------------------------------" . PHP_EOL;
 		echo "Give a time limit for the task:" . PHP_EOL;
 		do {
 			$time = readline("Time: ");
-		} while( !InputParser::checkTimeInput($time) );
+		} while( !InputParser::checkTimeInput($time) || strpos($time, '+') !== false );
 		$this->chTime = $time;
 
 		echo "===================================" . PHP_EOL;

core/platform/LinuxDialog.php

@@ -35,11 +35,20 @@ public function open() : void {
 				$this->open();
 				return;
 			}
-			
-			$this->chCategory = in_array($stdout[0], $this->categories) ? array_search($stdout[0], $this->categories) : null; // category id
-			$this->chName = InputParser::checkNameInput($stdout[1]) ? $stdout[1] : null;
-			$this->chTime = InputParser::checkTimeInput($stdout[2]) ? $stdout[2] : null;
 
+			// additional time?
+			$timelist = array_values(array_filter($stdout, function ($v){
+				return InputParser::checkTimeInput($v);
+			}));
+			if( count($timelist) === 1 && strpos($timelist[0], '+' ) !== false ){
+				$this->chTime = $timelist[0];
+			}
+			else{
+				$this->chCategory = in_array($stdout[0], $this->categories) ? array_search($stdout[0], $this->categories) : null; // category id
+				$this->chName = InputParser::checkNameInput($stdout[1]) ? $stdout[1] : null;
+				$this->chTime = InputParser::checkTimeInput($stdout[2]) ? $stdout[2] : null;
+			}
+			
 			if( is_null($this->chCategory) || is_null( $this->chTime ) || is_null($this->chName)){
 				$this->open();
 				return;

core/platform/MacDialog.php

@@ -21,8 +21,10 @@ public function open() : void {
 				$this->shortBreak = true;
 			}
 			else{
-				$this->chCategory = in_array($stdout['cat'], $this->categories) ? array_search($stdout['cat'], $this->categories) : null; // category id
-				$this->chName = InputParser::checkNameInput($stdout['name']) ? $stdout['name'] : null;
+				if( strpos($stdout['time'], '+' ) === false ){ // not additional time for last task/ else values are set
+					$this->chCategory = in_array($stdout['cat'], $this->categories) ? array_search($stdout['cat'], $this->categories) : null; // category id
+					$this->chName = InputParser::checkNameInput($stdout['name']) ? $stdout['name'] : null;
+				}
 				$this->chTime = InputParser::checkTimeInput($stdout['time']) ? $stdout['time'] : null;
 
 				if( is_null($this->chCategory) || is_null( $this->chTime ) || is_null($this->chName)){

core/platform/WindowsDialog.php

@@ -24,8 +24,10 @@ public function open() : void {
 				$this->shortBreak = true;
 			}
 			else{
-				$this->chCategory = in_array($stdout['cat'], $this->categories) ? array_search($stdout['cat'], $this->categories) : null; // category id
-				$this->chName = InputParser::checkNameInput($stdout['name']) ? $stdout['name'] : null;
+				if( strpos($stdout['time'], '+' ) === false ){ // not additional time for last task/ else values are set
+					$this->chCategory = in_array($stdout['cat'], $this->categories) ? array_search($stdout['cat'], $this->categories) : null; // category id
+					$this->chName = InputParser::checkNameInput($stdout['name']) ? $stdout['name'] : null;
+				}
 				$this->chTime = InputParser::checkTimeInput($stdout['time']) ? $stdout['time'] : null;
 
 				if( is_null($this->chCategory) || is_null( $this->chTime ) || is_null($this->chName)){