Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 04:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge upstream master

Browse source
This commit is contained in:
TrueTechy 2019-10-06 15:14:43 +01:00
parent 6e06a6f5f7
commit b217352681
16 changed files with 0 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/language/resource.language.de_de/strings.po
View file

@ -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:"

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

@ -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 ""

12
resources/language/resource.language.es/strings.po
View file

@ -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:"

12
resources/language/resource.language.fr_fr/strings.po
View file

@ -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 :"

11
resources/language/resource.language.it_it/strings.po
View file

@ -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:"

8
resources/language/resource.language.kk/strings.po
View file

@ -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 ""

8
resources/language/resource.language.nl_nl/strings.po
View file

@ -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."

11
resources/language/resource.language.pl_pl/strings.po
View file

@ -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"

8
resources/language/resource.language.pt_BR/strings.po
View file

@ -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 ""

8
resources/language/resource.language.pt_PT/strings.po
View file

@ -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 ""

12
resources/language/resource.language.ru/strings.po
View file

@ -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 "Завершится в течение:"

8
resources/language/resource.language.zh_Hans/strings.po
View file

@ -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 "完成于："

8
resources/language/resource.language.zh_cn/strings.po
View file

@ -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 "剩余时间："

15
resources/lib/database/jellyfin_db.py
View file

@ -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

2
resources/lib/database/queries.py
View file

@ -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 = ?

24
resources/lib/entrypoint/service.py
View file

@ -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.