Merged dev into main

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.6 - 2021-10-22]
+
+### Added
+
+- Added Delete file confirmation setting (sidebar settings)
+
+### Fixed
+
+- Fixed MediaDC not working if specified another apps directory in Nextcloud config (apps_paths)
+- Fixed MediaDC install fails on Configuration page on some server configs
+- Changed function callbacks syntax to support PHP 7.3
+
 ## [0.1.5 - 2021-10-12]
 
 ### Added

appinfo/info.xml

@@ -17,7 +17,7 @@ This app allows to find duplicate or similar 📸📹 photos and videos
 Quick start guide and further information in our [Wiki](https://github.com/andrey18106/mediadc/wiki).
 	]]>
 	</description>
-	<version>0.1.5</version>
+	<version>0.1.6</version>
 	<licence>agpl</licence>
 	<author mail="andrey18106x@gmail.com" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
 	<author mail="bigcat88@icloud.com" homepage="https://github.com/bigcat88">Alexander Piskun</author>

js/mediadc-main.js.LICENSE.txt

@@ -257,6 +257,28 @@
  *
  */
 
+/**
+ * @copyright Copyright (c) 2021 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /**!
  * @fileOverview Kickass library to create and place poppers near their reference elements.
  * @version 1.16.1

lib/Migration/AppDataInitializationStep.php

@@ -31,6 +31,7 @@
 use OCA\MediaDC\AppInfo\Application;
 use OCA\MediaDC\Db\Setting;
 use OCA\MediaDC\Db\SettingMapper;
+use OCP\IConfig;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
@@ -40,8 +41,12 @@ class AppDataInitializationStep implements IRepairStep {
 	/** @var SettingMapper */
 	private $settingMapper;
 
