Merge pull request #9420 from nextcloud/feature/5263/cleanup_previes
Cleanup previews in the backgroundpull/9475/head
Morris Jobke
GitHub
commit
0dcb6b2675
@ -0,0 +1,91 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* @copyright Copyright (c) 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||
*
|
||||
* @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/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Preview;
|
||||
|
||||
use OC\BackgroundJob\TimedJob;
|
||||
use OC\Files\AppData\Factory;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
use OCP\Files\NotFoundException;
|
||||
use OCP\Files\NotPermittedException;
|
||||
use OCP\IDBConnection;
|
||||
|
||||
class BackgroundCleanupJob extends TimedJob {
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
/** @var Factory */
|
||||
private $appDataFactory;
|
||||
|
||||
/** @var bool */
|
||||
private $isCLI;
|
||||
|
||||
public function __construct(IDBConnection $connection,
|
||||
Factory $appDataFactory,
|
||||
bool $isCLI) {
|
||||
// Run at most once an hour
|
||||
$this->setInterval(3600);
|
||||
|
||||
$this->connection = $connection;
|
||||
$this->appDataFactory = $appDataFactory;
|
||||
$this->isCLI = $isCLI;
|
||||
}
|
||||
|
||||
public function run($argument) {
|
||||
$previews = $this->appDataFactory->get('preview');
|
||||
|
||||
$previewFodlerId = $previews->getId();
|
||||
|
||||
$qb = $this->connection->getQueryBuilder();
|
||||
$qb->select('a.name')
|
||||
->from('filecache', 'a')
|
||||
->leftJoin('a', 'filecache', 'b', $qb->expr()->eq(
|
||||
$qb->expr()->castColumn('a.name', IQueryBuilder::PARAM_INT), 'b.fileid'
|
||||
))
|
||||
->where(
|
||||
$qb->expr()->isNull('b.fileid')
|
||||
)->andWhere(
|
||||
$qb->expr()->eq('a.parent', $qb->createNamedParameter($previewFodlerId))
|
||||
);
|
||||
|
||||
if (!$this->isCLI) {
|
||||
$qb->setMaxResults(10);
|
||||
}
|
||||
|
||||
$cursor = $qb->execute();
|
||||
|
||||
while ($row = $cursor->fetch()) {
|
||||
try {
|
||||
$preview = $previews->getFolder($row['name']);
|
||||
$preview->delete();
|
||||
} catch (NotFoundException $e) {
|
||||
// continue
|
||||
} catch (NotPermittedException $e) {
|
||||
// continue
|
||||
}
|
||||
}
|
||||
|
||||
$cursor->closeCursor();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||
*
|
||||
* @author Roeland Jago Douma <roeland@famdouma.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/>.
|
||||
*
|
||||
*/
|
||||
namespace OC\Repair\NC14;
|
||||
|
||||
use OC\Preview\BackgroundCleanupJob;
|
||||
use OCP\BackgroundJob\IJobList;
|
||||
use OCP\Migration\IOutput;
|
||||
use OCP\Migration\IRepairStep;
|
||||
|
||||
class AddPreviewBackgroundCleanupJob implements IRepairStep {
|
||||
|
||||
/** @var IJobList */
|
||||
private $jobList;
|
||||
|
||||
public function __construct(IJobList $jobList) {
|
||||
$this->jobList = $jobList;
|
||||
}
|
||||
|
||||
public function getName(): string {
|
||||
return 'Add preview background cleanup job';
|
||||
}
|
||||
|
||||
public function run(IOutput $output) {
|
||||
$this->jobList->add(BackgroundCleanupJob::class);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,159 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||
*
|
||||
* @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/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Test\Preview;
|
||||
|
||||
use OC\Files\AppData\Factory;
|
||||
use OC\Preview\BackgroundCleanupJob;
|
||||
use OC\PreviewManager;
|
||||
use OCP\Files\IRootFolder;
|
||||
use OCP\IDBConnection;
|
||||
use Test\Traits\MountProviderTrait;
|
||||
use Test\Traits\UserTrait;
|
||||
|
||||
/**
|
||||
* Class BackgroundCleanupJobTest
|
||||
*
|
||||
* @group DB
|
||||
*
|
||||
* @package Test\Preview
|
||||
*/
|
||||
class BackgroundCleanupJobTest extends \Test\TestCase {
|
||||
|
||||
use MountProviderTrait;
|
||||
use UserTrait;
|
||||
|
||||
/** @var string */
|
||||
private $userId;
|
||||
|
||||
/** @var bool */
|
||||
private $trashEnabled;
|
||||
|
||||
/** @var Factory */
|
||||
private $appDataFactory;
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
/** @var PreviewManager */
|
||||
private $previewManager;
|
||||
|
||||
/** @var IRootFolder */
|
||||
private $rootFolder;
|
||||
|
||||
public function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->userId = $this->getUniqueID();
|
||||
$this->createUser($this->userId, $this->userId);
|
||||
|
||||
$storage = new \OC\Files\Storage\Temporary([]);
|
||||
$this->registerMount($this->userId, $storage, '');
|
||||
|
||||
$this->loginAsUser($this->userId);
|
||||
$this->logout();
|
||||
$this->loginAsUser($this->userId);
|
||||
|
||||
$appManager = \OC::$server->getAppManager();
|
||||
$this->trashEnabled = $appManager->isEnabledForUser('files_trashbin', $this->userId);
|
||||
$appManager->disableApp('files_trashbin');
|
||||
|
||||
$this->appDataFactory = \OC::$server->query(Factory::class);
|
||||
$this->connection = \OC::$server->getDatabaseConnection();
|
||||
$this->previewManager = \OC::$server->getPreviewManager();
|
||||
$this->rootFolder = \OC::$server->getRootFolder();
|
||||
}
|
||||
|
||||
public function tearDown() {
|
||||
if ($this->trashEnabled) {
|
||||
$appManager = \OC::$server->getAppManager();
|
||||
$appManager->enableApp('files_trashbin');
|
||||
}
|
||||
|
||||
$this->logout();
|
||||
|
||||
return parent::tearDown();
|
||||
}
|
||||
|
||||
private function setup11Previews(): array {
|
||||
$userFolder = $this->rootFolder->getUserFolder($this->userId);
|
||||
|
||||
$files = [];
|
||||
for ($i = 0; $i < 11; $i++) {
|
||||
$file = $userFolder->newFile($i.'.txt');
|
||||
$file->putContent('hello world!');
|
||||
$this->previewManager->getPreview($file);
|
||||
$files[] = $file;
|
||||
}
|
||||
|
||||
return $files;
|
||||
}
|
||||
|
||||
public function testCleanupSystemCron() {
|
||||
$files = $this->setup11Previews();
|
||||
|
||||
$preview = $this->appDataFactory->get('preview');
|
||||
|
||||
$previews = $preview->getDirectoryListing();
|
||||
$this->assertCount(11, $previews);
|
||||
|
||||
$job = new BackgroundCleanupJob($this->connection, $this->appDataFactory, true);
|
||||
$job->run([]);
|
||||
|
||||
foreach ($files as $file) {
|
||||
$file->delete();
|
||||
}
|
||||
|
||||
$this->assertCount(11, $previews);
|
||||
$job->run([]);
|
||||
|
||||
$previews = $preview->getDirectoryListing();
|
||||
$this->assertCount(0, $previews);
|
||||
}
|
||||
|
||||
public function testCleanupAjax() {
|
||||
$files = $this->setup11Previews();
|
||||
|
||||
$preview = $this->appDataFactory->get('preview');
|
||||
|
||||
$previews = $preview->getDirectoryListing();
|
||||
$this->assertCount(11, $previews);
|
||||
|
||||
$job = new BackgroundCleanupJob($this->connection, $this->appDataFactory, false);
|
||||
$job->run([]);
|
||||
|
||||
foreach ($files as $file) {
|
||||
$file->delete();
|
||||
}
|
||||
|
||||
$this->assertCount(11, $previews);
|
||||
$job->run([]);
|
||||
|
||||
$previews = $preview->getDirectoryListing();
|
||||
$this->assertCount(1, $previews);
|
||||
|
||||
$job->run([]);
|
||||
|
||||
$previews = $preview->getDirectoryListing();
|
||||
$this->assertCount(0, $previews);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue