From 5fba6555a8ee8e3acbfee7bf79fb571c058bf52b Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Sat, 2 Feb 2019 21:26:29 +0100 Subject: [PATCH] Remove automatic object updates --- .../resource.language.de_de/strings.po | 4 -- .../resource.language.en_gb/strings.po | 4 -- .../resource.language.fr_fr/strings.po | 4 -- .../resource.language.it_it/strings.po | 4 -- .../resource.language.nl_nl/strings.po | 4 -- .../resource.language.pl_pl/strings.po | 4 -- resources/lib/entrypoint/default.py | 2 - resources/lib/entrypoint/service.py | 54 +------------------ resources/settings.xml | 1 - 9 files changed, 1 insertion(+), 80 deletions(-) diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po index 13ab68da..78a237b9 100644 --- a/resources/language/resource.language.de_de/strings.po +++ b/resources/language/resource.language.de_de/strings.po @@ -911,10 +911,6 @@ msgctxt "#33160" msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "Um Fehler zu vermeiden update bitte 'Jellyfin for Kodi' zur Version:" -msgctxt "#33161" -msgid "Check for updates" -msgstr "Nach Updates suchen" - msgctxt "#33162" msgid "Reset the music library?" msgstr "Musik Datenbank zurücksetzen?" diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index fa95164e..08e3d787 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -802,10 +802,6 @@ msgctxt "#33160" msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "" -msgctxt "#33161" -msgid "Check for updates" -msgstr "" - msgctxt "#33162" msgid "Reset the music library?" msgstr "" diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po index fab7aea9..d0e97a8f 100644 --- a/resources/language/resource.language.fr_fr/strings.po +++ b/resources/language/resource.language.fr_fr/strings.po @@ -914,10 +914,6 @@ msgstr "" "Pour éviter les erreurs, veuillez mettre à jour la version d'Jellyfin pour Kodi " ": " -msgctxt "#33161" -msgid "Check for updates" -msgstr "Rechercher des mises à jour" - msgctxt "#33162" msgid "Reset the music library?" msgstr "Réinitialiser la médiathèque musicale ?" diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po index bb343b1a..09cdadf3 100644 --- a/resources/language/resource.language.it_it/strings.po +++ b/resources/language/resource.language.it_it/strings.po @@ -907,10 +907,6 @@ msgctxt "#33160" msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "Per evitare errori, aggiorna Jellyfin per Kodi alla versione:" -msgctxt "#33161" -msgid "Check for updates" -msgstr "Ricerca aggiornamenti" - msgctxt "#33162" msgid "Reset the music library?" msgstr "Ripristinare la libreria musicale?" diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po index 6b0a83a7..e947b63d 100644 --- a/resources/language/resource.language.nl_nl/strings.po +++ b/resources/language/resource.language.nl_nl/strings.po @@ -901,10 +901,6 @@ msgctxt "#33160" msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "Om problemen voorkomen, update Jellyfin for Kodi naar versie:" -msgctxt "#33161" -msgid "Check for updates" -msgstr "Naar updates zoeken" - msgctxt "#33162" msgid "Reset the music library?" msgstr "Muziek bibliotheek resetten?" diff --git a/resources/language/resource.language.pl_pl/strings.po b/resources/language/resource.language.pl_pl/strings.po index eccb5b3a..5c4daf16 100644 --- a/resources/language/resource.language.pl_pl/strings.po +++ b/resources/language/resource.language.pl_pl/strings.po @@ -897,10 +897,6 @@ msgctxt "#33160" msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "Aby uniknąć błędów, należy zaktualizować Jellyfin dla Kodi do wersji:" -msgctxt "#33161" -msgid "Check for updates" -msgstr "Sprawdź aktualizacje" - msgctxt "#33162" msgid "Reset the music library?" msgstr "Zresetować bibliotekę muzyki?" diff --git a/resources/lib/entrypoint/default.py b/resources/lib/entrypoint/default.py index a409ccd3..0b12a1fc 100644 --- a/resources/lib/entrypoint/default.py +++ b/resources/lib/entrypoint/default.py @@ -110,8 +110,6 @@ class Events(object): xbmc.executebuiltin('Addon.OpenSettings(plugin.video.jellyfin)') elif mode == 'adduser': add_user() - elif mode == 'checkupdate': - event('CheckUpdate') elif mode == 'updateserver': event('UpdateServer') elif mode == 'thememedia': diff --git a/resources/lib/entrypoint/service.py b/resources/lib/entrypoint/service.py index 8abe4c06..74e01a72 100644 --- a/resources/lib/entrypoint/service.py +++ b/resources/lib/entrypoint/service.py @@ -79,7 +79,6 @@ class Service(xbmc.Monitor): LOG.error(error) window('jellyfin.connected.bool', True) - self.check_update() settings('groupedSets.bool', objects.utils.get_grouped_set()) xbmc.Monitor.__init__(self) @@ -173,49 +172,6 @@ class Service(xbmc.Monitor): raise Exception("Completed database reset") - def check_update(self, forced=False): - - ''' Check for objects build version and compare. - This pulls a dict that contains all the information for the build needed. - ''' - LOG.info("--[ check updates/%s ]", objects.version) - kodi = "DEV" if settings('devMode.bool') else xbmc.getInfoLabel('System.BuildVersion') - # FIXME we do not want their updates - return False - try: - versions = requests.get('http://kodi.emby.media/Public%20testing/Dependencies/databases.json').json() - build = find(versions, kodi) - - if not build: - raise Exception("build %s incompatible?!" % kodi) - - label, zipfile = build.split('-', 1) - - if label == 'DEV' and forced: - LOG.info("--[ force/objects/%s ]", label) - - elif label == objects.version: - LOG.info("--[ objects/%s ]", objects.version) - - return False - - get_objects(zipfile, label + '.zip') - self.reload_objects() - - dialog("notification", heading="{jellyfin}", message=_(33156), icon="{jellyfin}") - LOG.info("--[ new objects/%s ]", objects.version) - - try: - if compare_version(self.settings['addon_version'], objects.jellyfinversion) < 0: - dialog("ok", heading="{jellyfin}", line1="%s %s" % (_(33160), objects.jellyfinversion)) - except Exception: - pass - - except Exception as error: - LOG.exception(error) - - return True - def onNotification(self, sender, method, data): ''' All notifications are sent via NotifyAll built-in or Kodi. @@ -231,7 +187,7 @@ class Service(xbmc.Monitor): 'LibraryChanged', 'ServerOnline', 'SyncLibrary', 'RepairLibrary', 'RemoveLibrary', 'SyncLibrarySelection', 'RepairLibrarySelection', 'AddServer', 'Unauthorized', 'UpdateServer', 'UserConfigurationUpdated', 'ServerRestarting', - 'RemoveServer', 'AddLibrarySelection', 'CheckUpdate', 'RemoveLibrarySelection'): + 'RemoveServer', 'AddLibrarySelection', 'RemoveLibrarySelection'): return data = json.loads(data)[0] @@ -420,14 +376,6 @@ class Service(xbmc.Monitor): if data.get('ServerId') is None: Views().get_views() - elif method == 'CheckUpdate': - - if not self.check_update(True): - dialog("notification", heading="{jellyfin}", message=_(21341), icon="{jellyfin}", sound=False) - else: - dialog("notification", heading="{jellyfin}", message=_(33181), icon="{jellyfin}", sound=False) - window('jellyfin.restart.bool', True) - def onSettingsChanged(self): ''' React to setting changes that impact window values. diff --git a/resources/settings.xml b/resources/settings.xml index 3db34d32..d907a8e1 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -96,7 +96,6 @@ -