Sync. Edits and Merges

Author: kimbtech

README.md

@@ -96,10 +96,6 @@ Next the client will ask for a name, this name has to be unique for
 each device and will be shown in the stats view of the other devices.
 `ttt conf sync directory` has to be run on each device.
 
-> Merges and edits of tasks will not be synchronized.  
-> Edits and merges affecting the current day will be synchronized 
-> only when completing another task on this day.
-
 ## Setup
 The tool supports Linux (like Ubuntu, Linux Mint), macOS and Windows.
 We have tested it under Linux Mint 18, macOS Catalina and Windows 10.

core/Recorder.php

@@ -80,13 +80,7 @@ private function saveTaskTime(JSONReader $r) : void {
 			"category" => $r->getValue(['category'])
 		));
 		// also save to sync
-		$c = Config::getStorageReader('config');
-		if( $c->isValue(['sync', 'directory']) ){
-			(new DirectoryStatsAccess())->setDayTasks($data->getArray());
-		}
-		if( $c->isValue(['sync', 'server']) ){
-			(new ServerStatsAccess())->setDayTasks($data->getArray());
-		}
+		StatsLoader::saveDayTasks( $data->getArray() );
 
 		$this->dialog->setLastTask(
 			$r->getValue(['name']),

core/Settings.php

@@ -177,6 +177,8 @@ private function edit(array $commands) : void {
 				}
 				while( $s->isValue([$id]) );
 				$this->output->print(array("Exit!"), CLIOutput::YELLOW, 1);
+
+				StatsLoader::saveDayTasks( $s->getArray() );				
 			}
 			else{
 				$this->output->print(array(array(

core/StatsData.php

@@ -63,11 +63,16 @@ public function merge($merge, $mergeTo) : bool {
 		$ret = true;
 		foreach( $this->loader->getLocalFilelist() as $f ){
 			$r = Config::getStorageReader(substr($f, 0, -5));
+			$rUnchanged = true;
 			foreach( $r->getArray() as $k => $a ){
 				if( $a['name'] === $merge ){
 					$ret &= $r->setValue([$k, 'name'], $mergeTo);
+					$rUnchanged = false;
 				}
 			}
+			if(!$rUnchanged){
+				StatsLoader::saveDayTasks( $r->getArray() );
+			}
 			unset($r);
 		}
 

core/Utilities.php

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

core/sync/StatsLoader.php

@@ -75,4 +75,14 @@ public function getContents() : array {
 		}
 		return $dataset;
 	}
+
+	public static function saveDayTasks(array $array ) : void {
+		$c = Config::getStorageReader('config');
+		if( $c->isValue(['sync', 'directory']) ){
+			(new DirectoryStatsAccess())->setDayTasks($array);
+		}
+		if( $c->isValue(['sync', 'server']) ){
+			(new ServerStatsAccess())->setDayTasks($array);
+		}
+	}
 }