Merge pull request #101 from TrueTechy/remove-version-check

Remove version check code, queries and language data
This commit is contained in:
mcarlton00 2019-10-08 13:16:35 -04:00 committed by GitHub
commit c7600d0b9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 0 additions and 166 deletions

View file

@ -444,18 +444,7 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Rufe ab:" msgstr "Rufe ab:"
msgctxt "#33022"
msgid ""
"Detected the database needs to be recreated for this version of Jellyfin for "
"Kodi. Proceed?"
msgstr ""
"Die Datenbank muss neu erstellt werden für diese 'Jellyfin for Kodi' Version. "
"Fortfahren?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
"'Jellyfin for Kodi' wird nicht richtig funktionieren ohne einen Datenbank Reset."
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"

View file

@ -438,14 +438,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "" msgstr ""
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr ""
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "" msgstr ""

View file

@ -441,18 +441,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Recopilando:" msgstr "Recopilando:"
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr ""
"La base de datos necesita ser reconstruida para esta versión de Jellyfin "
"para Kodi. ¿Proceder?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
"Jellyfin para Kodi no funcionará correctamente hasta que la base de datos "
"sea reseteada."
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "Completado en:" msgstr "Completado en:"

View file

@ -443,18 +443,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Rassemblage:" msgstr "Rassemblage:"
msgctxt "#33022"
msgid ""
"Detected the database needs to be recreated for this version of Jellyfin for "
"Kodi. Proceed?"
msgstr ""
"La base de données doit être recréée pour cette version d'Jellyfin pour Kodi. "
"Continuer ?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "Terminé en :" msgstr "Terminé en :"

View file

@ -442,18 +442,7 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Raggruppa:" msgstr "Raggruppa:"
msgctxt "#33022"
msgid ""
"Detected the database needs to be recreated for this version of Jellyfin for "
"Kodi. Proceed?"
msgstr ""
"Rilevato che il database deve essere ricreato per questa versione di Jellyfin "
"per Kodi. Procedere?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
"Jellyfin per Kodi non funzionerà correttamente fino al ripristino del database."
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"

View file

@ -438,14 +438,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "" msgstr ""
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr ""
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "" msgstr ""

View file

@ -442,14 +442,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Verzamelen:" msgstr "Verzamelen:"
msgctxt "#33022"
msgid ""
"Detected the database needs to be recreated for this version of Jellyfin for "
"Kodi. Proceed?"
msgstr ""
"De databank moet opnieuw gemaakt worden voor deze versie van Jellyfin for Kodi. "
"Verder gaan?"
msgctxt "#33023" msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset." msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr "Jellyfin for Kodi werkt niet correct voor dat de databank gereset is." msgstr "Jellyfin for Kodi werkt niet correct voor dat de databank gereset is."

View file

@ -442,18 +442,7 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Pobieranie:" msgstr "Pobieranie:"
msgctxt "#33022"
msgid ""
"Detected the database needs to be recreated for this version of Jellyfin for "
"Kodi. Proceed?"
msgstr ""
"Wykryto konieczność rekonstrukcji bazy dla tej wersji Jellyfin dla Kodi. "
"Kontynuować?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
"Jellyfin dla Kodi nie będzie działało poprawnie dopóki baza nie zostanie "
"zresetowana." "zresetowana."
msgctxt "#33025" msgctxt "#33025"

View file

@ -443,14 +443,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "" msgstr ""
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr ""
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "" msgstr ""

View file

@ -441,14 +441,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "" msgstr ""
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr ""
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "" msgstr ""

View file

@ -442,18 +442,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "Сбор:" msgstr "Сбор:"
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr ""
"Обнаружено, что база данных должна быть пересоздана для этой версии Jellyfin "
"для Kodi. Приступить?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr ""
"ellyfin for Kodi не будет работать корректно, пока база данных не будет "
"сброшена."
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "Завершится в течение:" msgstr "Завершится в течение:"

View file

