From f5b8084543a3adc40a845f476dbb497558e6fded Mon Sep 17 00:00:00 2001 From: croneter Date: Mon, 24 May 2021 15:51:41 +0200 Subject: [PATCH] Show warning message to remind user to use Estuary for database resets --- .../language/resource.language.en_gb/strings.po | 5 +++++ resources/lib/initialsetup.py | 4 ++++ resources/lib/utils.py | 15 +++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index a094e90a..7e9678aa 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -155,6 +155,11 @@ msgctxt "#30028" msgid "PKC-only image caching completed" msgstr "" +# Warning shown when PKC switches to the Kodi default skin Estuary +msgctxt "#30029" +msgid "To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to use Kodi's default skin \"Estuary\" for initial set-up and for possible database resets. Continue?" +msgstr "" + msgctxt "#30030" msgid "Port Number" msgstr "" diff --git a/resources/lib/initialsetup.py b/resources/lib/initialsetup.py index af04de73..23474393 100644 --- a/resources/lib/initialsetup.py +++ b/resources/lib/initialsetup.py @@ -613,7 +613,11 @@ class InitialSetup(object): app.ACCOUNT.load() app.SYNC.load() return + LOG.info('Showing install questions') + if not utils.default_kodi_skin_warning_message(): + LOG.info('Aborting initial setup due to skin') + return # Additional settings where the user needs to choose # Direct paths (\\NAS\mymovie.mkv) or addon (http)? goto_settings = False diff --git a/resources/lib/utils.py b/resources/lib/utils.py index 3f69f303..922da4cb 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -518,6 +518,19 @@ def init_dbs(): LOG.info('Init DBs done') +def default_kodi_skin_warning_message(): + """"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended + to use Kodi's default skin \"Estuary\" for initial set-up and for possible + database resets. Continue?" + """ + if yesno_dialog(lang(29999), lang(30029)): + LOG.warn('User accepted risk of a non-default skin') + return True + else: + LOG.warn('User chose to stop due to skin not being Estuary') + return False + + def reset(ask_user=True): """ User navigated to the PKC settings, Advanced, and wants to reset the Kodi @@ -526,6 +539,8 @@ def reset(ask_user=True): # Are you sure you want to reset your local Kodi database? if ask_user and not yesno_dialog(lang(29999), lang(39600)): return + if not default_kodi_skin_warning_message(): + return from . import app # first stop any db sync app.APP.suspend_threads()