Fix #18

Author: kimbtech

core/CLI.php

@@ -132,7 +132,7 @@ private function overview(){
 					),
 					array(
 						'' => 'Worked until now',
-						'Value' => Stats::secToTime($current->getValue(['lastopend']) - $current->getValue(['begin']))
+						'Value' => Time::secToTime($current->getValue(['lastopend']) - $current->getValue(['begin']))
 					)
 				));
 			}

core/Settings.php

@@ -159,7 +159,7 @@ private function edit(array $commands) : void {
 							array(
 								'Name:     ' . CLIOutput::colorString( $s->getValue([$id, 'name']), CLIOutput::YELLOW),
 								'Category: ' . CLIOutput::colorString( $s->getValue([$id, 'category']), CLIOutput::YELLOW),
-								'Duration: ' . CLIOutput::colorString( Stats::secToTime( $s->getValue([$id, 'end']) - $s->getValue([$id, 'begin']) ) , CLIOutput::YELLOW),
+								'Duration: ' . CLIOutput::colorString( Time::secToTime( $s->getValue([$id, 'end']) - $s->getValue([$id, 'begin']) ) , CLIOutput::YELLOW),
 							)
 						), null, 1);
 						$this->editSingle($id, $s);
@@ -171,7 +171,7 @@ private function edit(array $commands) : void {
 							'ID' => strval($id),
 							'Name' => $d['name'],
 							'Category' => $d['category'],
-							'Duration' => Stats::secToTime( $d['end'] - $d['begin'] )
+							'Duration' => Time::secToTime( $d['end'] - $d['begin'] )
 						);
 					}
 					$this->output->table($list);

core/Stats.php

@@ -220,7 +220,7 @@ private function printDataset(array $data) : void {
 		);
 
 		foreach( $table as &$d ){
-			$d['Time'] = self::secToTime($d['Time']);
+			$d['Time'] = Time::secToTime($d['Time']);
 		}
 
 		$this->output->table($table);
@@ -232,20 +232,7 @@ private function printDataset(array $data) : void {
 		ExtensionEventHandler::statsViewed($data, $this->output);
 	}
 
-	public static function secToTime(int $t) : string {
-		return str_pad(
-				($t >= 3600 ? intval($t/3600) . 'h ' : '' ) .
-				str_pad(
-					intval(($t % 3600) / 60) . 'm',
-					3,
-					" ",
-					STR_PAD_LEFT
-				),
-				8,
-				" ",
-				STR_PAD_LEFT
-			);
-	}
+	
 
 	private function printTodayView(array $data) : void {
 		array_multisort(
@@ -275,7 +262,7 @@ private function printTodayView(array $data) : void {
 		}
 
 		foreach( $table as &$d ){
-			$d['Time'] = self::secToTime($d['Time']);
+			$d['Time'] = Time::secToTime($d['Time']);
 		}
 
 		$this->output->table($table);

core/Time.php

@@ -0,0 +1,86 @@
+<?php
+class Time {
+
+	private const DEFAULT_FORMAT = 'dhm|s';
+	private const ALLOWED_PARTS = array(
+			'd' => 24*60*60,
+			'h' => 60*60,
+			'm' => 60, 
+			's' => 1
+		);
+	private const DELIMITER = '|';
+	private const PAD_VALUE = 4;
+
+	private static ?Time $time = null;
+	private string $timeformat = "";
+	
+	public function __construct() {
+		// write to config
+		$r = Config::getStorageReader('config');
+		if( !$r->isValue(['timeformat']) ){
+			$r->setValue(['timeformat'], self::DEFAULT_FORMAT );
+		}
+		$this->timeformat = $r->getValue(['timeformat']);
+
+		// check syntax
+		$ok = true;
+		foreach(str_split($this->timeformat) as $char){
+			if( !in_array($char, array_keys(self::ALLOWED_PARTS), true) && $char !== self::DELIMITER ){
+				$ok = false;
+			}
+		}
+		$ok = $ok &&
+			$this->timeformat[0] !== self::DELIMITER && 
+			substr($this->timeformat, -1) !== self::DELIMITER &&
+			str_replace('||', '', $this->timeformat) === $this->timeformat;
+
+		if(!$ok){
+			$this->timeformat =  self::DEFAULT_FORMAT;
+			echo "ERROR: Invalid timeformat in config.json" . PHP_EOL;
+		}
+
+		// calculate pad 
+		$this->padResult = self::PAD_VALUE * max(array_map( 'strlen', explode(self::DELIMITER, $this->timeformat)));
+	}
+
+	private function formatTime(int $time, string $format) : array {
+		$d = array();
+		$notEmpty = false;
+		foreach( str_split($format) as $k => $f ){
+			$c = intval($time / self::ALLOWED_PARTS[$f]);
+			if( $c > 0 || $notEmpty){
+				$d[$f] = $c; 
+				$time = intval($time % self::ALLOWED_PARTS[$f]);
+				$notEmpty = true;
+			}
+		}
+		return $d;
+	}
+
+	private function formatAsString(array $duration){
+		$s = "";
+		foreach( $duration as $name => $value){
+			$s .= str_pad( " " . $value . $name, self::PAD_VALUE, " ", STR_PAD_LEFT);
+		}
+		return str_pad( $s, $this->padResult, " ", STR_PAD_LEFT);
+	}
+
+	private function getDurationString(int $t) : string {
+		foreach(explode(self::DELIMITER, $this->timeformat) as $format){
+			$v = $this->formatTime($t, $format);
+			//print_r($v);
+			if( array_sum($v) > 0 ){
+				return $this->formatAsString($v);
+			}
+		}
+		return str_pad( "0", $this->padResult, " ", STR_PAD_LEFT);
+	}
+
+	public static function secToTime(int $t) : string {
+		if(self::$time === null){
+			self::$time = new Time();
+		}
+		return self::$time->getDurationString($t);
+	}
+}
+?>

extensions/statsSum/index.php

@@ -24,13 +24,13 @@ public static function statsViewed(array $data, \CLIOutput $output) : void {
 		foreach( $sums as $k => $s ){
 			$tab[] = array(
 				'Category' => $k,
-				'Sum' => \Stats::secToTime($s)
+				'Sum' => \Time::secToTime($s)
 			);
 		}
 
 		$output->table($tab);
 		$output->print(array(
-			'Total sum: ' . trim(\Stats::secToTime(array_sum($sums)))
+			'Total sum: ' . trim(\Time::secToTime(array_sum($sums)))
 		), \CLIOutput::RED);
 	}
 }