Merged dev into main

Author: andrey18106

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="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
 	<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>

js/mediadc-main.js

@@ -257,6 +257,28 @@
  *
  */
 
+/**
+ * @copyright Copyright (c) 2021 John Molakvoæ <[email protected]>
+ *
+ * @author John Molakvoæ <[email protected]>
+ *
+ * @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

js/mediadc-main.js.LICENSE.txt

@@ -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/';
+	}
+
 }

js/mediadc-main.js.map

@@ -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();

js/mediadc-node_modules_moment_locale_sync_recursive_-src_views_CollectorDetails_vue.js

@@ -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
 	 *