-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Readd repair steps that are relevant when migrating from ownCloud
This reverts commit d9b1492. Signed-off-by: Julius Härtl <jus@bitgrid.net>
- Loading branch information
1 parent
c09dd34
commit 3fab55a
Showing
13 changed files
with
1,325 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2016 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\Owncloud; | ||
|
|
||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\IConfig; | ||
| use OCP\IUser; | ||
| use OCP\IUserManager; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\IRepairStep; | ||
|
|
||
| class CleanPreviews implements IRepairStep { | ||
|
|
||
| /** @var IJobList */ | ||
| private $jobList; | ||
|
|
||
| /** @var IUserManager */ | ||
| private $userManager; | ||
|
|
||
| /** @var IConfig */ | ||
| private $config; | ||
|
|
||
| /** | ||
| * MoveAvatars constructor. | ||
| * | ||
| * @param IJobList $jobList | ||
| * @param IUserManager $userManager | ||
| * @param IConfig $config | ||
| */ | ||
| public function __construct(IJobList $jobList, | ||
| IUserManager $userManager, | ||
| IConfig $config) { | ||
| $this->jobList = $jobList; | ||
| $this->userManager = $userManager; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| /** | ||
| * @return string | ||
| */ | ||
| public function getName() { | ||
| return 'Add preview cleanup background jobs'; | ||
| } | ||
|
|
||
| public function run(IOutput $output) { | ||
| if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) { | ||
| $this->userManager->callForSeenUsers(function (IUser $user) { | ||
| $this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]); | ||
| }); | ||
| $this->config->setAppValue('core', 'previewsCleanedUp', '1'); | ||
| } | ||
| } | ||
| } |
132 changes: 132 additions & 0 deletions
132
lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2016 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\Owncloud; | ||
|
|
||
| use OC\BackgroundJob\QueuedJob; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\Files\Folder; | ||
| use OCP\Files\IRootFolder; | ||
| use OCP\Files\NotFoundException; | ||
| use OCP\Files\NotPermittedException; | ||
| use OCP\ILogger; | ||
| use OCP\IUserManager; | ||
|
|
||
| class CleanPreviewsBackgroundJob extends QueuedJob { | ||
| /** @var IRootFolder */ | ||
| private $rootFolder; | ||
|
|
||
| /** @var ILogger */ | ||
| private $logger; | ||
|
|
||
| /** @var IJobList */ | ||
| private $jobList; | ||
|
|
||
| /** @var ITimeFactory */ | ||
| private $timeFactory; | ||
|
|
||
| /** @var IUserManager */ | ||
| private $userManager; | ||
|
|
||
| /** | ||
| * CleanPreviewsBackgroundJob constructor. | ||
| * | ||
| * @param IRootFolder $rootFolder | ||
| * @param ILogger $logger | ||
| * @param IJobList $jobList | ||
| * @param ITimeFactory $timeFactory | ||
| * @param IUserManager $userManager | ||
| */ | ||
| public function __construct(IRootFolder $rootFolder, | ||
| ILogger $logger, | ||
| IJobList $jobList, | ||
| ITimeFactory $timeFactory, | ||
| IUserManager $userManager) { | ||
| $this->rootFolder = $rootFolder; | ||
| $this->logger = $logger; | ||
| $this->jobList = $jobList; | ||
| $this->timeFactory = $timeFactory; | ||
| $this->userManager = $userManager; | ||
| } | ||
|
|
||
| public function run($arguments) { | ||
| $uid = $arguments['uid']; | ||
| if (!$this->userManager->userExists($uid)) { | ||
| $this->logger->info('User no longer exists, skip user ' . $uid); | ||
| return; | ||
| } | ||
| $this->logger->info('Started preview cleanup for ' . $uid); | ||
| $empty = $this->cleanupPreviews($uid); | ||
|
|
||
| if (!$empty) { | ||
| $this->jobList->add(self::class, ['uid' => $uid]); | ||
| $this->logger->info('New preview cleanup scheduled for ' . $uid); | ||
| } else { | ||
| $this->logger->info('Preview cleanup done for ' . $uid); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param $uid | ||
| * @return bool | ||
| */ | ||
| private function cleanupPreviews($uid) { | ||
| try { | ||
| $userFolder = $this->rootFolder->getUserFolder($uid); | ||
| } catch (NotFoundException $e) { | ||
| return true; | ||
| } | ||
|
|
||
| $userRoot = $userFolder->getParent(); | ||
|
|
||
| try { | ||
| /** @var Folder $thumbnailFolder */ | ||
| $thumbnailFolder = $userRoot->get('thumbnails'); | ||
| } catch (NotFoundException $e) { | ||
| return true; | ||
| } | ||
|
|
||
| $thumbnails = $thumbnailFolder->getDirectoryListing(); | ||
|
|
||
| $start = $this->timeFactory->getTime(); | ||
| foreach ($thumbnails as $thumbnail) { | ||
| try { | ||
| $thumbnail->delete(); | ||
| } catch (NotPermittedException $e) { | ||
| // Ignore | ||
| } | ||
|
|
||
| if (($this->timeFactory->getTime() - $start) > 15) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| try { | ||
| $thumbnailFolder->delete(); | ||
| } catch (NotPermittedException $e) { | ||
| // Ignore | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch> | ||
| * | ||
| * @author Lukas Reschke <lukas@statuscode.ch> | ||
| * | ||
| * @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\Owncloud; | ||
|
|
||
| use OC\App\AppStore\Bundles\BundleFetcher; | ||
| use OC\Installer; | ||
| use OCP\IConfig; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\IRepairStep; | ||
|
|
||
| class InstallCoreBundle implements IRepairStep { | ||
| /** @var BundleFetcher */ | ||
| private $bundleFetcher; | ||
| /** @var IConfig */ | ||
| private $config; | ||
| /** @var Installer */ | ||
| private $installer; | ||
|
|
||
| /** | ||
| * @param BundleFetcher $bundleFetcher | ||
| * @param IConfig $config | ||
| * @param Installer $installer | ||
| */ | ||
| public function __construct(BundleFetcher $bundleFetcher, | ||
| IConfig $config, | ||
| Installer $installer) { | ||
| $this->bundleFetcher = $bundleFetcher; | ||
| $this->config = $config; | ||
| $this->installer = $installer; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getName() { | ||
| return 'Install new core bundle components'; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function run(IOutput $output) { | ||
| $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); | ||
|
|
||
| if (version_compare($versionFromBeforeUpdate, '12.0.0.14', '>')) { | ||
| return; | ||
| } | ||
|
|
||
| $defaultBundle = $this->bundleFetcher->getDefaultInstallationBundle(); | ||
| foreach ($defaultBundle as $bundle) { | ||
| try { | ||
| $this->installer->installAppBundle($bundle); | ||
| $output->info('Successfully installed core app bundle.'); | ||
| } catch (\Exception $e) { | ||
| $output->warning('Could not install core app bundle: ' . $e->getMessage()); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.