improve ux

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/Command/PointList.php

@@ -125,7 +125,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$table = new Table($output);
 		$table->setHeaders(
-			['Restoring Point', 'Date', 'Parent', 'Comment', 'Status', 'Instance', 'Health']
+			['Restoring Point', 'Date', 'NC', 'Parent', 'Comment', 'Status', 'Instance', 'Health']
 		);
 		$table->render();
 
@@ -164,6 +164,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 						'<comment>' . (($point->isLocked()) ? 'L' : '') .
 						(($point->isArchive()) ? 'A' : '') . '</comment> ' . (($fresh) ? $displayPointId : ''),
 						($fresh) ? date('Y-m-d H:i:s', $point->getDate()) : '',
+						($fresh) ? $point->getNCVersion() : '',
 						($fresh) ? $point->getParent() : '',
 						$comment,
 						implode(',', $status),

lib/Command/PointRestore.php

@@ -443,7 +443,7 @@ private function requestSqlParams(): array {
 
 			$helper = $this->getHelper('question');
 			$question = new Question(
-				'<comment>    - Do you want to import the dump in the current database, or cancel the import ?</comment> (yes/No/cancel) ',
+				'    - <comment>Do you want to import the dump in the current database, or cancel the import ?</comment> (yes/No/cancel) ',
 				'no',
 			);
 			$question->setAutocompleterValues(['cancel', 'yes', 'no']);
@@ -698,7 +698,7 @@ private function importSqlDump(RestoringPoint $point, RestoringData $data, array
 		}
 
 //		$config = $this->extractDatabaseConfig();
-		$sqlDump = $this->pointService->getSqlDump();
+		$sqlDump = $this->pointService->getSqlDump($sqlParams);
 		$sqlDump->setup($sqlParams);
 
 		$sqlDump->import($sqlParams, $read);

lib/Service/PointService.php

@@ -274,11 +274,11 @@ public function create(bool $complete): RestoringPoint {
 
 		$this->activityService->newActivity(
 			'backup_create', [
-				'id' => $point->getId(),
-				'duration' => $point->getDuration(),
-				'status' => $point->getStatus(),
-				'complete' => $complete
-			]
+							   'id' => $point->getId(),
+							   'duration' => $point->getDuration(),
+							   'status' => $point->getStatus(),
+							   'complete' => $complete
+						   ]
 		);
 
 		return $point;
@@ -522,7 +522,8 @@ private function backupSql(RestoringPoint $point) {
 	}
 
 
-	/**
+	/** // TODO: add a way to get sql params from current config/config.php directly
+	 *
 	 * @return array
 	 */
 	public function getSqlParams(): array {
@@ -545,11 +546,19 @@ public function getSqlParams(): array {
 	/**
 	 * return temp file name/path
 	 *
+	 * @param array $params
+	 *
 	 * @return ISqlDump
 	 * @throws SqlDumpException
 	 */
-	public function getSqlDump(): ISqlDump {
-		switch ($this->configService->getSystemValue(ISqlDump::DB_TYPE)) {
+	public function getSqlDump(array $params = []): ISqlDump {
+		if (empty($params)) {
+			$dbType = $this->configService->getSystemValue(ISqlDump::DB_TYPE);
+		} else {
+			$dbType = $this->get(ISqlDump::DB_TYPE, $params);
+		}
+
+		switch ($dbType) {
 			case ISqlDump::MYSQL:
 				$sqlDump = new SqlDumpMySQL();
 				break;

lib/SqlDump/SqlDumpMySQL.php

@@ -63,7 +63,7 @@ public function __construct() {
 	 * @param array $params
 	 * @param string $filename
 	 *
-	 * @return string
+	 * @return void
 	 * @throws SqlDumpException
 	 */
 	public function export(array $params, string $filename): void {

lib/SqlDump/SqlDumpPgSQL.php

@@ -33,6 +33,7 @@
 
 use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use OCA\Backup\Exceptions\SqlDumpException;
+use OCA\Backup\Exceptions\SqlParamsException;
 use OCA\Backup\ISqlDump;
 use Spatie\DbDumper\Databases\PostgreSql;
 use Throwable;
@@ -62,14 +63,19 @@ public function __construct() {
 	 */
 	public function export(array $params, string $filename): void {
 		try {
-			PostgreSql::create()
-					  ->setDbName($this->get('dbname', $params))
-					  ->setUserName($this->get('dbuser', $params))
-					  ->setPassword($this->get('dbpassword', $params))
-					  ->setHost($this->get('dbhost', $params))
-					  ->setPort($this->getInt('dbport', $params))
-					  ->addExtraOption('--clean --inserts')
-					  ->dumpToFile($filename);
+			$dump = PostgreSql::create();
+			$dump->setDbName($this->get(ISqlDump::DB_NAME, $params))
+				 ->setUserName($this->get(ISqlDump::DB_USER, $params))
+				 ->setPassword($this->get(ISqlDump::DB_PASS, $params))
+				 ->setHost($this->get(ISqlDump::DB_HOST, $params));
+
+			$port = $this->getInt(ISqlDump::DB_PORT, $params);
+			if ($port > 0) {
+				$dump->setPort($port);
+			}
+
+			$dump->addExtraOption('--clean --inserts')
+				 ->dumpToFile($filename);
 		} catch (Throwable $t) {
 			throw new SqlDumpException($t->getMessage());
 		}
@@ -78,8 +84,34 @@ public function export(array $params, string $filename): void {
 
 	/**
 	 * @param array $params
+	 *
+	 * @throws SqlParamsException
 	 */
 	public function setup(array $params): void {
+		$port = $this->getInt(ISqlDump::DB_PORT, $params);
+		if ($port === 0) {
+			$port = null;
+		}
+		$sql = pg_connect(
+			'host=' . $this->get(ISqlDump::DB_HOST, $params) .
+			' dbname=' . $this->get(ISqlDump::DB_NAME, $params) .
+			' user=' . $this->get(ISqlDump::DB_USER, $params) .
+			' password=' . $this->get(ISqlDump::DB_PASS, $params)
+		);
+
+		if (is_bool($sql) || is_null($sql)) {
+			throw new SqlParamsException('cannot connect to database');
+		}
+
+		$dbName = $this->get(ISqlDump::DB_NAME, $params);
+		$check = pg_query($sql, 'SELECT FROM pg_database WHERE datname=\'' . $dbName . '\'');
+		if (pg_num_rows($check) === 0) {
+			pg_query($sql, 'CREATE DATABASE \'' . $dbName . '\'');
+			$check = pg_query($sql, 'SELECT FROM pg_database WHERE datname=\'' . $dbName . '\'');
+			if (pg_num_rows($check) === 0) {
+				throw new SqlParamsException('cannot create database');
+			}
+		}
 	}
 
 
@@ -91,10 +123,10 @@ public function setup(array $params): void {
 	 */
 	public function import(array $params, $read): bool {
 		$sql = pg_connect(
-			'host=' . $params['dbhost'] .
-			' dbname=' . $this->get('dbname', $params) .
-			' user=' . $this->get('dbuser', $params) .
-			' password=' . $this->get('dbpassword', $params)
+			'host=' . $this->get(ISqlDump::DB_HOST, $params) .
+			' dbname=' . $this->get(ISqlDump::DB_NAME, $params) .
+			' user=' . $this->get(ISqlDump::DB_USER, $params) .
+			' password=' . $this->get(ISqlDump::DB_PASS, $params)
 		);
 
 		$request = '';