Skip to content

fix(BackgroundJob): Don't make ExpirePageTrash choke without trash #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 2 commits into from
Nov 14, 2023
Merged

fix(BackgroundJob): Don't make ExpirePageTrash choke without trash #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
028fb4c
fix(BackgroundJob): Don't make `ExpirePageTrash` choke without trash
mejo- Nov 14, 2023
215626c
fix(registerService): Cheaper condition for detecting versions backend
mejo- Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ public function register(IRegistrationContext $context): void {
});

$context->registerService(VersionsBackend::class, function (ContainerInterface $c) {
$appManager = $c->get(IAppManager::class);
if ($appManager->isEnabledForUser('files_versions')) {
if (interface_exists(IVersionBackend::class)) {
return new VersionsBackend(
$c->get(CollectiveFolderManager::class),
$c->get(ITimeFactory::class),
Expand Down
16 changes: 10 additions & 6 deletions lib/BackgroundJob/ExpirePageTrash.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@
class ExpirePageTrash extends TimedJob {
private Expiration $expiration;
private PageTrashBackend $trashBackend;
private bool $hasTrashBackend = false;

public function __construct(
ITimeFactory $time,
Expiration $expiration,
PageTrashBackend $trashBackend) {
ITimeFactory $time) {
Comment on lines -19 to +20
Copy link
Member

@juliusknorr juliusknorr Nov 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Starting with nextcloud 28 you could actually make them nullable, but good as it is as we cover more versions ;)

nextcloud/server#41265

Copy link
Member Author

@mejo- mejo- Nov 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, that's great to learn. Not for now, but one day we'll drop support for everything below 28 😊

parent::__construct($time);

// Run once per hour
$this->setInterval(60 * 60);

$this->expiration = $expiration;
$this->trashBackend = $trashBackend;
if (class_exists(Expiration::class)) {
$this->hasTrashBackend = true;
$this->expiration = \OCP\Server::get(Expiration::class);
$this->trashBackend = \OCP\Server::get(PageTrashBackend::class);
}
}

/**
Expand All @@ -35,6 +37,8 @@ public function __construct(
* @throws NotPermittedException
*/
protected function run($argument): void {
$this->trashBackend->expire($this->expiration);
if ($this->hasTrashBackend) {
$this->trashBackend->expire($this->expiration);
}
}
}