Im- & Export CLI Promts

Author: kimbtech

README.md

@@ -52,23 +52,21 @@ to the server.
 
 ### Import to Server
 Create the the device for which the data should be imported and 
-remember its token. (The name of the device can only be set via the Webinterface).
+remember its token. (The name of the device can only be set once via the Webinterface).
 
-1. Open `./imexport/import.php`
-2. Fill in `Server URL, Account Name, Device Name, Device Token` between `APIClient( ... );` as stated in the file
-3. Change the `$sourcePath`, it has to be the directory containing the devices data (e.g. `2020-04-01.json`, `2020-04-03.json`, ...)
-4. Set the timezone `date_default_timezone_set( 'Europe/Berlin' );` (see https://www.php.net/manual/en/timezones.php for list of supported ones)
-4. Run `php ./imexport/import.php`
+1. Run `php ./imexport/import.php`
+2. Type credentials of device when prompted
+3. Fill in path to the directory containing the devices data (e.g. `2020-04-01.json`, `2020-04-03.json`, ...)
+4. Change the timezone, if you want (see https://www.php.net/manual/en/timezones.php for list of supported zones)
 5. The data for the device will be available in the Webinterface (and through the API).
 
 ### Export from Server
 One may use any device of an account.
 
-1. Open `./imexport/export.php`
-2. Fill in `Server URL, Account Name, Device Name, Device Token` between `APIClient( ... );` as stated in the file
-3. One may change the `$destPath`, it has to be any empty directory (or it will be created). 
-4. Run `php ./imexport/export.php`
-5. The data for all devices will show up in `$destPath`
+1. Run `php ./imexport/export.php`
+2. Type credentials of device when prompted
+3. Change the export directory if you want (it has to be any empty directory and it will be created if not exists). 
+4. The data for all devices will show up the directory
 
 ## Custom Graphs
 It is possible to create custom graph-views for the stats view.

imexport/api.php

@@ -3,6 +3,42 @@
 	die('Commandline only!');
 }
 
+function createAPIReadline() : APIClient {
+	$check = array(
+		'URI' => fn(string $u) => @filter_var($u, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED | FILTER_FLAG_SCHEME_REQUIRED),
+		'Group/ Username' => fn(string $g) => preg_match('/^[A-Za-z0-9]+$/', $g) === 1,
+		'Device' => fn(string $n) => preg_match( '/^[A-Za-z0-9\-]+$/', $n) === 1,
+		'Device Token' => fn(string $t) => preg_match('/^[A-Za-z0-9]+$/', $t) === 1
+	);
+	$tabs = array(
+		'URI' => 3,
+		'Group/ Username' => 1,
+		'Device' => 3,
+		'Device Token' => 2
+	);
+	$data = array();
+
+	echo "Please create a Device in the Webinterface, then fill in details:" . PHP_EOL;
+	foreach($check as $name => $checker ){
+		do {
+			$input = trim(readline($name. ':' . str_repeat("\t", $tabs[$name])));
+			if(empty($input) || !$checker($input) ){
+				echo "\tError invalid format!" . PHP_EOL;
+			}
+			else{
+				$data[$name] = $input;
+			}
+		} while( empty( $data[$name] ) );
+	}
+
+	return new APIClient(
+		$data['URI'],
+		$data['Group/ Username'],
+		$data['Device'],
+		$data['Device Token']
+	);
+}
+
 class APIClient {
 
 	private string $uri;
@@ -22,7 +58,7 @@ private function postToServer(string $endpoint, array $data = array()) : array {
 			'http' => array(
 				'method'  => 'POST',
 				'header'  => 'Content-Type: application/x-www-form-urlencoded',
-				//'ignore_errors' => true,
+				'ignore_errors' => true,
 				'content' => http_build_query(array(
 					'group' => $this->groupId,
 					'token' => $this->token,
@@ -51,8 +87,13 @@ private function postToServer(string $endpoint, array $data = array()) : array {
 		return array();
 	}
 
-	public function listFiles() : array {
-		return $this->postToServer('list');
+	public function listFiles(int $timeMin, int $timeMax) : array {
+		return $this->postToServer(
+			'list',
+			array(
+				'timeMin' => $timeMin,
+				'timeMax' => $timeMax
+			));
 	}
 
 	public function getFile( string $file, string $device ) : array {

imexport/export.php

@@ -4,29 +4,20 @@
 }
 require_once(__DIR__ . '/api.php');
 
-/**
- * LOGIN
- */
-$client = new APIClient(
-	"http://localhost:8080/", // Server URL
-	"admin", // Account/ Group Name
-	"test", // Device Name
-	"YvCSpXLZxpT0RPLI4yg6JIhSBKwILJ1vFqNILvf6luji7JrtUS" // Device Token
-);
-/**
- * SETTINGS
- */
+$client = createAPIReadline();
 $destPath = __DIR__ . '/exported/';
+echo PHP_EOL . 'Export will be written to "'. $destPath .'"' . PHP_EOL;
+$newPath = readline('Type other path to change or leave empty to use path above: ');
+if(!empty($newPath)){
+	$destPath = $newPath;
+}
 
-/**
- * TOOL
- */
 if(!is_dir($destPath)){
 	if(!mkdir($destPath, 0740, true)){
 		die('Error creating export path!');
 	}
 }
-foreach( $client->listFiles() as $f ){
+foreach( $client->listFiles(0, time()) as $f ){
 	$devicePath = $destPath . '/' . $f['device'] . '/';
 	if(!is_dir($devicePath)){
 		if(!mkdir($devicePath, 0740, true)){

imexport/import.php

@@ -4,24 +4,23 @@
 }
 require_once(__DIR__ . '/api.php');
 
-/**
- * LOGIN
- */
-$client = new APIClient(
-	"http://localhost:8080/", // Server URL
-	"admin", // API Username/ Group
-	"test", // API Device name
-	"9iTOiAj0nMnN0yxZvYf2bnt9vSlCPKKBb7U0f8chkcLnVCQPe3" // Token for device
-);
-/**
- * SETTINGS
- */
-$sourcePath = '/Users/me/Documents/TTTData/laptop/'; // data folder to import from
-date_default_timezone_set( 'Europe/Berlin' ); // timezone
+echo "Please make sure to use the right Device name, it can't be changed later!" . PHP_EOL;
+$client = createAPIReadline();
+
+echo PHP_EOL . 'Please give a directory where the JSON to import of the device are stored.' . PHP_EOL;
+do{
+	$sourcePath = readline('Type directory: ');
+} while( empty($sourcePath) || !is_dir($sourcePath));
+
+$timezone = 'Europe/Berlin';
+echo PHP_EOL . 'Timezone will be "'. $timezone .'"' . PHP_EOL;
+$newZone = readline('Type other timezone to change or leave empty to use timezone above: ');
+if(!empty($newZone)){
+	$timezone = $newZone;
+}
+date_default_timezone_set( $timezone ); 
+
 
-/**
- * TOOL
- */
 foreach( scandir($sourcePath) as $f ){
 	if(preg_match('/^\d{4}-(0|1)\d-[0-3]\d\.json$/', $f) === 1){
 		$client->setDayTasks(