diff options
author | Julius Härtl <jus@bitgrid.net> | 2024-02-15 22:11:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-15 22:11:03 +0100 |
commit | 77e94a7ba593a3812faeb230741b6c180be108f8 (patch) | |
tree | 8a57c44b30a4bbe178234e3a12cdb84c18903214 | |
parent | 47211e654f6ca19fc4776504556d532d7bb2c552 (diff) | |
parent | b75acb2dd918790baf21890a36c79c4087a4fbcc (diff) | |
download | nextcloud-server-77e94a7ba593a3812faeb230741b6c180be108f8.tar.gz nextcloud-server-77e94a7ba593a3812faeb230741b6c180be108f8.zip |
Merge pull request #43594 from nextcloud/backport/43570/stable27
[stable27] chore: Remove old theming migration steps as they are only needed once
-rw-r--r-- | apps/theming/appinfo/info.xml | 4 | ||||
-rw-r--r-- | apps/theming/composer/composer/autoload_classmap.php | 2 | ||||
-rw-r--r-- | apps/theming/composer/composer/autoload_static.php | 2 | ||||
-rw-r--r-- | apps/theming/lib/Migration/MigrateAdminConfig.php | 101 | ||||
-rw-r--r-- | apps/theming/lib/Migration/MigrateUserConfig.php | 123 |
5 files changed, 0 insertions, 232 deletions
diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml index 09e7d70012e..fb924897171 100644 --- a/apps/theming/appinfo/info.xml +++ b/apps/theming/appinfo/info.xml @@ -28,10 +28,6 @@ </settings> <repair-steps> - <pre-migration> - <step>OCA\Theming\Migration\MigrateAdminConfig</step> - <step>OCA\Theming\Migration\MigrateUserConfig</step> - </pre-migration> <post-migration> <step>OCA\Theming\Migration\InitBackgroundImagesMigration</step> </post-migration> diff --git a/apps/theming/composer/composer/autoload_classmap.php b/apps/theming/composer/composer/autoload_classmap.php index 711ffa76dc8..610b48270ff 100644 --- a/apps/theming/composer/composer/autoload_classmap.php +++ b/apps/theming/composer/composer/autoload_classmap.php @@ -20,8 +20,6 @@ return array( 'OCA\\Theming\\Listener\\BeforePreferenceListener' => $baseDir . '/../lib/Listener/BeforePreferenceListener.php', 'OCA\\Theming\\Listener\\BeforeTemplateRenderedListener' => $baseDir . '/../lib/Listener/BeforeTemplateRenderedListener.php', 'OCA\\Theming\\Migration\\InitBackgroundImagesMigration' => $baseDir . '/../lib/Migration/InitBackgroundImagesMigration.php', - 'OCA\\Theming\\Migration\\MigrateAdminConfig' => $baseDir . '/../lib/Migration/MigrateAdminConfig.php', - 'OCA\\Theming\\Migration\\MigrateUserConfig' => $baseDir . '/../lib/Migration/MigrateUserConfig.php', 'OCA\\Theming\\Service\\BackgroundService' => $baseDir . '/../lib/Service/BackgroundService.php', 'OCA\\Theming\\Service\\JSDataService' => $baseDir . '/../lib/Service/JSDataService.php', 'OCA\\Theming\\Service\\ThemeInjectionService' => $baseDir . '/../lib/Service/ThemeInjectionService.php', diff --git a/apps/theming/composer/composer/autoload_static.php b/apps/theming/composer/composer/autoload_static.php index b65ee4e90a8..19e2c7540ce 100644 --- a/apps/theming/composer/composer/autoload_static.php +++ b/apps/theming/composer/composer/autoload_static.php @@ -35,8 +35,6 @@ class ComposerStaticInitTheming 'OCA\\Theming\\Listener\\BeforePreferenceListener' => __DIR__ . '/..' . '/../lib/Listener/BeforePreferenceListener.php', 'OCA\\Theming\\Listener\\BeforeTemplateRenderedListener' => __DIR__ . '/..' . '/../lib/Listener/BeforeTemplateRenderedListener.php', 'OCA\\Theming\\Migration\\InitBackgroundImagesMigration' => __DIR__ . '/..' . '/../lib/Migration/InitBackgroundImagesMigration.php', - 'OCA\\Theming\\Migration\\MigrateAdminConfig' => __DIR__ . '/..' . '/../lib/Migration/MigrateAdminConfig.php', - 'OCA\\Theming\\Migration\\MigrateUserConfig' => __DIR__ . '/..' . '/../lib/Migration/MigrateUserConfig.php', 'OCA\\Theming\\Service\\BackgroundService' => __DIR__ . '/..' . '/../lib/Service/BackgroundService.php', 'OCA\\Theming\\Service\\JSDataService' => __DIR__ . '/..' . '/../lib/Service/JSDataService.php', 'OCA\\Theming\\Service\\ThemeInjectionService' => __DIR__ . '/..' . '/../lib/Service/ThemeInjectionService.php', diff --git a/apps/theming/lib/Migration/MigrateAdminConfig.php b/apps/theming/lib/Migration/MigrateAdminConfig.php deleted file mode 100644 index 285c2f41295..00000000000 --- a/apps/theming/lib/Migration/MigrateAdminConfig.php +++ /dev/null @@ -1,101 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * @copyright 2022 Christopher Ng <chrng8@gmail.com> - * - * @author Christopher Ng <chrng8@gmail.com> - * - * @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 OCA\Theming\Migration; - -use OCP\Files\IAppData; -use OCP\Files\NotFoundException; -use OCP\Files\SimpleFS\ISimpleFolder; -use OCP\IL10N; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; -use Throwable; - -class MigrateAdminConfig implements IRepairStep { - private IAppData $appData; - private IL10N $l10n; - - public function __construct( - IAppData $appData, - IL10N $l10n - ) { - $this->appData = $appData; - $this->l10n = $l10n; - } - - public function getName(): string { - return $this->l10n->t('Failed to clean up the old administration theming images folder'); - } - - public function run(IOutput $output): void { - $output->info('Migrating administration images'); - $this->migrateAdminImages($output); - $this->cleanupAdminImages($output); - } - - private function migrateAdminImages(IOutput $output): void { - try { - $images = $this->appData->getFolder('images'); - $output->info('Migrating administration images'); - - // get or init the global folder if any - try { - $global = $this->appData->getFolder('global'); - } catch (NotFoundException $e) { - $global = $this->appData->newFolder('global'); - } - - // get or init the new images folder if any - try { - $newImages = $global->getFolder('images'); - } catch (NotFoundException $e) { - $newImages = $global->newFolder('images'); - } - - $files = $images->getDirectoryListing(); - $output->startProgress(count($files)); - foreach($files as $file) { - $newImages->newFile($file->getName(), $file->getContent()); - $output->advance(); - } - - $output->finishProgress(); - } catch(NotFoundException $e) { - $output->info('No administration images to migrate'); - } - } - - - private function cleanupAdminImages(IOutput $output): void { - try { - $images = $this->appData->getFolder('images'); - $images->delete(); - } catch (NotFoundException $e) { - } catch (Throwable $e) { - $output->warning($this->l10n->t('Failed to clean up the old administration image folder', [$e->getMessage()])); - } - } -} diff --git a/apps/theming/lib/Migration/MigrateUserConfig.php b/apps/theming/lib/Migration/MigrateUserConfig.php deleted file mode 100644 index 0f8d982dfa7..00000000000 --- a/apps/theming/lib/Migration/MigrateUserConfig.php +++ /dev/null @@ -1,123 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com> - * - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author Janis Köhr <janis.koehr@novatec-gmbh.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 <http://www.gnu.org/licenses/>. - * - */ -namespace OCA\Theming\Migration; - -use OCA\Theming\AppInfo\Application; -use OCA\Theming\Service\ThemesService; -use OCA\Theming\Themes\DarkHighContrastTheme; -use OCA\Theming\Themes\DarkTheme; -use OCA\Theming\Themes\DyslexiaFont; -use OCA\Theming\Themes\HighContrastTheme; -use OCP\IConfig; -use OCP\IUser; -use OCP\IUserManager; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; - -class MigrateUserConfig implements IRepairStep { - - protected IUserManager $userManager; - protected IConfig $config; - protected ThemesService $themesService; - protected DarkTheme $darkTheme; - protected DarkHighContrastTheme $darkHighContrastTheme; - protected HighContrastTheme $highContrastTheme; - protected DyslexiaFont $dyslexiaFont; - - /** - * MigrateUserConfig constructor. - */ - public function __construct(IConfig $config, - IUserManager $userManager, - ThemesService $themesService, - DarkTheme $darkTheme, - DarkHighContrastTheme $darkHighContrastTheme, - HighContrastTheme $highContrastTheme, - DyslexiaFont $dyslexiaFont) { - $this->config = $config; - $this->userManager = $userManager; - $this->themesService = $themesService; - - $this->darkTheme = $darkTheme; - $this->darkHighContrastTheme = $darkHighContrastTheme; - $this->highContrastTheme = $highContrastTheme; - $this->dyslexiaFont = $dyslexiaFont; - } - - /** - * Returns the step's name - * - * @return string - * @since 25.0.0 - */ - public function getName() { - return 'Migrate old user accessibility config'; - } - - /** - * Run repair step. - * Must throw exception on error. - * - * @param IOutput $output - * @throws \Exception in case of failure - * @since 25.0.0 - */ - public function run(IOutput $output) { - $output->startProgress(); - $this->userManager->callForSeenUsers(function (IUser $user) use ($output) { - $config = []; - - $font = $this->config->getUserValue($user->getUID(), 'accessibility', 'font', false); - $highcontrast = $this->config->getUserValue($user->getUID(), 'accessibility', 'highcontrast', false); - $theme = $this->config->getUserValue($user->getUID(), 'accessibility', 'theme', false); - - if ($highcontrast || $theme) { - if ($theme === 'dark' && $highcontrast === 'highcontrast') { - $config[] = $this->darkHighContrastTheme->getId(); - } else if ($theme === 'dark') { - $config[] = $this->darkTheme->getId(); - } else if ($highcontrast === 'highcontrast') { - $config[] = $this->highContrastTheme->getId(); - } - } - - if ($font === 'fontdyslexic') { - $config[] = $this->dyslexiaFont->getId(); - } - - if (!empty($config)) { - $this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_unique($config))); - } - - $output->advance(); - }); - - $this->config->deleteAppFromAllUsers('accessibility'); - - $output->finishProgress(); - } -} |