Fix #1

Author: kimbtech

core/Config.php

@@ -78,6 +78,7 @@ public static function getStorageDir() : string {
 
 	public static function getRecordStatus() : bool {
 		$c = self::getStorageReader('config');
+		ReaderManager::addReader($c);
 		if( !self::$statusSetup && !$c->isValue(['status']) ){
 			$s->setValue(['status'], true);
 			self::$statusSetup = true;

core/JSONReader.php

@@ -84,9 +84,6 @@ public function __construct( $filename, $lockex = false, $otherpath = ''){
 		if( is_file( $this->filepath ) && is_writeable( $this->filepath ) ){
 			$this->writeable = true;
 		}
-
-		// add to ReaderManager
-		ReaderManager::addReader($this);
 	}
 
 	/**

core/Recorder.php

@@ -29,6 +29,7 @@ public function __construct(bool $inTerminal = false) {
 
 	public function record(bool $forcenew = false) : void {
 		$r = Config::getStorageReader('current');
+		ReaderManager::addReader($r);
 		if( empty($r->getArray())){ // first start etc.
 			$r->setArray(array(
 				'name' => '',
@@ -64,6 +65,7 @@ private function saveTaskTime(JSONReader $r) : void {
 					is_int($r->getValue(['begin'])) ? $r->getValue(['begin']) : time()
 				)
 			);
+		ReaderManager::addReader($data);
 		$data->setValue([null], array(
 			"begin" => $r->getValue(['begin']),
 			"end" => $r->getValue(['lastopend']) + Config::getSleepTime(),

core/StatsData.php

@@ -73,18 +73,23 @@ public function getAllDatasets() : array {
 	}
 
 	public function merge($merge, $mergeTo) : bool {
-		$this->loadContents();
 		if( $merge === $mergeTo){
-			
-			/**
-			 * ToDo
-			 */
-			
 			return true;
 		}
 
+		$ret = true;
+		foreach( $this->filelist as $f ){
+			$r = Config::getStorageReader($f);
+			foreach( $r->getArray() as $k => $a ){
+				if( $a['name'] === $merge ){
+					$ret &= $r->setValue([$k, 'name'], $mergeTo);
+				}
+			}
+			unset($r);
+		}
+
 		$this->loadContents(true); //force reload
-		return false;
+		return $ret;
 	}
 }
 ?>

core/Utilities.php

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