upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-27 01:00:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

feat: Limit trash expire job to 30 minutes

Browse source 
And pick up where it left off, leveraging getSeenUsers.

Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Louis Chemineau 2025-03-26 21:01:47 +01:00 committed by backportbot[bot]
parent 749b4f4d22
commit 27079eedeb
2 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
View file

@ -12,13 +12,12 @@ use OCA\Files_Trashbin\Helper;
use OCA\Files_Trashbin\Trashbin;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCP\IConfig;
use OCP\IUser;
use OCP\IAppConfig;
use OCP\IUserManager;
class ExpireTrash extends TimedJob {
public function __construct(
private IConfig $config,
private IAppConfig $appConfig,
private IUserManager $userManager,
private Expiration $expiration,
ITimeFactory $time,
@ -28,12 +27,8 @@ class ExpireTrash extends TimedJob {
$this->setInterval(60 * 30);
}
/**
* @param $argument
* @throws \Exception
*/
protected function run($argument) {
$backgroundJob = $this->config->getAppValue('files_trashbin', 'background_job_expire_trash', 'yes');
$backgroundJob = $this->appConfig->getValueString('files_trashbin', 'background_job_expire_trash', 'yes');
if ($backgroundJob === 'no') {
return;
}
@ -43,15 +38,28 @@ class ExpireTrash extends TimedJob {
return;
}
$this->userManager->callForSeenUsers(function (IUser $user): void {
$stopTime = time() + 60 * 30; // Stops after 30 minutes.
$offset = $this->appConfig->getValueInt('files_trashbin', 'background_job_expire_trash_offset', 0);
$users = $this->userManager->getSeenUsers($offset);
foreach ($users as $user) {
$uid = $user->getUID();
if (!$this->setupFS($uid)) {
return;
continue;
}
$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
Trashbin::deleteExpiredFiles($dirContent, $uid);
});
$offset++;
if ($stopTime < time()) {
$this->appConfig->setValueInt('files_trashbin', 'background_job_expire_trash_offset', $offset);
\OC_Util::tearDownFS();
return;
}
}
$this->appConfig->setValueInt('files_trashbin', 'background_job_expire_trash_offset', 0);
\OC_Util::tearDownFS();
}

27
apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php
View file

@ -11,31 +11,31 @@ use OCA\Files_Trashbin\BackgroundJob\ExpireTrash;
use OCA\Files_Trashbin\Expiration;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\IConfig;
use OCP\IAppConfig;
use OCP\IUserManager;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class ExpireTrashTest extends TestCase {
/** @var IConfig|MockObject */
private $config;
/** @var IAppConfig&MockObject */
private $appConfig;
/** @var IUserManager|MockObject */
/** @var IUserManager&MockObject */
private $userManager;
/** @var Expiration|MockObject */
/** @var Expiration&MockObject */
private $expiration;
/** @var IJobList|MockObject */
/** @var IJobList&MockObject */
private $jobList;
/** @var ITimeFactory|MockObject */
/** @var ITimeFactory&MockObject */
private $time;
protected function setUp(): void {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
$this->appConfig = $this->createMock(IAppConfig::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->expiration = $this->createMock(Expiration::class);
$this->jobList = $this->createMock(IJobList::class);
@ -51,22 +51,25 @@ class ExpireTrashTest extends TestCase {
}
public function testConstructAndRun(): void {
$this->config->method('getAppValue')
$this->appConfig->method('getValueString')
->with('files_trashbin', 'background_job_expire_trash', 'yes')
->willReturn('yes');
$this->appConfig->method('getValueInt')
->with('files_trashbin', 'background_job_expire_trash_offset', 0)
->willReturn(0);
$job = new ExpireTrash($this->config, $this->userManager, $this->expiration, $this->time);
$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->time);
$job->start($this->jobList);
}
public function testBackgroundJobDeactivated(): void {
$this->config->method('getAppValue')
$this->appConfig->method('getValueString')
->with('files_trashbin', 'background_job_expire_trash', 'yes')
->willReturn('no');
$this->expiration->expects($this->never())
->method('getMaxAgeAsTimestamp');
$job = new ExpireTrash($this->config, $this->userManager, $this->expiration, $this->time);
$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->time);
$job->start($this->jobList);
}
}