From b21735268116ca619310dd0b1dfe079e5433ed3c Mon Sep 17 00:00:00 2001
From: TrueTechy <abbygourlay98@gmail.com>
Date: Sun, 6 Oct 2019 15:14:43 +0100
Subject: [PATCH] merge upstream master

---
 .../resource.language.de_de/strings.po        | 11 ---------
 .../resource.language.en_gb/strings.po        |  8 -------
 .../language/resource.language.es/strings.po  | 12 ----------
 .../resource.language.fr_fr/strings.po        | 12 ----------
 .../resource.language.it_it/strings.po        | 11 ---------
 .../language/resource.language.kk/strings.po  |  8 -------
 .../resource.language.nl_nl/strings.po        |  8 -------
 .../resource.language.pl_pl/strings.po        | 11 ---------
 .../resource.language.pt_BR/strings.po        |  8 -------
 .../resource.language.pt_PT/strings.po        |  8 -------
 .../language/resource.language.ru/strings.po  | 12 ----------
 .../resource.language.zh_Hans/strings.po      |  8 -------
 .../resource.language.zh_cn/strings.po        |  8 -------
 resources/lib/database/jellyfin_db.py         | 15 ------------
 resources/lib/database/queries.py             |  2 --
 resources/lib/entrypoint/service.py           | 24 -------------------
 16 files changed, 166 deletions(-)

diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po
index 165a329c..f7ccf433 100644
--- a/resources/language/resource.language.de_de/strings.po
+++ b/resources/language/resource.language.de_de/strings.po
@@ -444,18 +444,7 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 10c58d90..79250012 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -438,14 +438,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr ""
diff --git a/resources/language/resource.language.es/strings.po b/resources/language/resource.language.es/strings.po
index 1cb0d94b..e54c0c6e 100644
--- a/resources/language/resource.language.es/strings.po
+++ b/resources/language/resource.language.es/strings.po
@@ -441,18 +441,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr "Completado en:"
diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po
index 81c9047c..3f8c9297 100644
--- a/resources/language/resource.language.fr_fr/strings.po
+++ b/resources/language/resource.language.fr_fr/strings.po
@@ -443,18 +443,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr "Terminé en :"
diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po
index ed73f169..0ba22661 100644
--- a/resources/language/resource.language.it_it/strings.po
+++ b/resources/language/resource.language.it_it/strings.po
@@ -442,18 +442,7 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
diff --git a/resources/language/resource.language.kk/strings.po b/resources/language/resource.language.kk/strings.po
index 9ee7be40..38216165 100644
--- a/resources/language/resource.language.kk/strings.po
+++ b/resources/language/resource.language.kk/strings.po
@@ -438,14 +438,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr ""
diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
index 393c5175..c0e1696a 100644
--- a/resources/language/resource.language.nl_nl/strings.po
+++ b/resources/language/resource.language.nl_nl/strings.po
@@ -442,14 +442,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 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."
diff --git a/resources/language/resource.language.pl_pl/strings.po b/resources/language/resource.language.pl_pl/strings.po
index 578e5f96..f287e8df 100644
--- a/resources/language/resource.language.pl_pl/strings.po
+++ b/resources/language/resource.language.pl_pl/strings.po
@@ -442,18 +442,7 @@ msgctxt "#33021"
 msgid "Gathering:"
 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."
 
 msgctxt "#33025"
diff --git a/resources/language/resource.language.pt_BR/strings.po b/resources/language/resource.language.pt_BR/strings.po
index b02f3ab4..2acb560a 100644
--- a/resources/language/resource.language.pt_BR/strings.po
+++ b/resources/language/resource.language.pt_BR/strings.po
@@ -443,14 +443,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr ""
diff --git a/resources/language/resource.language.pt_PT/strings.po b/resources/language/resource.language.pt_PT/strings.po
index e81908a4..2e14de90 100644
--- a/resources/language/resource.language.pt_PT/strings.po
+++ b/resources/language/resource.language.pt_PT/strings.po
@@ -441,14 +441,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr ""
diff --git a/resources/language/resource.language.ru/strings.po b/resources/language/resource.language.ru/strings.po
index 6676e350..796bfc2c 100644
--- a/resources/language/resource.language.ru/strings.po
+++ b/resources/language/resource.language.ru/strings.po
@@ -442,18 +442,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr "Завершится в течение:"
diff --git a/resources/language/resource.language.zh_Hans/strings.po b/resources/language/resource.language.zh_Hans/strings.po
index da006663..bcaafe9f 100644
--- a/resources/language/resource.language.zh_Hans/strings.po
+++ b/resources/language/resource.language.zh_Hans/strings.po
@@ -441,14 +441,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr "完成于："
diff --git a/resources/language/resource.language.zh_cn/strings.po b/resources/language/resource.language.zh_cn/strings.po
index 39b97a4d..c2c66b5f 100644
--- a/resources/language/resource.language.zh_cn/strings.po
+++ b/resources/language/resource.language.zh_cn/strings.po
@@ -438,14 +438,6 @@ msgctxt "#33021"
 msgid "Gathering:"
 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"
 msgid "Completed in:"
 msgstr "剩余时间："
diff --git a/resources/lib/database/jellyfin_db.py b/resources/lib/database/jellyfin_db.py
index 1b448f06..ca9cb50b 100644
--- a/resources/lib/database/jellyfin_db.py
+++ b/resources/lib/database/jellyfin_db.py
@@ -146,18 +146,3 @@ class JellyfinDatabase():
 
     def remove_media_by_parent_id(self, *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
diff --git a/resources/lib/database/queries.py b/resources/lib/database/queries.py
index a11021cf..0efc1c75 100644
--- a/resources/lib/database/queries.py
+++ b/resources/lib/database/queries.py
@@ -88,7 +88,6 @@ SELECT      idVersion
 FROM        version
 """
 
-
 add_reference = """
 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)
@@ -113,7 +112,6 @@ INSERT OR REPLACE INTO      version(idVersion)
 VALUES                      (?)
 """
 
-
 update_reference = """
 UPDATE      jellyfin
 SET         checksum = ?
diff --git a/resources/lib/entrypoint/service.py b/resources/lib/entrypoint/service.py
index 706dbf89..2e8e9163 100644
--- a/resources/lib/entrypoint/service.py
+++ b/resources/lib/entrypoint/service.py
@@ -68,7 +68,6 @@ class Service(xbmc.Monitor):
         LOG.info("Using dynamic paths: %s", settings('useDirectPaths') == "0")
         LOG.info("Log Level: %s", self.settings['log_level'])
 
-        self.check_version()
         verify_kodi_defaults()
 
         try:
@@ -147,29 +146,6 @@ class Service(xbmc.Monitor):
             self.library_thread.stop_client()
             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):
 
         ''' All notifications are sent via NotifyAll built-in or Kodi.