aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib/Command
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_trashbin/lib/Command')
-rw-r--r--apps/files_trashbin/lib/Command/CleanUp.php79
-rw-r--r--apps/files_trashbin/lib/Command/Expire.php41
-rw-r--r--apps/files_trashbin/lib/Command/ExpireTrash.php75
-rw-r--r--apps/files_trashbin/lib/Command/RestoreAllFiles.php242
-rw-r--r--apps/files_trashbin/lib/Command/Size.php60
5 files changed, 261 insertions, 236 deletions
diff --git a/apps/files_trashbin/lib/Command/CleanUp.php b/apps/files_trashbin/lib/Command/CleanUp.php
index e3ed527e535..e9b4fa8ae60 100644
--- a/apps/files_trashbin/lib/Command/CleanUp.php
+++ b/apps/files_trashbin/lib/Command/CleanUp.php
@@ -1,27 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Liam Dennehy <liam@wiemax.net>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Files_Trashbin\Command;
@@ -29,6 +11,7 @@ use OCP\Files\IRootFolder;
use OCP\IDBConnection;
use OCP\IUserBackend;
use OCP\IUserManager;
+use OCP\Util;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Exception\InvalidOptionException;
use Symfony\Component\Console\Input\InputArgument;
@@ -38,25 +21,12 @@ use Symfony\Component\Console\Output\OutputInterface;
class CleanUp extends Command {
- /** @var IUserManager */
- protected $userManager;
-
- /** @var IRootFolder */
- protected $rootFolder;
-
- /** @var \OCP\IDBConnection */
- protected $dbConnection;
-
- /**
- * @param IRootFolder $rootFolder
- * @param IUserManager $userManager
- * @param IDBConnection $dbConnection
- */
- public function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) {
+ public function __construct(
+ protected IRootFolder $rootFolder,
+ protected IUserManager $userManager,
+ protected IDBConnection $dbConnection,
+ ) {
parent::__construct();
- $this->userManager = $userManager;
- $this->rootFolder = $rootFolder;
- $this->dbConnection = $dbConnection;
}
protected function configure() {
@@ -78,13 +48,14 @@ class CleanUp extends Command {
protected function execute(InputInterface $input, OutputInterface $output): int {
$users = $input->getArgument('user_id');
+ $verbose = $input->getOption('verbose');
if ((!empty($users)) and ($input->getOption('all-users'))) {
throw new InvalidOptionException('Either specify a user_id or --all-users');
} elseif (!empty($users)) {
foreach ($users as $user) {
if ($this->userManager->userExists($user)) {
$output->writeln("Remove deleted files of <info>$user</info>");
- $this->removeDeletedFiles($user);
+ $this->removeDeletedFiles($user, $output, $verbose);
} else {
$output->writeln("<error>Unknown user $user</error>");
return 1;
@@ -104,7 +75,7 @@ class CleanUp extends Command {
$users = $backend->getUsers('', $limit, $offset);
foreach ($users as $user) {
$output->writeln(" <info>$user</info>");
- $this->removeDeletedFiles($user);
+ $this->removeDeletedFiles($user, $output, $verbose);
}
$offset += $limit;
} while (count($users) >= $limit);
@@ -117,19 +88,31 @@ class CleanUp extends Command {
/**
* remove deleted files for the given user
- *
- * @param string $uid
*/
- protected function removeDeletedFiles($uid) {
+ protected function removeDeletedFiles(string $uid, OutputInterface $output, bool $verbose): void {
\OC_Util::tearDownFS();
\OC_Util::setupFS($uid);
- if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) {
- $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete();
+ $path = '/' . $uid . '/files_trashbin';
+ if ($this->rootFolder->nodeExists($path)) {
+ $node = $this->rootFolder->get($path);
+
+ if ($verbose) {
+ $output->writeln('Deleting <info>' . Util::humanFileSize($node->getSize()) . "</info> in trash for <info>$uid</info>.");
+ }
+ $node->delete();
+ if ($this->rootFolder->nodeExists($path)) {
+ $output->writeln('<error>Trash folder sill exists after attempting to delete it</error>');
+ return;
+ }
$query = $this->dbConnection->getQueryBuilder();
$query->delete('files_trash')
->where($query->expr()->eq('user', $query->createParameter('uid')))
->setParameter('uid', $uid);
- $query->execute();
+ $query->executeStatement();
+ } else {
+ if ($verbose) {
+ $output->writeln("No trash found for <info>$uid</info>");
+ }
}
}
}
diff --git a/apps/files_trashbin/lib/Command/Expire.php b/apps/files_trashbin/lib/Command/Expire.php
index 568506737eb..73a42cd4749 100644
--- a/apps/files_trashbin/lib/Command/Expire.php
+++ b/apps/files_trashbin/lib/Command/Expire.php
@@ -1,52 +1,31 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Files_Trashbin\Command;
use OC\Command\FileAccess;
use OCA\Files_Trashbin\Trashbin;
use OCP\Command\ICommand;
+use OCP\IUserManager;
+use OCP\Server;
class Expire implements ICommand {
use FileAccess;
/**
- * @var string
- */
- private $user;
-
- /**
* @param string $user
*/
- public function __construct($user) {
- $this->user = $user;
+ public function __construct(
+ private $user,
+ ) {
}
public function handle() {
- $userManager = \OC::$server->getUserManager();
+ $userManager = Server::get(IUserManager::class);
if (!$userManager->userExists($this->user)) {
// User has been deleted already
return;
diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php
index bcecbfceeff..422d8379984 100644
--- a/apps/files_trashbin/lib/Command/ExpireTrash.php
+++ b/apps/files_trashbin/lib/Command/ExpireTrash.php
@@ -1,35 +1,18 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud GmbH.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud GmbH.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Files_Trashbin\Command;
+use OC\Files\View;
use OCA\Files_Trashbin\Expiration;
-use OCA\Files_Trashbin\Helper;
use OCA\Files_Trashbin\Trashbin;
use OCP\IUser;
use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputArgument;
@@ -39,25 +22,15 @@ use Symfony\Component\Console\Output\OutputInterface;
class ExpireTrash extends Command {
/**
- * @var Expiration
- */
- private $expiration;
-
- /**
- * @var IUserManager
- */
- private $userManager;
-
- /**
* @param IUserManager|null $userManager
* @param Expiration|null $expiration
*/
- public function __construct(IUserManager $userManager = null,
- Expiration $expiration = null) {
+ public function __construct(
+ private LoggerInterface $logger,
+ private ?IUserManager $userManager = null,
+ private ?Expiration $expiration = null,
+ ) {
parent::__construct();
-
- $this->userManager = $userManager;
- $this->expiration = $expiration;
}
protected function configure() {
@@ -72,9 +45,10 @@ class ExpireTrash extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output): int {
+ $minAge = $this->expiration->getMinAgeAsTimestamp();
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
- if (!$maxAge) {
- $output->writeln("Auto expiration is configured - keeps files and folders in the trash bin for 30 days and automatically deletes anytime after that if space is needed (note: files may not be deleted if space is not needed)");
+ if ($minAge === false && $maxAge === false) {
+ $output->writeln('Auto expiration is configured - keeps files and folders in the trash bin for 30 days and automatically deletes anytime after that if space is needed (note: files may not be deleted if space is not needed)');
return 1;
}
@@ -93,10 +67,12 @@ class ExpireTrash extends Command {
} else {
$p = new ProgressBar($output);
$p->start();
- $this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+
+ $users = $this->userManager->getSeenUsers();
+ foreach ($users as $user) {
$p->advance();
$this->expireTrashForUser($user);
- });
+ }
$p->finish();
$output->writeln('');
}
@@ -104,12 +80,15 @@ class ExpireTrash extends Command {
}
public function expireTrashForUser(IUser $user) {
- $uid = $user->getUID();
- if (!$this->setupFS($uid)) {
- return;
+ try {
+ $uid = $user->getUID();
+ if (!$this->setupFS($uid)) {
+ return;
+ }
+ Trashbin::expire($uid);
+ } catch (\Throwable $e) {
+ $this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
}
- $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
- Trashbin::deleteExpiredFiles($dirContent, $uid);
}
/**
@@ -122,7 +101,7 @@ class ExpireTrash extends Command {
\OC_Util::setupFS($user);
// Check if this user has a trashbin directory
- $view = new \OC\Files\View('/' . $user);
+ $view = new View('/' . $user);
if (!$view->is_dir('/files_trashbin/files')) {
return false;
}
diff --git a/apps/files_trashbin/lib/Command/RestoreAllFiles.php b/apps/files_trashbin/lib/Command/RestoreAllFiles.php
index 748ead798d8..ce31f759c0e 100644
--- a/apps/files_trashbin/lib/Command/RestoreAllFiles.php
+++ b/apps/files_trashbin/lib/Command/RestoreAllFiles.php
@@ -1,30 +1,18 @@
<?php
+
/**
- * @copyright Copyright (c) 2021, Caitlin Hogan (cahogan16@gmail.com)
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Files_Trashbin\Command;
use OC\Core\Command\Base;
+use OCA\Files_Trashbin\Trash\ITrashManager;
+use OCA\Files_Trashbin\Trash\TrashItem;
use OCP\Files\IRootFolder;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IUserBackend;
-use OCA\Files_Trashbin\Trashbin;
-use OCA\Files_Trashbin\Helper;
use OCP\IUserManager;
use OCP\L10N\IFactory;
use Symfony\Component\Console\Exception\InvalidOptionException;
@@ -35,14 +23,15 @@ use Symfony\Component\Console\Output\OutputInterface;
class RestoreAllFiles extends Base {
- /** @var IUserManager */
- protected $userManager;
-
- /** @var IRootFolder */
- protected $rootFolder;
+ private const SCOPE_ALL = 0;
+ private const SCOPE_USER = 1;
+ private const SCOPE_GROUPFOLDERS = 2;
- /** @var \OCP\IDBConnection */
- protected $dbConnection;
+ private static array $SCOPE_MAP = [
+ 'user' => self::SCOPE_USER,
+ 'groupfolders' => self::SCOPE_GROUPFOLDERS,
+ 'all' => self::SCOPE_ALL
+ ];
/** @var IL10N */
protected $l10n;
@@ -51,12 +40,17 @@ class RestoreAllFiles extends Base {
* @param IRootFolder $rootFolder
* @param IUserManager $userManager
* @param IDBConnection $dbConnection
+ * @param ITrashManager $trashManager
+ * @param IFactory $l10nFactory
*/
- public function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection, IFactory $l10nFactory) {
+ public function __construct(
+ protected IRootFolder $rootFolder,
+ protected IUserManager $userManager,
+ protected IDBConnection $dbConnection,
+ protected ITrashManager $trashManager,
+ IFactory $l10nFactory,
+ ) {
parent::__construct();
- $this->userManager = $userManager;
- $this->rootFolder = $rootFolder;
- $this->dbConnection = $dbConnection;
$this->l10n = $l10nFactory->get('files_trashbin');
}
@@ -64,7 +58,7 @@ class RestoreAllFiles extends Base {
parent::configure();
$this
->setName('trashbin:restore')
- ->setDescription('Restore all deleted files')
+ ->setDescription('Restore all deleted files according to the given filters')
->addArgument(
'user_id',
InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
@@ -75,23 +69,47 @@ class RestoreAllFiles extends Base {
null,
InputOption::VALUE_NONE,
'run action on all users'
+ )
+ ->addOption(
+ 'scope',
+ 's',
+ InputOption::VALUE_OPTIONAL,
+ 'Restore files from the given scope. Possible values are "user", "groupfolders" or "all"',
+ 'user'
+ )
+ ->addOption(
+ 'since',
+ null,
+ InputOption::VALUE_OPTIONAL,
+ 'Only restore files deleted after the given date and time, see https://www.php.net/manual/en/function.strtotime.php for more information on supported formats'
+ )
+ ->addOption(
+ 'until',
+ null,
+ InputOption::VALUE_OPTIONAL,
+ 'Only restore files deleted before the given date and time, see https://www.php.net/manual/en/function.strtotime.php for more information on supported formats'
+ )
+ ->addOption(
+ 'dry-run',
+ 'd',
+ InputOption::VALUE_NONE,
+ 'Only show which files would be restored but do not perform any action'
);
}
protected function execute(InputInterface $input, OutputInterface $output): int {
/** @var string[] $users */
$users = $input->getArgument('user_id');
- if ((!empty($users)) and ($input->getOption('all-users'))) {
+ if ((!empty($users)) && ($input->getOption('all-users'))) {
throw new InvalidOptionException('Either specify a user_id or --all-users');
- } elseif (!empty($users)) {
+ }
+
+ [$scope, $since, $until, $dryRun] = $this->parseArgs($input);
+
+ if (!empty($users)) {
foreach ($users as $user) {
- if ($this->userManager->userExists($user)) {
- $output->writeln("Restoring deleted files for user <info>$user</info>");
- $this->restoreDeletedFiles($user, $output);
- } else {
- $output->writeln("<error>Unknown user $user</error>");
- return 1;
- }
+ $output->writeln("Restoring deleted files for user <info>$user</info>");
+ $this->restoreDeletedFiles($user, $scope, $since, $until, $dryRun, $output);
}
} elseif ($input->getOption('all-users')) {
$output->writeln('Restoring deleted files for all users');
@@ -107,7 +125,7 @@ class RestoreAllFiles extends Base {
$users = $backend->getUsers('', $limit, $offset);
foreach ($users as $user) {
$output->writeln("<info>$user</info>");
- $this->restoreDeletedFiles($user, $output);
+ $this->restoreDeletedFiles($user, $scope, $since, $until, $dryRun, $output);
}
$offset += $limit;
} while (count($users) >= $limit);
@@ -119,47 +137,137 @@ class RestoreAllFiles extends Base {
}
/**
- * Restore deleted files for the given user
- *
- * @param string $uid
- * @param OutputInterface $output
+ * Restore deleted files for the given user according to the given filters
*/
- protected function restoreDeletedFiles(string $uid, OutputInterface $output): void {
+ protected function restoreDeletedFiles(string $uid, int $scope, ?int $since, ?int $until, bool $dryRun, OutputInterface $output): void {
\OC_Util::tearDownFS();
\OC_Util::setupFS($uid);
\OC_User::setUserId($uid);
- // Sort by most recently deleted first
- // (Restoring in order of most recently deleted preserves nested file paths.
- // See https://github.com/nextcloud/server/issues/31200#issuecomment-1130358549)
- $filesInTrash = Helper::getTrashFiles('/', $uid, 'mtime', true);
+ $user = $this->userManager->get($uid);
+
+ if ($user === null) {
+ $output->writeln("<error>Unknown user $uid</error>");
+ return;
+ }
- $trashCount = count($filesInTrash);
+ $userTrashItems = $this->filterTrashItems(
+ $this->trashManager->listTrashRoot($user),
+ $scope,
+ $since,
+ $until,
+ $output);
+
+ $trashCount = count($userTrashItems);
if ($trashCount == 0) {
- $output->writeln("User has no deleted files in the trashbin");
+ $output->writeln('User has no deleted files in the trashbin matching the given filters');
return;
}
- $output->writeln("Preparing to restore <info>$trashCount</info> files...");
+ $prepMsg = $dryRun ? 'Would restore' : 'Preparing to restore';
+ $output->writeln("$prepMsg <info>$trashCount</info> files...");
$count = 0;
- foreach ($filesInTrash as $trashFile) {
- $filename = $trashFile->getName();
- $timestamp = $trashFile->getMtime();
- $humanTime = $this->l10n->l('datetime', $timestamp);
- $output->write("File <info>$filename</info> originally deleted at <info>$humanTime</info> ");
- $file = $filename . '.d' . $timestamp;
- $location = Trashbin::getLocation($uid, $filename, (string) $timestamp);
- if ($location === '.') {
- $location = '';
+ foreach ($userTrashItems as $trashItem) {
+ $filename = $trashItem->getName();
+ $humanTime = $this->l10n->l('datetime', $trashItem->getDeletedTime());
+ // We use getTitle() here instead of getOriginalLocation() because
+ // for groupfolders this contains the groupfolder name itself as prefix
+ // which makes it more human readable
+ $location = $trashItem->getTitle();
+
+ if ($dryRun) {
+ $output->writeln("Would restore <info>$filename</info> originally deleted at <info>$humanTime</info> to <info>/$location</info>");
+ continue;
}
- $output->write("restoring to <info>/$location</info>:");
- if (Trashbin::restore($file, $filename, $timestamp)) {
- $count = $count + 1;
- $output->writeln(" <info>success</info>");
- } else {
- $output->writeln(" <error>failed</error>");
+
+ $output->write("File <info>$filename</info> originally deleted at <info>$humanTime</info> restoring to <info>/$location</info>:");
+
+ try {
+ $trashItem->getTrashBackend()->restoreItem($trashItem);
+ } catch (\Throwable $e) {
+ $output->writeln(' <error>Failed: ' . $e->getMessage() . '</error>');
+ $output->writeln(' <error>' . $e->getTraceAsString() . '</error>', OutputInterface::VERBOSITY_VERY_VERBOSE);
+ continue;
}
+
+ $count++;
+ $output->writeln(' <info>success</info>');
}
- $output->writeln("Successfully restored <info>$count</info> out of <info>$trashCount</info> files.");
+ if (!$dryRun) {
+ $output->writeln("Successfully restored <info>$count</info> out of <info>$trashCount</info> files.");
+ }
+ }
+
+ protected function parseArgs(InputInterface $input): array {
+ $since = $this->parseTimestamp($input->getOption('since'));
+ $until = $this->parseTimestamp($input->getOption('until'));
+
+ if ($since !== null && $until !== null && $since > $until) {
+ throw new InvalidOptionException('since must be before until');
+ }
+
+ return [
+ $this->parseScope($input->getOption('scope')),
+ $since,
+ $until,
+ $input->getOption('dry-run')
+ ];
+ }
+
+ protected function parseScope(string $scope): int {
+ if (isset(self::$SCOPE_MAP[$scope])) {
+ return self::$SCOPE_MAP[$scope];
+ }
+
+ throw new InvalidOptionException("Invalid scope '$scope'");
+ }
+
+ protected function parseTimestamp(?string $timestamp): ?int {
+ if ($timestamp === null) {
+ return null;
+ }
+ $timestamp = strtotime($timestamp);
+ if ($timestamp === false) {
+ throw new InvalidOptionException("Invalid timestamp '$timestamp'");
+ }
+ return $timestamp;
+ }
+
+ protected function filterTrashItems(array $trashItems, int $scope, ?int $since, ?int $until, OutputInterface $output): array {
+ $filteredTrashItems = [];
+ foreach ($trashItems as $trashItem) {
+ $trashItemClass = get_class($trashItem);
+
+ // Check scope with exact class name for locally deleted files
+ if ($scope === self::SCOPE_USER && $trashItemClass !== TrashItem::class) {
+ $output->writeln('Skipping <info>' . $trashItem->getName() . '</info> because it is not a user trash item', OutputInterface::VERBOSITY_VERBOSE);
+ continue;
+ }
+
+ /**
+ * Check scope for groupfolders by string because the groupfolders app might not be installed.
+ * That's why PSALM doesn't know the class GroupTrashItem.
+ * @psalm-suppress RedundantCondition
+ */
+ if ($scope === self::SCOPE_GROUPFOLDERS && $trashItemClass !== 'OCA\GroupFolders\Trash\GroupTrashItem') {
+ $output->writeln('Skipping <info>' . $trashItem->getName() . '</info> because it is not a groupfolders trash item', OutputInterface::VERBOSITY_VERBOSE);
+ continue;
+ }
+
+ // Check left timestamp boundary
+ if ($since !== null && $trashItem->getDeletedTime() <= $since) {
+ $output->writeln('Skipping <info>' . $trashItem->getName() . "</info> because it was deleted before the 'since' timestamp", OutputInterface::VERBOSITY_VERBOSE);
+ continue;
+ }
+
+ // Check right timestamp boundary
+ if ($until !== null && $trashItem->getDeletedTime() >= $until) {
+ $output->writeln('Skipping <info>' . $trashItem->getName() . "</info> because it was deleted after the 'until' timestamp", OutputInterface::VERBOSITY_VERBOSE);
+ continue;
+ }
+
+ $filteredTrashItems[] = $trashItem;
+ }
+ return $filteredTrashItems;
}
}
diff --git a/apps/files_trashbin/lib/Command/Size.php b/apps/files_trashbin/lib/Command/Size.php
index 30ac474199e..9c19d4d92b3 100644
--- a/apps/files_trashbin/lib/Command/Size.php
+++ b/apps/files_trashbin/lib/Command/Size.php
@@ -3,25 +3,8 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
- *
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @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/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Files_Trashbin\Command;
@@ -30,26 +13,19 @@ use OCP\Command\IBus;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
+use OCP\Util;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Size extends Base {
- private $config;
- private $userManager;
- private $commandBus;
-
public function __construct(
- IConfig $config,
- IUserManager $userManager,
- IBus $commandBus
+ private IConfig $config,
+ private IUserManager $userManager,
+ private IBus $commandBus,
) {
parent::__construct();
-
- $this->config = $config;
- $this->userManager = $userManager;
- $this->commandBus = $commandBus;
}
protected function configure() {
@@ -70,9 +46,9 @@ class Size extends Base {
$size = $input->getArgument('size');
if ($size) {
- $parsedSize = \OC_Helper::computerFileSize($size);
+ $parsedSize = Util::computerFileSize($size);
if ($parsedSize === false) {
- $output->writeln("<error>Failed to parse input size</error>");
+ $output->writeln('<error>Failed to parse input size</error>');
return -1;
}
if ($user) {
@@ -80,8 +56,8 @@ class Size extends Base {
$this->commandBus->push(new Expire($user));
} else {
$this->config->setAppValue('files_trashbin', 'trashbin_size', (string)$parsedSize);
- $output->writeln("<info>Warning: changing the default trashbin size will automatically trigger cleanup of existing trashbins,</info>");
- $output->writeln("<info>a users trashbin can exceed the configured size until they move a new file to the trashbin.</info>");
+ $output->writeln('<info>Warning: changing the default trashbin size will automatically trigger cleanup of existing trashbins,</info>');
+ $output->writeln('<info>a users trashbin can exceed the configured size until they move a new file to the trashbin.</info>');
}
} else {
$this->printTrashbinSize($input, $output, $user);
@@ -93,9 +69,9 @@ class Size extends Base {
private function printTrashbinSize(InputInterface $input, OutputInterface $output, ?string $user) {
$globalSize = (int)$this->config->getAppValue('files_trashbin', 'trashbin_size', '-1');
if ($globalSize < 0) {
- $globalHumanSize = "default (50% of available space)";
+ $globalHumanSize = 'default (50% of available space)';
} else {
- $globalHumanSize = \OC_Helper::humanFileSize($globalSize);
+ $globalHumanSize = Util::humanFileSize($globalSize);
}
if ($user) {
@@ -104,7 +80,7 @@ class Size extends Base {
if ($userSize < 0) {
$userHumanSize = ($globalSize < 0) ? $globalHumanSize : "default($globalHumanSize)";
} else {
- $userHumanSize = \OC_Helper::humanFileSize($userSize);
+ $userHumanSize = Util::humanFileSize($userSize);
}
if ($input->getOption('output') == self::OUTPUT_FORMAT_PLAIN) {
@@ -120,21 +96,21 @@ class Size extends Base {
}
} else {
$users = [];
- $this->userManager->callForSeenUsers(function (IUser $user) use (&$users) {
+ $this->userManager->callForSeenUsers(function (IUser $user) use (&$users): void {
$users[] = $user->getUID();
});
$userValues = $this->config->getUserValueForUsers('files_trashbin', 'trashbin_size', $users);
if ($input->getOption('output') == self::OUTPUT_FORMAT_PLAIN) {
$output->writeln("Default size: $globalHumanSize");
- $output->writeln("");
+ $output->writeln('');
if (count($userValues)) {
- $output->writeln("Per-user sizes:");
+ $output->writeln('Per-user sizes:');
$this->writeArrayInOutputFormat($input, $output, array_map(function ($size) {
- return \OC_Helper::humanFileSize($size);
+ return Util::humanFileSize($size);
}, $userValues));
} else {
- $output->writeln("No per-user sizes configured");
+ $output->writeln('No per-user sizes configured');
}
} else {
$globalValue = ($globalSize < 0) ? 'default' : $globalSize;
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 05:36:17 +0000