From b9032cb486325d3f7b0f02781f37e3b4d8cb25f8 Mon Sep 17 00:00:00 2001 From: Jagandeep Brar Date: Sun, 16 Jan 2022 22:39:55 -0500 Subject: [PATCH] fix(flavor): Change "develop" to "internal" --- .vscode/cspell.json | 1 + assets/localization/en.json | 1 + lib/core/modules.dart | 2 +- lib/core/system/flavor.dart | 30 +++++++++---------- lib/core/system/profile.dart | 4 +-- .../settings/routes/settings/route.dart | 2 +- localization/lunasea/en.json | 1 + 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 2ca474e0..76626944 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -3,6 +3,7 @@ "*.json", "*.lock", "*.yaml", + "*.yml", /** Directories */ ".dart_tool", ".git", diff --git a/assets/localization/en.json b/assets/localization/en.json index 203a19f2..7d84e1a7 100644 --- a/assets/localization/en.json +++ b/assets/localization/en.json @@ -240,6 +240,7 @@ "lunasea.Home": "Home", "lunasea.HoursAgo": "{} Hours Ago", "lunasea.IncorrectEncryptionKey": "Incorrect encryption key", + "lunasea.Internal": "Internal", "lunasea.JustNow": "Just Now", "lunasea.Module": "Module", "lunasea.ModuleIsNotEnabled": "{} Is Not Enabled", diff --git a/lib/core/modules.dart b/lib/core/modules.dart index 55a2fc4a..61656321 100644 --- a/lib/core/modules.dart +++ b/lib/core/modules.dart @@ -59,7 +59,7 @@ extension LunaModuleExtension on LunaModule { case LunaModule.NZBGET: return true; case LunaModule.OVERSEERR: - return LunaFlavor().isLowerOrEqualTo(LunaEnvironment.ALPHA); + return LunaFlavor().isLowerOrEqualTo(LunaEnvironment.INTERNAL); case LunaModule.RADARR: return true; case LunaModule.SABNZBD: diff --git a/lib/core/system/flavor.dart b/lib/core/system/flavor.dart index f7579a1a..c61150a0 100644 --- a/lib/core/system/flavor.dart +++ b/lib/core/system/flavor.dart @@ -5,7 +5,7 @@ import 'package:envify/envify.dart'; part 'flavor.g.dart'; -const _DEVELOP = 'develop'; +const _INTERNAL = 'internal'; const _ALPHA = 'alpha'; const _BETA = 'beta'; const _PRODUCTION = 'production'; @@ -18,10 +18,10 @@ class LunaFlavor { extension FlavorExtension on LunaFlavor { LunaEnvironment get environment { - if (kDebugMode) return LunaEnvironment.DEVELOP; + if (kDebugMode) return LunaEnvironment.INTERNAL; switch (LunaFlavor.flavor) { - case _DEVELOP: - return LunaEnvironment.DEVELOP; + case _INTERNAL: + return LunaEnvironment.INTERNAL; case _ALPHA: return LunaEnvironment.ALPHA; case _BETA: @@ -44,12 +44,12 @@ extension FlavorExtension on LunaFlavor { bool isLowerOrEqualTo(LunaEnvironment env) { if (this.environment == env) return true; switch (env) { - case LunaEnvironment.DEVELOP: + case LunaEnvironment.INTERNAL: return false; case LunaEnvironment.ALPHA: - return this.environment == LunaEnvironment.DEVELOP; + return this.environment == LunaEnvironment.INTERNAL; case LunaEnvironment.BETA: - return this.environment == LunaEnvironment.DEVELOP || + return this.environment == LunaEnvironment.INTERNAL || this.environment == LunaEnvironment.ALPHA; case LunaEnvironment.PRODUCTION: return true; @@ -58,7 +58,7 @@ extension FlavorExtension on LunaFlavor { } enum LunaEnvironment { - DEVELOP, + INTERNAL, ALPHA, BETA, PRODUCTION, @@ -67,8 +67,8 @@ enum LunaEnvironment { extension LunaEnvironmentExtension on LunaEnvironment { String get key { switch (this) { - case LunaEnvironment.DEVELOP: - return _DEVELOP; + case LunaEnvironment.INTERNAL: + return _INTERNAL; case LunaEnvironment.ALPHA: return _ALPHA; case LunaEnvironment.BETA: @@ -80,8 +80,8 @@ extension LunaEnvironmentExtension on LunaEnvironment { String get name { switch (this) { - case LunaEnvironment.DEVELOP: - return 'lunasea.Develop'.tr(); + case LunaEnvironment.INTERNAL: + return 'lunasea.Internal'.tr(); case LunaEnvironment.ALPHA: return 'lunasea.Alpha'.tr(); case LunaEnvironment.BETA: @@ -93,7 +93,7 @@ extension LunaEnvironmentExtension on LunaEnvironment { Color get color { switch (this) { - case LunaEnvironment.DEVELOP: + case LunaEnvironment.INTERNAL: return LunaColours.red; case LunaEnvironment.ALPHA: return LunaColours.orange; @@ -106,8 +106,8 @@ extension LunaEnvironmentExtension on LunaEnvironment { LunaEnvironment from(String key) { switch (key) { - case _DEVELOP: - return LunaEnvironment.DEVELOP; + case _INTERNAL: + return LunaEnvironment.INTERNAL; case _ALPHA: return LunaEnvironment.ALPHA; case _BETA: diff --git a/lib/core/system/profile.dart b/lib/core/system/profile.dart index fed8da77..9a5a2375 100644 --- a/lib/core/system/profile.dart +++ b/lib/core/system/profile.dart @@ -119,7 +119,7 @@ class LunaProfile { static ProfileHiveObject get current { LunaDatabaseValue _db = LunaDatabaseValue.ENABLED_PROFILE; - String _name = Database.lunasea.box.get(_db.key)!; - return Database.profiles.box.get(_name)!; + String _name = Database.lunasea.box.get(_db.key) ?? 'default'; + return Database.profiles.box.get(_name) ?? ProfileHiveObject.empty(); } } diff --git a/lib/modules/settings/routes/settings/route.dart b/lib/modules/settings/routes/settings/route.dart index 8e80fa2f..ec8e6de8 100644 --- a/lib/modules/settings/routes/settings/route.dart +++ b/lib/modules/settings/routes/settings/route.dart @@ -89,7 +89,7 @@ class _State extends State<_Widget> with LunaScrollControllerMixin { trailing: const LunaIconButton(icon: Icons.settings_rounded), onTap: () async => SettingsSystemRouter().navigateTo(context), ), - if (LunaFlavor().isLowerOrEqualTo(LunaEnvironment.DEVELOP)) + if (LunaFlavor().isLowerOrEqualTo(LunaEnvironment.INTERNAL)) LunaBlock( title: 'settings.DebugMenu'.tr(), body: [TextSpan(text: 'settings.DebugMenuDescription'.tr())], diff --git a/localization/lunasea/en.json b/localization/lunasea/en.json index c5630439..d5982c59 100644 --- a/localization/lunasea/en.json +++ b/localization/lunasea/en.json @@ -33,6 +33,7 @@ "lunasea.Home": "Home", "lunasea.HoursAgo": "{} Hours Ago", "lunasea.IncorrectEncryptionKey": "Incorrect encryption key", + "lunasea.Internal": "Internal", "lunasea.JustNow": "Just Now", "lunasea.Module": "Module", "lunasea.ModuleIsNotEnabled": "{} Is Not Enabled",