diff options
Diffstat (limited to 'lib/private/Migration/BackgroundRepair.php')
-rw-r--r-- | lib/private/Migration/BackgroundRepair.php | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php index afc3dcc9ac7..d542b82d5e1 100644 --- a/lib/private/Migration/BackgroundRepair.php +++ b/lib/private/Migration/BackgroundRepair.php @@ -1,34 +1,14 @@ <?php + /** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author Daniel Kesselberg <mail@danielkesselberg.de> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Robin Appelman <robin@icewind.nl> - * @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: 2016-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2016 ownCloud, Inc. + * SPDX-License-Identifier: AGPL-3.0-only */ namespace OC\Migration; -use OC\NeedsUpdateException; use OC\Repair; -use OC_App; +use OCP\App\IAppManager; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\TimedJob; @@ -45,6 +25,7 @@ class BackgroundRepair extends TimedJob { ITimeFactory $time, private LoggerInterface $logger, private IJobList $jobList, + private IAppManager $appManager, ) { parent::__construct($time); $this->setInterval(15 * 60); @@ -53,7 +34,6 @@ class BackgroundRepair extends TimedJob { /** * @param array $argument * @throws \Exception - * @throws \OC\NeedsUpdateException */ protected function run($argument): void { if (!isset($argument['app']) || !isset($argument['step'])) { @@ -63,13 +43,7 @@ class BackgroundRepair extends TimedJob { } $app = $argument['app']; - try { - $this->loadApp($app); - } catch (NeedsUpdateException $ex) { - // as long as the app is not yet done with it's offline migration - // we better not start with the live migration - return; - } + $this->appManager->loadApp($app); $step = $argument['step']; $this->repair->setRepairSteps([]); @@ -92,13 +66,4 @@ class BackgroundRepair extends TimedJob { // remove the job once executed successfully $this->jobList->remove($this, $this->argument); } - - /** - * @codeCoverageIgnore - * @param $app - * @throws NeedsUpdateException - */ - protected function loadApp($app): void { - OC_App::loadApp($app); - } } |