Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1492 from croneter/py3-enforce-estuary

Browse source 
Show warning message to remind user to use Estuary for database resets
This commit is contained in:
croneter 2021-05-24 20:29:43 +02:00 committed by GitHub
commit 11304c792c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/language/resource.language.en_gb/strings.po
View file

@ -155,6 +155,11 @@ msgctxt "#30028"
msgid "PKC-only image caching completed" msgid "PKC-only image caching completed"
msgstr "" 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" msgctxt "#30030"
msgid "Port Number" msgid "Port Number"
msgstr "" msgstr ""

4
resources/lib/initialsetup.py
View file

@ -613,7 +613,11 @@ class InitialSetup(object):
app.ACCOUNT.load() app.ACCOUNT.load()
app.SYNC.load() app.SYNC.load()
return return
LOG.info('Showing install questions') 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 # Additional settings where the user needs to choose
# Direct paths (\\NAS\mymovie.mkv) or addon (http)? # Direct paths (\\NAS\mymovie.mkv) or addon (http)?
goto_settings = False goto_settings = False

15
resources/lib/utils.py
View file

@ -518,6 +518,19 @@ def init_dbs():
LOG.info('Init DBs done') 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): def reset(ask_user=True):
""" """
User navigated to the PKC settings, Advanced, and wants to reset the Kodi 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? # Are you sure you want to reset your local Kodi database?
if ask_user and not yesno_dialog(lang(29999), lang(39600)): if ask_user and not yesno_dialog(lang(29999), lang(39600)):
return return
if not default_kodi_skin_warning_message():
return
from . import app from . import app
# first stop any db sync # first stop any db sync
app.APP.suspend_threads() app.APP.suspend_threads()