Fixes #13 && Better Extension CLI Interface

Author: kimbtech

core/CLIParser.php

@@ -3,6 +3,7 @@ class CLIParser {
 
 	private array $args = array();
 	private bool $empty = true;
+	private array $plainArgs = array();
 
 	const TASK_VERSION = 'v', TASK_HELP = 'h', TASK_STATS = 's',
 		TASK_SETTINGS = 'p', TASK_RECORD = 'r', TASK_PAUSE = 'e',
@@ -19,6 +20,7 @@ class CLIParser {
 	);
 
 	public function __construct(int $argc, array $argv) {
+		$this->plainArgs = $argv;
 		if( $argc > 0){
 			$this->args = array_slice($argv, 1);
 			$this->args = array_map('trim', $this->args);
@@ -73,5 +75,9 @@ public function getCommands() : array {
 		}
 		return array('');
 	}
+
+	public function getPlainArgs() : array {
+		return $this->plainArgs;
+	}
 }
 ?>

core/ExtensionEventHandler.php

@@ -35,7 +35,20 @@ public static function loadExtension( string $name, array $events , string $file
 
 	public static function cli( string $name, CLIParser $parser, CLIOutput $output, string $callback ) : void {
 		self::ensureExtensionLoaded($name);
-		$callback($parser, $output);
+		if($parser->getTask() !== CLIParser::TASK_EXTENSION){
+			// shortcut used, we will reconstruct full parser (tasks/ commands)!!
+			$oldArgs = $parser->getPlainArgs();
+			$newArgs = array_merge(array(
+				$oldArgs[0],
+				CLIParser::TASK_EXTENSION,
+				$name
+			), array_slice($oldArgs, 2));
+			$p = new CLIParser(count($newArgs), $newArgs );
+		}
+		else{
+			$p = $parser;
+		}
+		$callback($p, $output);
 	}
 
 	private static function event( string $event, ...$args ) : void {

core/Utilities.php

@@ -4,7 +4,7 @@
  */
 class Utilities {
 
-	const VERSION = 'v0.9.7 beta';
+	const VERSION = 'v0.9.8 beta';
 
 	/**
 	 * OS Consts

extensions/milog/index.php

@@ -7,11 +7,15 @@ class MiLog {
 	private static array $data;
 
 	public static function cli( \CLIParser $parser, \CLIOutput $output ) : void {
+		$newArgs = $parser->getCommands();
+		array_unshift( $newArgs, \CLIParser::TASK_STATS );
+		$p = new \CLIParser(count($newArgs), $newArgs);
+		
 		self::$isMiLogOutput = true;
 		\ob_start();
 
 		$o = new \CLIOutput();
-		$s = new \Stats($parser, $o);
+		$s = new \Stats($p, $o);
 		$o->__destruct();
 		unset($o);
 
@@ -21,7 +25,9 @@ public static function cli( \CLIParser $parser, \CLIOutput $output ) : void {
 		$output->print(
 			array('MiLog',
 				array(
-					'Please give the same commands to filter data as used in the statistics view.',
+					'Please give the same commands to filter data as used in the statistics view, e.g.',
+					\CLIOutput::colorString('ttt ext milog week -cats "Hobby"', \CLIOutput::BLUE),
+					\CLIOutput::colorString('ttt ml all', \CLIOutput::BLUE),
 			)
 		));