-	public function __construct(SettingMapper $settingMapper) {
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(SettingMapper $settingMapper, IConfig $config) {
 		$this->settingMapper = $settingMapper;
+		$this->config = $config;
 	}
 
 	public function getName(): string {
@@ -50,7 +55,7 @@ public function getName(): string {
 
 	public function run(IOutput $output) {
 		$output->startProgress(1);
-		$data_file = getcwd() . '/apps//' . Application::APP_ID . "/lib/Migration/data/app_data_Version0001Date20210627153636.json";
+		$data_file = $this->getCustomAppsDirectory() . Application::APP_ID . "/lib/Migration/data/app_data_Version0001Date20210627153636.json";
 		$app_data = json_decode(file_get_contents($data_file), true);
 
 		if (count($this->settingMapper->findAll()) === 0) {
@@ -70,4 +75,18 @@ public function run(IOutput $output) {
 		$output->finishProgress();
 	}
 
+	private function getCustomAppsDirectory() {
+		$apps_directory = $this->config->getSystemValue('apps_paths');
+		if ($apps_directory !== "" && is_array($apps_directory) && count($apps_directory) > 0) {
+			foreach ($apps_directory as $custom_apps_dir) {
+				$mediadcDir = $custom_apps_dir['path'] . '/' . Application::APP_ID;
+				if (file_exists($custom_apps_dir['path']) && is_dir($custom_apps_dir['path']) && $custom_apps_dir['writable'] 
+					&& file_exists($mediadcDir) && is_dir($mediadcDir)) {
+					return $custom_apps_dir['path'] . '/';
+				}
+			}
+		}
+		return getcwd() . '/apps/';
+	}
+
 }

lib/Service/CleanupService.php

@@ -23,7 +23,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *!
+ *
  */
 
 namespace OCA\MediaDC\Service;
@@ -50,15 +50,24 @@ public function __construct(IDBConnection $db, ISchemaWrapper $schema)
 	}
 
 	public function dropAppTables() {
-		$tables = array_filter($this->schema->getTableNames(),
-			fn($tableName): bool => strpos($tableName, Application::APP_ID) !== false
-		);
+		$tables = array_filter($this->schema->getTableNames(), '\OCA\MediaDC\Service\CleanupService::tablesCallback');
 		foreach ($tables as $table) {
 			$this->db->dropTable($table);
 		}
 		$this->removeAppMigrations();
 	}
 
+	/**
+	 * Callback for tables filter
+	 * 
+	 * @param string $tableName
+	 * 
+	 * @return bool
+	 */
+	static function tablesCallback($tableName) {
+		return strpos($tableName, Application::APP_ID) !== false;
+	}
+
 	private function removeAppMigrations() {
 		/** @var IQueryBuilder */
 		$qb = $this->db->getQueryBuilder();

lib/Service/CollectorService.php

@@ -174,7 +174,7 @@ public function restart($params = []) {
 		/** @var Setting */
 		$pyLimitSetting = $this->settingsMapper->findByName('python_limit');
 		$processesRunning = $this->tasksMapper->findAllRunning();
-		$taskIdsRunning = array_map(fn($task) => $task->getId(), $processesRunning);
+		$taskIdsRunning = array_map('\OCA\MediaDC\Service\CollectorService::taskIdCallback', $processesRunning);
 		/** @var CollectorTask */
 		$collectorTask = $this->tasksMapper->find($taskId);
 		$taskData = $this->getTargetDirectoriesData($params['targetDirectoryIds'], intval($params['collectorSettings']['target_mtype']), $excludeList);
@@ -213,6 +213,17 @@ public function restart($params = []) {
 		return ['success' => $collectorTask !== null, 'queued' => $queuedTask !== null];
 	}
 
+	/**
+	 * Callback to extract ColectorTask id
+	 * 
+	 * @param CollectorTask $task
+	 * 
+	 * @return int
+	 */
+	static function taskIdCallback($task) {
+		return $task->getId();
+	}
+
 	/**
 	 * Terminate CollectorTask background Python process
 	 * 

lib/Service/PythonService.php

@@ -23,7 +23,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *!
+ *
  */
 
 namespace OCA\MediaDC\Service;
@@ -32,6 +32,7 @@
 use OCA\MediaDC\Db\Setting;
 use OCA\MediaDC\Db\SettingMapper;
 use OCA\MediaDC\Exception\PythonNotValidException;
+use OCP\IConfig;
 
 
 class PythonService {
@@ -42,12 +43,16 @@ class PythonService {
 	/** @var string */
 	private $pythonCommand;
 
-	public function __construct(SettingMapper $settingMapper)
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(SettingMapper $settingMapper, IConfig $config)
 	{
+		$this->config = $config;
 		/** @var Setting */
 		$pythonCommand = $settingMapper->findByName('python_command');
 		$this->pythonCommand = $pythonCommand->getValue();
-		$this->cwd = getcwd() . '/apps/' . Application::APP_ID . '/lib/Service/python';
+		$this->cwd = $this->getCustomAppsDirectory() . Application::APP_ID . '/lib/Service/python';
 		if (!$this->isPythonCompatible()) {
 			throw new PythonNotValidException("Python version is lower then 3.6.8 or not available");
 		}
@@ -69,14 +74,13 @@ public function __construct(SettingMapper $settingMapper)
 	 */
 	public function run($scriptName, $scriptParams, $nonBlocking = false, $env = []) {
 		if (count($scriptParams) > 0) {
-			$callback = fn(string $k, string $v): string => $v !== '' ? "$k $v " : "$k";
-			$params = array_map($callback, array_keys($scriptParams), array_values($scriptParams));
+			$params = array_map('\OCA\MediaDC\Service\PythonService::scriptParamsCallback', array_keys($scriptParams), array_values($scriptParams));
 			$cmd = $this->pythonCommand . ' ' . $this->cwd . $scriptName . ' ' . join(' ', $params);
 		} else {
 			$cmd = $this->pythonCommand . ' ' .  $this->cwd . $scriptName;
 		}
 		if (count($env) > 0) {
-			$envVariables = join(' ', array_map(fn(string $k, string $v): string => "$k=\"$v\" ", array_keys($env), array_values($env)));
+			$envVariables = join(' ', array_map('\OCA\MediaDC\Service\PythonService::scriptEnvsCallback', array_keys($env), array_values($env)));
 		} else {
 			$envVariables = '';
 		}
@@ -91,6 +95,30 @@ public function run($scriptName, $scriptParams, $nonBlocking = false, $env = [])
 		}
 	}
 
+	/**
+	 * Callback for concatinating Python script params
+	 * 
+	 * @param string $key
+	 * @param string $value
+	 * 
+	 * @return string
+	 */
+	static function scriptParamsCallback($key, $value) {
+		return $value !== '' ? "$key $value " : "$key";
+	}
+
+	/**
+	 * Callback for concatinating Python environment variables
+	 * 
+	 * @param string $key
+	 * @param string $value
+	 * 
+	 * @return string
+	 */
+	static function scriptEnvsCallback($key, $value) {
+		return "$key=\"$value\" ";
+	}
+
 	/**
 	 * @param string @listName
 	 * 
@@ -303,4 +331,18 @@ private function parsePythonOutput($pythonResult) {
 		];
 	}
 
+	private function getCustomAppsDirectory() {
+		$apps_directory = $this->config->getSystemValue('apps_paths');
+		if ($apps_directory !== "" && is_array($apps_directory) && count($apps_directory) > 0) {
+			foreach ($apps_directory as $custom_apps_dir) {
+				$mediadcDir = $custom_apps_dir['path'] . '/' . Application::APP_ID;
+				if (file_exists($custom_apps_dir['path']) && is_dir($custom_apps_dir['path']) && $custom_apps_dir['writable'] 
+					&& file_exists($mediadcDir) && is_dir($mediadcDir)) {
+					return $custom_apps_dir['path'] . '/';
+				}
+			}
+		}
+		return getcwd() . '/apps/';
+	}
+
 }

lib/Service/python/install.py

@@ -241,9 +241,12 @@ def is_pip_present(only_global: bool = False) -> bool:
             if m_groups is None:
                 return False
             pip_version = tuple(map(int, str(m_groups.groups()[0]).split('.')))
-            if pip_version[0] < 19:
-                return False
-            return True
+            if pip_version[0] > 19:
+                return True
+            if len(pip_version) > 1:
+                if pip_version[1] >= 3:
+                    return True
+            return False
     except (OSError, ValueError, TypeError, subprocess.TimeoutExpired) as exception_info:
         log_error(f'pip_version raised {type(exception_info).__name__}: {str(exception_info)}')
     return False

lib/Service/python/requirements.txt

@@ -6,4 +6,3 @@ pillow_heif
 asn1crypto
 cryptography
 pynacl
-hexhamming

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mediadc",
 	"description": "Collect photo and video duplicates to save your cloud storage",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"author": "Andrey Borysenko <andrey18106x@gmail.com>",
 	"contributors": [
 		"Andrey Borysenko <andrey18106x@gmail.com>",

src/components/details/DetailsGroupList.vue

@@ -74,37 +74,45 @@ export default {
 	computed: {
 		...mapGetters([
 			'detailsGridSize',
+			'deleteFileConfirmation',
 		]),
 	},
 	methods: {
 		deleteGroupFile(file) {
-			if (confirm(t('mediadc', 'Are you sure, you want delete this file?'))) {
-				this.$emit('update:updating', true)
-				axios.delete(generateUrl(`/apps/mediadc/api/v1/tasks/${file.taskId}/files/${file.detailId}/${file.fileid}`))
-					.then(res => {
-						if (res.data.success) {
-							const files = this.files
-							const fileidIndex = files.findIndex(f => f.fileid === file.fileid)
-							files.splice(fileidIndex, 1)
-							this.$emit('update:files', files)
-							emit('updateTaskInfo')
-							this.$store.dispatch('setTask', res.data.task).then(() => {
-								this.$emit('update:updating', false)
-							})
-						} else if ('locked' in res.data && res.data.locked) {
-							showWarning(t('mediadc', 'Wait until file loaded before deleting'))
-							this.$emit('update:updating', false)
-						} else {
-							showError(t('mediadc', 'Some error occured while deleting file'))
+			if (this.deleteFileConfirmation) {
+				if (confirm(t('mediadc', 'Are you sure, you want delete this file?'))) {
+					this._deleteGroupFile(file)
+				}
+			} else {
+				this._deleteGroupFile(file)
+			}
+		},
+		_deleteGroupFile(file) {
+			this.$emit('update:updating', true)
+			axios.delete(generateUrl(`/apps/mediadc/api/v1/tasks/${file.taskId}/files/${file.detailId}/${file.fileid}`))
+				.then(res => {
+					if (res.data.success) {
+						const files = this.files
+						const fileidIndex = files.findIndex(f => f.fileid === file.fileid)
+						files.splice(fileidIndex, 1)
+						this.$emit('update:files', files)
+						emit('updateTaskInfo')
+						this.$store.dispatch('setTask', res.data.task).then(() => {
 							this.$emit('update:updating', false)
-						}
-					})
-					.catch(err => {
-						console.debug(err)
+						})
+					} else if ('locked' in res.data && res.data.locked) {
+						showWarning(t('mediadc', 'Wait until file loaded before deleting'))
+						this.$emit('update:updating', false)
+					} else {
 						showError(t('mediadc', 'Some error occured while deleting file'))
 						this.$emit('update:updating', false)
-					})
-			}
+					}
+				})
+				.catch(err => {
+					console.debug(err)
+					showError(t('mediadc', 'Some error occured while deleting file'))
+					this.$emit('update:updating', false)
+				})
 		},
 	},
 }