Skip to content

Commit 7ce8732

Browse files
andrey18106andrey18106
committed
feat: maintenance update, basic object storage support, minor cleanup
Signed-off-by: Andrey Borysenko <[email protected]>
1 parent 890856f commit 7ce8732

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+5564
-3159
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [0.4.0 - 2024-10-21]
6+
7+
Maintenance update. Update NC versions to support NC30+ only.
8+
9+
### Added
10+
11+
- Added basic ObjectStorage support (/tmp folder used to execute binary scripts)
12+
- Added automatic scroll to the next duplicate group opened
13+
14+
### Changed
15+
16+
- Update UI packages to be compatible with NC30+
17+
518
## [0.3.9 - 2024-06-23]
619

720
Maintenance update.

‎appinfo/info.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This app allows to find duplicate or similar 📸📹 photos and videos
2020
Quick start guide and further information in our [Wiki](https://github.com/cloud-py-api/mediadc/wiki).
2121
]]>
2222
</description>
23-
<version>0.3.9</version>
23+
<version>0.4.0</version>
2424
<licence>agpl</licence>
2525
<author mail="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
2626
<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>
@@ -44,7 +44,7 @@ Quick start guide and further information in our [Wiki](https://github.com/cloud
4444
<screenshot>https://raw.githubusercontent.com/cloud-py-api/mediadc/main/screenshots/mediadc_filesplugin.png</screenshot>
4545
<dependencies>
4646
<php min-version="7.4" min-int-size="64" />
47-
<nextcloud min-version="28" max-version="29" />
47+
<nextcloud min-version="30" max-version="31" />
4848
</dependencies>
4949
<background-jobs>
5050
<job>OCA\MediaDC\BackgroundJob\CollectorCleanupJob</job>

‎css/filesplugin.css‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎css/style.css‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,27 @@ html {
3434
margin: 0 auto;
3535
}
3636

37-
.mediadc-button-vue {
38-
min-height: 36px !important;
37+
.mediadc-row h1, h2, h3, h4, h5, h6 {
38+
margin: 5px 0;
39+
font-size: 1.4em;
3940
}
4041

41-
.mediadc-button-vue .button-vue__icon {
42-
width: 36px !important;
43-
height: 36px !important;
44-
min-width: 36px !important;
45-
min-height: 36px !important;
46-
}
42+
/*.mediadc-button-vue {*/
43+
/* min-height: 36px !important;*/
44+
/*}*/
4745

48-
.mediadc-button-vue .icon-loading:after {
49-
height: 20px !important;
50-
width: 20px !important;
51-
margin: -12px 0 0 -12px !important;
52-
}
46+
/*.mediadc-button-vue .button-vue__icon {*/
47+
/* width: 36px !important;*/
48+
/* height: 36px !important;*/
49+
/* min-width: 36px !important;*/
50+
/* min-height: 36px !important;*/
51+
/*}*/
52+
53+
/*.mediadc-button-vue .icon-loading:after {*/
54+
/* height: 20px !important;*/
55+
/* width: 20px !important;*/
56+
/* margin: -12px 0 0 -12px !important;*/
57+
/*}*/
5358

5459
.mediadc-checkbox-only .checkbox-radio-switch__icon {
5560
margin: 0 !important;
@@ -154,6 +159,7 @@ html {
154159

155160
.block h3 {
156161
font-weight: bold;
162+
font-size: 1.2em;
157163
}
158164

159165
.block input, .block select {

‎lib/AppInfo/Application.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
namespace OCA\MediaDC\AppInfo;
3030

3131
use OCA\Files\Event\LoadAdditionalScriptsEvent;
32+
use OCA\MediaDC\Notification\Notifier;
3233
use OCP\AppFramework\App;
3334
use OCP\AppFramework\Bootstrap\IBootContext;
3435
use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -46,7 +47,7 @@ public function __construct() {
4647

4748
public function register(IRegistrationContext $context): void {
4849
$context->registerDashboardWidget(RecentTasksWidget::class);
49-
$context->registerNotifierService(\OCA\MediaDC\Notification\Notifier::class);
50+
$context->registerNotifierService(Notifier::class);
5051
$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadFilesPluginListener::class);
5152
}
5253

‎lib/BackgroundJob/CollectorCleanupJob.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,20 @@
3030

3131
use OCA\MediaDC\Service\CleanupService;
3232
use OCP\AppFramework\Utility\ITimeFactory;
33+
use OCP\BackgroundJob\IJob;
3334
use OCP\BackgroundJob\TimedJob;
3435

3536
class CollectorCleanupJob extends TimedJob {
36-
/** @var CleanupService */
37-
private $cleanupService;
38-
3937
private const collectorEveryWeekInterval = 24 * 60 * 60 * 7;
4038

4139
public function __construct(
4240
ITimeFactory $time,
43-
CleanupService $cleanupService
41+
private readonly CleanupService $cleanupService
4442
) {
4543
parent::__construct($time);
46-
$this->cleanupService = $cleanupService;
44+
4745
$this->setInterval(self::collectorEveryWeekInterval);
48-
$this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE);
46+
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
4947
}
5048

5149
/**

‎lib/BackgroundJob/QueuedTaskJob.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,11 @@
3333
use OCP\BackgroundJob\QueuedJob;
3434

3535
class QueuedTaskJob extends QueuedJob {
36-
/** @var CollectorService */
37-
private $collectorService;
38-
3936
public function __construct(
4037
ITimeFactory $time,
41-
CollectorService $collectorService
38+
private readonly CollectorService $collectorService
4239
) {
4340
parent::__construct($time);
44-
$this->collectorService = $collectorService;
4541
}
4642

4743
/**

‎lib/Command/CollectorCleanupCommand.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@
3535
use Symfony\Component\Console\Output\OutputInterface;
3636

3737
class CollectorCleanupCommand extends Command {
38-
/** @var CleanupService */
39-
private $cleanupService;
40-
41-
public function __construct(CleanupService $cleanupService) {
38+
public function __construct(
39+
private readonly CleanupService $cleanupService,
40+
) {
4241
parent::__construct();
43-
44-
$this->cleanupService = $cleanupService;
4542
}
4643

4744
protected function configure(): void {
@@ -62,6 +59,5 @@ protected function execute(InputInterface $input, OutputInterface $output): int
6259
$output->writeln($e->getTraceAsString());
6360
return 1;
6461
}
65-
return 1;
6662
}
6763
}

‎lib/Command/CollectorTaskNotificationCommand.php‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,12 @@ class CollectorTaskNotificationCommand extends Command {
4343
public const ARGUMENT_TASK_ID = 'task_id';
4444
public const ARGUMENT_TASK_STATUS = 'status';
4545

46-
/** @var CollectorTaskMapper */
47-
private $tasksMapper;
48-
49-
/** @var CollectorTaskDetailMapper */
50-
private $tasksDetailsMapper;
51-
52-
/** @var IManager */
53-
private $notificationManager;
54-
5546
public function __construct(
56-
CollectorTaskMapper $tasksMapper,
57-
CollectorTaskDetailMapper $tasksDetailsMapper,
58-
IManager $notificationManager
47+
private readonly CollectorTaskMapper $tasksMapper,
48+
private readonly CollectorTaskDetailMapper $tasksDetailsMapper,
49+
private readonly IManager $notificationManager,
5950
) {
6051
parent::__construct();
61-
62-
$this->tasksMapper = $tasksMapper;
63-
$this->tasksDetailsMapper = $tasksDetailsMapper;
64-
$this->notificationManager = $notificationManager;
6552
}
6653

6754
protected function configure(): void {

0 commit comments

Comments
 (0)