MediaDC 0.1.9

.github/CONTRIBUTING.md

@@ -15,7 +15,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
-[template]: https://raw.github.com/andrey18106/main/.github/ISSUE_TEMPLATE/bug_report.md
+[template]: https://raw.githubusercontent.com/andrey18106/mediadc/main/.github/ISSUE_TEMPLATE/bug_report.md
 
 ## Contributing to Source Code
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,8 +9,8 @@ A clear and concise description of what the bug is.
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error
 
 **Expected behavior**
@@ -20,20 +20,13 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS [e.g. iOS]
- - CPU (architecture)
- - Browser [e.g. chrome, safari]
- - Nextcloud version [e.g. 22]
- - Database configuration (without sensitive information)
+ - OS [e.g. Ubuntu]
+ - CPU [architecture x86, ARM]
+ - Browser [e.g. chrome, firefox, safari]
+ - Nextcloud version [e.g. 23]
+ - Database configuration [e.g. mysql 8.0.27, without sensitive information]
  - Python version [e.g. 3.9.1]
- - MediaDC version [e.g. 0.1.0]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS 8.1]
- - Browser [e.g. stock browser, safari]
- - Nextcloud version [e.g. 22]
- - MediaDC version [e.g. 0.1.0]
+ - MediaDC version [e.g. 0.1.9]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/stale.yml

@@ -2,7 +2,7 @@ name: 'Close stale issues'
 
 on:
   schedule:
-    - cron: '0 10 * * 0' # Every day at 12:00 PM GMT+2
+    - cron: '0 12 * * 0' # Every Sunday at 12:00 PM UTC
   workflow_dispatch:
 
 jobs:
@@ -14,7 +14,7 @@ jobs:
           days-before-stale: 28
           days-before-close: 14
           days-before-pr-close: -1 # Never close PR's automatically
-          only-labels: 'bug, question'
+          only-labels: 'bug, question, Fixed for upcoming version'
           stale-issue-message: 'This issue did not receive an update in the last 4 weeks.
                                 Please take a look again and update the issue with new details,
                                 otherwise it will be automatically closed in 2 weeks. Thank you!'

.github/workflows/static-analysis.yml

@@ -132,7 +132,7 @@ jobs:
         run: composer run psalm
 
   npm-audit:
-    needs: [changes, linters-js]
+    # needs: [changes, linters-js]
     if: ${{ needs.changes.outputs.js_src == 'true' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     name: npm-audit

.github/workflows/test.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [7.4, 8.0]
-        nextcloud-versions: ['stable21', 'stable22', 'master']
+        php-versions: [7.3, 7.4, 8.0]
+        nextcloud-versions: ['stable21', 'stable22', 'stable23', 'master']
 
     name: Nextcloud ${{ matrix.nextcloud-versions }} php ${{ matrix.php-versions }} unit tests
     steps:
@@ -62,8 +62,8 @@ jobs:
     strategy:
       matrix:
         python-versions: [3.7, 3.8, 3.9]
-        php-versions: [7.4, 8.0]
-        nextcloud-versions: ['stable21', 'stable22', 'master']
+        php-versions: [7.3, 7.4, 8.0]
+        nextcloud-versions: ['stable21', 'stable22', 'stable23', 'master']
 
     name: Nextcloud ${{ matrix.nextcloud-versions }} (php${{ matrix.php-versions }}) python ${{ matrix.python-versions }} unit tests
     steps:

.pylintrc

@@ -389,7 +389,7 @@ max-attributes=9
 max-bool-expr=5
 
 # Maximum number of branch for function / method body.
-max-branches=12
+max-branches=14
 
 # Maximum number of locals for function / method body.
 max-locals=15
@@ -401,7 +401,7 @@ max-parents=7
 max-public-methods=20
 
 # Maximum number of return / yield for function / method body.
-max-returns=6
+max-returns=8
 
 # Maximum number of statements in function / method body.
 max-statements=50

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.9 - 2022-02-14]
+
+### Added
+
+- Added Task finish notification option
+- Added Bug report section to Admin settings for quick system info collection
+
+### Changed
+
+- Boost package hexhamming was updated. Now available on arm8 cpu and on Alpine Linux too.
+
+### Fixed
+
+- Fixed Python error: Out of range value for column `duration` (https://github.com/andrey18106/mediadc/issues/47)
+- Fixed error "ffmpeg not found" when it was builded from source (thanks for issue to @sergeng)
+- Fixed connect error when using Nextcloud Docker with MariaDB (thanks for issue to @Bennneeeet)
+- Fixed connect error in some situations when using PGSQL with socket (thanks for issue to @pricly-yellow)
+
 ## [0.1.8 - 2021-12-20]
 
 Updated `python_command` setting from alias to full/absolute path to the Python. PHP-FPM users should check and update it on Administration settings page if install fails on Configuration page

README.md

@@ -8,6 +8,8 @@
 
 **📸📹 Collect photo and video duplicates to save your cloud storage space**
 
+| **Not working on FreeBSD systems for now**
+
 ![Home page](/screenshots/task-managment.png)
 ![Home page](/screenshots/task-results.png)
 Nextcloud Media Duplicate Collector application

appinfo/info.xml

@@ -20,7 +20,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.8</version>
+	<version>0.1.9</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>
@@ -58,6 +58,7 @@ Quick start guide and further information in our [Wiki](https://github.com/andre
 	<commands>
 		<command>OCA\MediaDC\Command\CollectorFileContentsCommand</command>
 		<command>OCA\MediaDC\Command\CollectorCleanupCommand</command>
+		<command>OCA\MediaDC\Command\CollectorTaskNotificationCommand</command>
 	</commands>
 	<background-jobs>
 		<job>OCA\MediaDC\BackgroundJob\CollectorCleanupJob</job>

appinfo/routes.php

@@ -36,6 +36,7 @@
 		['name' => 'settings#getSettingByName', 'url' => '/api/v1/settings/name/{name}', 'verb' => 'GET'],
 		['name' => 'settings#updateSetting', 'url' => '/api/v1/settings/name/{name}', 'verb' => 'PUT'],
 		['name' => 'settings#truncate', 'url' => '/api/v1/settings/truncate/{name}', 'verb' => 'POST'],
+		['name' => 'settings#systemInfo', 'url' => '/api/v1/system-info', 'verb' => 'GET'],
 
 		// Python API
 		['name' => 'python#check', 'url' => '/api/v1/python/check', 'verb' => 'GET'],

lib/AppInfo/Application.php

@@ -32,19 +32,27 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\Notification\IManager;
 
 use OCA\MediaDC\Dashboard\RecentTasksWidget;
 
 
 class Application extends App implements IBootstrap {
+
 	public const APP_ID = 'mediadc';
 
+	/** @var IManager */
+	private $notificationManager;
+
 	public function __construct() {
 		parent::__construct(self::APP_ID);
+
+		$this->notificationManager = \OC::$server->get(\OCP\Notification\IManager::class);
 	}
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerDashboardWidget(RecentTasksWidget::class);
+		$this->notificationManager->registerNotifierService(\OCA\MediaDC\Notification\Notifier::class);
 	}
 
 	public function boot(IBootContext $context): void {

lib/Command/CollectorCleanupCommand.php

@@ -40,8 +40,7 @@ class CollectorCleanupCommand extends Command {
 	/** @var CollectorService */
 	private $collectorService;
 
-	public function __construct(CollectorService $collectorService)
-	{
+	public function __construct(CollectorService $collectorService) {
 		parent::__construct();
 
 		$this->collectorService = $collectorService;

lib/Command/CollectorFileContentsCommand.php

@@ -50,8 +50,7 @@ class CollectorFileContentsCommand extends Command {
 	/** @var LoggerInterface */
 	private $logger;
 
-	public function __construct(IRootFolder $rootFolder, LoggerInterface $logger)
-	{
+	public function __construct(IRootFolder $rootFolder, LoggerInterface $logger) {
 		parent::__construct();
 
 		$this->rootFolder = $rootFolder;

lib/Command/CollectorTaskNotificationCommand.php

@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2021 Andrey Borysenko <andrey18106x@gmail.com>
+ * 
+ * @copyright Copyright (c) 2021 Alexander Piskun <bigcat88@icloud.com>
+ * 
+ * @author 2021 Andrey Borysenko <andrey18106x@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCA\MediaDC\Command;
+
+use OCA\MediaDC\AppInfo\Application;
+use OCA\MediaDC\Db\CollectorTask;
+use OCA\MediaDC\Db\CollectorTaskDetail;
+use OCA\MediaDC\Db\CollectorTaskDetailMapper;
+use OCA\MediaDC\Service\CollectorService;
+use OCP\IURLGenerator;
+use OCP\Notification\IManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+class CollectorTaskNotificationCommand extends Command {
+
+	public const ARGUMENT_TASK_ID = 'task_id';
+	public const ARGUMENT_TASK_STATUS = 'status';
+
+	/** @var CollectorService */
+	private $collectorService;
+
+	/** @var IManager */
+	private $notificationManager;
+
+	/** @var CollectorTaskDetailMapper */
+	private $taskDetailsMapper;
+
+	public function __construct(CollectorService $collectorService, 
+								CollectorTaskDetailMapper $taskDetailsMapper,
+								IManager $notificationManager, IURLGenerator $urlGenerator) {
+		parent::__construct();
+
+		$this->collectorService = $collectorService;
+		$this->taskDetailsMapper = $taskDetailsMapper;
+		$this->notificationManager = $notificationManager;
+		$this->url = $urlGenerator;
+	}
+
+	protected function configure(): void {
+		$this->setName("mediadc:collector:tasks:notify");
+		$this->setDescription("Sends task finished notification to the user");
+		$this->addArgument(self::ARGUMENT_TASK_ID, InputArgument::REQUIRED);
+		$this->addArgument(self::ARGUMENT_TASK_STATUS, InputArgument::REQUIRED);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$taskId = $input->getArgument(self::ARGUMENT_TASK_ID);
+		$status = $input->getArgument(self::ARGUMENT_TASK_STATUS);
+		/** @var CollectorTask */
+		$collectorTask = $this->collectorService->get(intval($taskId));
+		$collectorDetails = $this->taskDetailsMapper->findAllById(intval($taskId));
+		$duplicates = 0;
+		/** @var CollectorTaskDetail */
+		foreach ($collectorDetails as $detail) {
+			$duplicates += count(json_decode($detail->getGroupFilesIds()));
+		}
+		$notification = $this->notificationManager->createNotification();
+
+		$notification->setApp(Application::APP_ID)
+			->setUser($collectorTask->getOwner())
+			->setDateTime(new \DateTime())
+			->setObject('mediadc-task', $taskId)
+			->setSubject('mediadc-task-alert', [
+				'status' => $status,
+				'duplicate-groups' => count($collectorDetails),
+				'duplicates' => $duplicates,
+			]);
+		$this->notificationManager->notify($notification);
+		return 0;
+	}
+
+}

lib/Controller/SettingsController.php

@@ -36,6 +36,7 @@
 use OCA\MediaDC\AppInfo\Application;
 use OCA\MediaDC\Service\PhotosService;
 use OCA\MediaDC\Service\SettingsService;
+use OCA\MediaDC\Service\UtilsService;
 use OCA\MediaDC\Service\VideosService;
 
 
@@ -50,13 +51,18 @@ class SettingsController extends Controller {
 	/** @var VideosService */
 	private $videosService;
 
+	/** @var UtilsService */
+	private $utils;
+
 	public function __construct(IRequest $request, SettingsService $service,
-								PhotosService $photosService, VideosService $videosService) {
+								PhotosService $photosService, VideosService $videosService,
+								UtilsService $utils) {
 		parent::__construct(Application::APP_ID, $request);
 
 		$this->service = $service;
 		$this->photosService = $photosService;
 		$this->videosService = $videosService;
+		$this->utils = $utils;
 	}
 
 	/**
@@ -131,4 +137,13 @@ public function truncate($name): JSONResponse {
 		}
 	}
 
+	/**
+	 * @NoCSRFRequired
+	 *
+	 * @return JSONResponse
+	 */
+	public function systemInfo(): JSONResponse {
+		return new JSONResponse($this->utils->getSystemInfo(), Http::STATUS_OK);
+	}
+
 }