@ -441,14 +441,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "收集:" msgstr "收集:"
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr "检测到需要为 Kodi 的此版本的 Jellyfin 重新创建数据库。是否继续?"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr "在重置数据库之前Kodi 的 Jellyfin 将不能正常工作。"
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "完成于:" msgstr "完成于:"

View file

@ -438,14 +438,6 @@ msgctxt "#33021"
msgid "Gathering:" msgid "Gathering:"
msgstr "收藏:" msgstr "收藏:"
msgctxt "#33022"
msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?"
msgstr "检测到的数据库必须由此版本Jellyfin for Kodi重建是否继续"
msgctxt "#33023"
msgid "Jellyfin for Kodi will not work correctly until the database is reset."
msgstr "在数据库重置前Jellyfin for Kodi无法正常使用"
msgctxt "#33025" msgctxt "#33025"
msgid "Completed in:" msgid "Completed in:"
msgstr "剩余时间:" msgstr "剩余时间:"

View file

@ -146,18 +146,3 @@ class JellyfinDatabase():
def remove_media_by_parent_id(self, *args): def remove_media_by_parent_id(self, *args):
self.cursor.execute(QU.delete_media_by_parent_id, args) self.cursor.execute(QU.delete_media_by_parent_id, args)
def get_version(self, version=None):
if version is not None:
self.cursor.execute(QU.delete_version)
self.cursor.execute(QU.add_version, (version,))
else:
try:
self.cursor.execute(QU.get_version)
version = self.cursor.fetchone()[0]
except Exception as error:
LOG.exception(error)
return version

View file

@ -88,7 +88,6 @@ SELECT idVersion
FROM version FROM version
""" """
add_reference = """ add_reference = """
INSERT OR REPLACE INTO jellyfin(jellyfin_id, kodi_id, kodi_fileid, kodi_pathid, jellyfin_type, INSERT OR REPLACE INTO jellyfin(jellyfin_id, kodi_id, kodi_fileid, kodi_pathid, jellyfin_type,
media_type, parent_id, checksum, media_folder, jellyfin_parent_id) media_type, parent_id, checksum, media_folder, jellyfin_parent_id)
@ -113,7 +112,6 @@ INSERT OR REPLACE INTO version(idVersion)
VALUES (?) VALUES (?)
""" """
update_reference = """ update_reference = """
UPDATE jellyfin UPDATE jellyfin
SET checksum = ? SET checksum = ?

View file

@ -68,7 +68,6 @@ class Service(xbmc.Monitor):
LOG.info("Using dynamic paths: %s", settings('useDirectPaths') == "0") LOG.info("Using dynamic paths: %s", settings('useDirectPaths') == "0")
LOG.info("Log Level: %s", self.settings['log_level']) LOG.info("Log Level: %s", self.settings['log_level'])
self.check_version()
verify_kodi_defaults() verify_kodi_defaults()
try: try:
@ -147,29 +146,6 @@ class Service(xbmc.Monitor):
self.library_thread.stop_client() self.library_thread.stop_client()
self.library_thread = None self.library_thread = None
def check_version(self):
''' Check the database version to ensure we do not need to do a reset.
'''
with Database('jellyfin') as jellyfindb:
version = jellyfin_db.JellyfinDatabase(jellyfindb.cursor).get_version()
LOG.info("---[ db/%s ]", version)
if version and compare_version(version, "3.1.0") < 0:
resp = dialog("yesno", heading=_('addon_name'), line1=_(33022))
if not resp:
LOG.warning("Database version is out of date! USER IGNORED!")
dialog("ok", heading=_('addon_name'), line1=_(33023))
raise Exception("User backed out of a required database reset")
else:
reset()
raise Exception("Completed database reset")
def onNotification(self, sender, method, data): def onNotification(self, sender, method, data):
''' All notifications are sent via NotifyAll built-in or Kodi. ''' All notifications are sent via NotifyAll built-in or Kodi.