Stats view days order && Validate synced data

Author: kimbtech

core/Stats.php

@@ -160,6 +160,11 @@ private function backUntil(int $timestamp, array $f, int $forwardTo = StatsData:
 	}
 
 	private function printDataset(array $data) : void {
+		array_multisort( // sort multiple days (s.t. latest days are first)
+			array_column( $data, 'begin' ), SORT_DESC,
+			$data
+		);
+
 		$noExternalDevice = true;
 		$combi = array();
 		foreach( $data as $d ){
@@ -196,7 +201,7 @@ private function printDataset(array $data) : void {
 					'Name' => $d['name'],
 					'Time' => $d['duration'],
 					'Work Items' => str_pad($d['times'], 4, " ", STR_PAD_LEFT),
-					'Days' => implode(', ', array_slice(array_reverse($d['days']), 0, self::DAYS_MAXCOUNT))
+					'Days' => implode(', ', array_slice($d['days'], 0, self::DAYS_MAXCOUNT))
 						. (count($d['days']) > self::DAYS_MAXCOUNT ? ', ...' : '' )
 				),
 				$noExternalDevice ? array() : array(

core/sync/DirectoryStatsAccess.php

@@ -13,7 +13,7 @@ public function __construct(){
 		$this->thisClientName = $c->getValue(['sync', 'directory', 'thisname']);
 	}
 
-	public function listFiles() : array {
+	protected function listFilesUnfiltered() : array {
 		$files = array();
 		foreach(array_diff(scandir($this->directory), ['.','..']) as $dir ){
 			if( $dir !== $this->thisClientName && is_dir($this->directory . '/' . $dir) ){
@@ -39,7 +39,7 @@ function ($f) {
 		return $files;
 	}
 
-	public function getFile( string $file, string $device ) : array {
+	protected function getFileUnfiltered( string $file, string $device ) : array {
 		return json_decode(file_get_contents( $this->directory . '/' . $device . '/' . $file ), true);
 	}
 

core/sync/LocalStatsAccess.php

@@ -2,7 +2,7 @@
 
 class LocalStatsAccess extends StatsAccess {
 
-	public function listFiles() : array {
+	protected function listFilesUnfiltered() : array {
 		return array_map( function ($f) {
 			return array(
 					'timestamp' => strtotime(substr($f, 0, -5)),
@@ -16,7 +16,7 @@ public function listFiles() : array {
 		);
 	}
 
-	public function getFile( string $file, string $device ) : array {
+	protected function getFileUnfiltered( string $file, string $device ) : array {
 		return Config::getStorageReader(substr($file, 0, -5))->getArray();
 	}
 

core/sync/ServerStatsAccess.php

@@ -48,11 +48,11 @@ private function postToServer(string $endpoint, array $data = array() ) : array
 			return array();
 	}
 
-	public function listFiles() : array {
+	protected function listFilesUnfiltered() : array {
 		return $this->postToServer('list');
 	}
 
-	public function getFile( string $file, string $device ) : array {
+	protected function getFileUnfiltered( string $file, string $device ) : array {
 		return $this->postToServer(
 			'get',
 			array(

core/sync/StatsAccess.php

@@ -12,22 +12,65 @@ abstract class StatsAccess {
 	 * 
 	 * Must not return stats of the client itself!
 	 */
-	abstract public function listFiles() : array;
+	public function listFiles() : array {
+		return $this->filterFileList($this->listFilesUnfiltered());
+	}
+	abstract protected function listFilesUnfiltered() : array;
 
 	/**
-	 * return array like JSON in 2020-02-12.json
+	 * return array like JSON in e.g. "2020-02-12.json"
 	 */
-	abstract public function getFile( string $file, string $device ) : array;
+	public function getFile( string $file, string $device ) : array {
+		return $this->filterFileArray($this->getFileUnfiltered($file, $device));
+	}
+	abstract protected function getFileUnfiltered( string $file, string $device ) : array;
 
+	/**
+	 * Copy initial files to the sync
+	 */
 	abstract public function initialSync() : bool;
 
+	/**
+	 * Set a array of daily task 
+	 * (will use last tasks timestamp to calculate day)
+	 */
 	abstract public function setDayTasks(array $tasks) : void;
 
+	/**
+	 * Get a list of all local files to sync on init of a sync
+	 */
 	protected function filesToSyncInitially() : array {
 		return array_values(array_filter(scandir( Config::getStorageDir() ), function ($f) {
 			return preg_match(self::FILENAME_PREG, $f) === 1
 				&& date('Y-m-d') !== substr($f, 0, -5);
 		}));
 	}
+
+	/**
+	 * Check format of a one days task array from server/ directory
+	 * @return the filtered $array, or array() 
+	 */
+	private function filterFileArray(array $array) : array {
+		return array_values(array_filter( $array, function ($a) {
+			return isset($a['begin']) && isset($a['end']) && isset($a['name']) && isset($a['category'])
+				&& is_int($a['begin']) && $a['begin'] > 0
+				&& is_int($a['end']) && $a['end'] > 0
+				&& InputParser::checkNameInput( $a['name'] )
+				&& InputParser::checkCategoryInput( $a['category'] );
+		}));
+	}
+
+	/**
+	 * Check format of a file list array from server/ directory
+	 * @return the filtered $array, or array() 
+	 */
+	private function filterFileList(array $array) : array {
+		return array_values(array_filter( $array, function ($a) {
+			return isset($a['timestamp']) && isset($a['file']) && isset($a['device'])
+				&& is_int($a['timestamp']) && $a['timestamp'] > 0
+				&& preg_match(self::FILENAME_PREG, $a['file']) === 1
+				&& ($a['device'] === '' || InputParser::checkDeviceName( $a['device'] ));
+		}));
+	}
 }
 ?>