diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 633658674c..9d6522e50b 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
WebDAV
WebDAV endpoint
WebDAV endpoint
- 1.9.0
+ 1.9.1
agpl
owncloud.org
DAV
@@ -32,6 +32,9 @@
OCA\DAV\Migration\BuildCalendarSearchIndex
OCA\DAV\Migration\RefreshWebcalJobRegistrar
+
+ OCA\DAV\Migration\ChunkCleanup
+
diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php
index 89c6b99156..d5d26ea950 100644
--- a/apps/dav/composer/composer/autoload_classmap.php
+++ b/apps/dav/composer/composer/autoload_classmap.php
@@ -154,6 +154,7 @@ return array(
'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndex.php',
'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
+ 'OCA\\DAV\\Migration\\ChunkCleanup' => $baseDir . '/../lib/Migration/ChunkCleanup.php',
'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir . '/../lib/Migration/FixBirthdayCalendarComponent.php',
'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => $baseDir . '/../lib/Migration/RefreshWebcalJobRegistrar.php',
'OCA\\DAV\\Migration\\Version1004Date20170825134824' => $baseDir . '/../lib/Migration/Version1004Date20170825134824.php',
diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php
index f891e8e780..70dec97a91 100644
--- a/apps/dav/composer/composer/autoload_static.php
+++ b/apps/dav/composer/composer/autoload_static.php
@@ -169,6 +169,7 @@ class ComposerStaticInitDAV
'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndex.php',
'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__ . '/..' . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
+ 'OCA\\DAV\\Migration\\ChunkCleanup' => __DIR__ . '/..' . '/../lib/Migration/ChunkCleanup.php',
'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__ . '/..' . '/../lib/Migration/FixBirthdayCalendarComponent.php',
'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => __DIR__ . '/..' . '/../lib/Migration/RefreshWebcalJobRegistrar.php',
'OCA\\DAV\\Migration\\Version1004Date20170825134824' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170825134824.php',
diff --git a/apps/dav/lib/Migration/ChunkCleanup.php b/apps/dav/lib/Migration/ChunkCleanup.php
new file mode 100644
index 0000000000..037174806d
--- /dev/null
+++ b/apps/dav/lib/Migration/ChunkCleanup.php
@@ -0,0 +1,95 @@
+
+ *
+ * @author Roeland Jago Douma
+ *
+ * @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 .
+ *
+ */
+
+namespace OCA\DAV\Migration;
+
+use OCA\DAV\BackgroundJob\UploadCleanup;
+use OCP\BackgroundJob\IJobList;
+use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
+use OCP\IConfig;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class ChunkCleanup implements IRepairStep {
+
+ /** @var IConfig */
+ private $config;
+ /** @var IUserManager */
+ private $userManager;
+ /** @var IRootFolder */
+ private $rootFolder;
+ /** @var IJobList */
+ private $jobList;
+
+ public function __construct(IConfig $config,
+ IUserManager $userManager,
+ IRootFolder $rootFolder,
+ IJobList $jobList) {
+ $this->config = $config;
+ $this->userManager = $userManager;
+ $this->rootFolder = $rootFolder;
+ $this->jobList = $jobList;
+ }
+
+ public function getName(): string {
+ return 'Chunk cleanup scheduler';
+ }
+
+ public function run(IOutput $output) {
+ // If we already ran this onec there is no need to run it again
+ if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
+ $output->info('Cleanup not required');
+ }
+
+ $output->startProgress();
+ // Loop over all seen users
+ $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+ try {
+ $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+ $userRoot = $userFolder->getParent();
+ /** @var Folder $uploadFolder */
+ $uploadFolder = $userRoot->get('uploads');
+ } catch (NotFoundException $e) {
+ // No folder so skipping
+ return;
+ }
+
+ // Insert a cleanup job for each folder we find
+ $uploads = $uploadFolder->getDirectoryListing();
+ foreach ($uploads as $upload) {
+ $this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
+ }
+ $output->advance();
+ });
+ $output->finishProgress();
+
+
+ $this->config->setAppValue('dav', 'chunks_migrated', '1');
+ }
+
+}