mirror of https://github.com/nextcloud/server
unbundle files_videoplayer and clean up a little
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
f6f0195a3f
commit
4aaa4590a5
|
@ -19,7 +19,6 @@
|
|||
"files_sharing",
|
||||
"files_trashbin",
|
||||
"files_versions",
|
||||
"files_videoplayer",
|
||||
"firstrunwizard",
|
||||
"logreader",
|
||||
"lookup_server_connector",
|
||||
|
@ -64,7 +63,6 @@
|
|||
"files_sharing",
|
||||
"files_trashbin",
|
||||
"files_versions",
|
||||
"files_videoplayer",
|
||||
"firstrunwizard",
|
||||
"logreader",
|
||||
"lookup_server_connector",
|
||||
|
|
|
@ -1431,6 +1431,7 @@ return array(
|
|||
'OC\\Repair\\AddBruteForceCleanupJob' => $baseDir . '/lib/private/Repair/AddBruteForceCleanupJob.php',
|
||||
'OC\\Repair\\AddCleanupUpdaterBackupsJob' => $baseDir . '/lib/private/Repair/AddCleanupUpdaterBackupsJob.php',
|
||||
'OC\\Repair\\CleanTags' => $baseDir . '/lib/private/Repair/CleanTags.php',
|
||||
'OC\\Repair\\CleanUpAbandonedApps' => $baseDir . '/lib/private/Repair/CleanUpAbandonedApps.php',
|
||||
'OC\\Repair\\ClearFrontendCaches' => $baseDir . '/lib/private/Repair/ClearFrontendCaches.php',
|
||||
'OC\\Repair\\ClearGeneratedAvatarCache' => $baseDir . '/lib/private/Repair/ClearGeneratedAvatarCache.php',
|
||||
'OC\\Repair\\ClearGeneratedAvatarCacheJob' => $baseDir . '/lib/private/Repair/ClearGeneratedAvatarCacheJob.php',
|
||||
|
|
|
@ -1464,6 +1464,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
|
|||
'OC\\Repair\\AddBruteForceCleanupJob' => __DIR__ . '/../../..' . '/lib/private/Repair/AddBruteForceCleanupJob.php',
|
||||
'OC\\Repair\\AddCleanupUpdaterBackupsJob' => __DIR__ . '/../../..' . '/lib/private/Repair/AddCleanupUpdaterBackupsJob.php',
|
||||
'OC\\Repair\\CleanTags' => __DIR__ . '/../../..' . '/lib/private/Repair/CleanTags.php',
|
||||
'OC\\Repair\\CleanUpAbandonedApps' => __DIR__ . '/../../..' . '/lib/private/Repair/CleanUpAbandonedApps.php',
|
||||
'OC\\Repair\\ClearFrontendCaches' => __DIR__ . '/../../..' . '/lib/private/Repair/ClearFrontendCaches.php',
|
||||
'OC\\Repair\\ClearGeneratedAvatarCache' => __DIR__ . '/../../..' . '/lib/private/Repair/ClearGeneratedAvatarCache.php',
|
||||
'OC\\Repair\\ClearGeneratedAvatarCacheJob' => __DIR__ . '/../../..' . '/lib/private/Repair/ClearGeneratedAvatarCacheJob.php',
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
*/
|
||||
namespace OC;
|
||||
|
||||
use OC\Repair\CleanUpAbandonedApps;
|
||||
use OCP\AppFramework\QueryException;
|
||||
use OCP\AppFramework\Utility\ITimeFactory;
|
||||
use OCP\Collaboration\Resources\IManager;
|
||||
|
@ -89,12 +90,11 @@ use Throwable;
|
|||
class Repair implements IOutput {
|
||||
|
||||
/** @var IRepairStep[] */
|
||||
private $repairSteps;
|
||||
private array $repairSteps;
|
||||
|
||||
private IEventDispatcher $dispatcher;
|
||||
|
||||
/** @var string */
|
||||
private $currentStep;
|
||||
private string $currentStep;
|
||||
|
||||
private LoggerInterface $logger;
|
||||
|
||||
|
@ -171,7 +171,7 @@ class Repair implements IOutput {
|
|||
*
|
||||
* @return IRepairStep[]
|
||||
*/
|
||||
public static function getRepairSteps() {
|
||||
public static function getRepairSteps(): array {
|
||||
return [
|
||||
new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
|
||||
new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
|
||||
|
@ -208,6 +208,7 @@ class Repair implements IOutput {
|
|||
\OCP\Server::get(RepairDavShares::class),
|
||||
\OCP\Server::get(LookupServerSendCheck::class),
|
||||
\OCP\Server::get(AddTokenCleanupJob::class),
|
||||
\OCP\Server::get(CleanUpAbandonedApps::class),
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2022 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
*
|
||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
*
|
||||
* @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 <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Repair;
|
||||
|
||||
use OCP\IConfig;
|
||||
use OCP\Migration\IOutput;
|
||||
use OCP\Migration\IRepairStep;
|
||||
|
||||
class CleanUpAbandonedApps implements IRepairStep {
|
||||
protected const ABANDONED_APPS = ['accessibility', 'files_videoplayer'];
|
||||
private IConfig $config;
|
||||
|
||||
public function __construct(IConfig $config) {
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
public function getName(): string {
|
||||
return 'Clean up abandoned apps';
|
||||
}
|
||||
|
||||
public function run(IOutput $output): void {
|
||||
foreach (self::ABANDONED_APPS as $app) {
|
||||
// only remove global app values
|
||||
// user prefs of accessibility are dealt with in Theming migration
|
||||
// videoplayer did not have user prefs
|
||||
$this->config->deleteAppValues($app);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue