Merge pull request #1663 from croneter/python3-beta

Bump Python 3 Master
2021-10-16 11:47:09 +02:00 · 2021-10-16 11:47:09 +02:00 · 048f11a4ce
commit 048f11a4ce
parent 389be72ee2 aa917a233f
28 changed files with 379 additions and 40 deletions
--- a/addon.xml
+++ b/addon.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.5.3" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.5.4" provider-name="croneter">
  <requires>
    <import addon="xbmc.python" version="3.0.0"/>
    <import addon="script.module.requests" version="2.22.0+matrix.1" />
@ -91,7 +91,11 @@
    <summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary>
    <description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description>
    <disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer>
-    <news>version 3.5.3:
+    <news>version 3.5.4:
+- Fix Receiving init() missing 1 required positional argument: ‘certification_country’
+- Update translations from Transifex
+
+version 3.5.3:
 - Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start

 version 3.5.2:
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,7 @@
+version 3.5.4:
+- Fix Receiving init() missing 1 required positional argument: ‘certification_country’
+- Update translations from Transifex
+
 version 3.5.3:
 - Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start

--- a/resources/language/resource.language.cs_CZ/strings.po
+++ b/resources/language/resource.language.cs_CZ/strings.po
@ -702,6 +702,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Vynutit překódování obrázků"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.da_DK/strings.po
+++ b/resources/language/resource.language.da_DK/strings.po
@ -702,6 +702,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Transcode billeder"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.de_DE/strings.po
+++ b/resources/language/resource.language.de_DE/strings.po
@ -715,6 +715,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Bilder immer transkodieren"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr "Ersten Videostream wählen, wenn mehrere Versionen vorhanden sind"
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr "Wer wählt den Audiotrack beim Start der Wiedergabe?"
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr "Wer wählt Untertitel beim Start der Wiedergabe?"
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.el_GR/strings.po
+++ b/resources/language/resource.language.el_GR/strings.po
@ -690,6 +690,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr ""

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.es_AR/strings.po
+++ b/resources/language/resource.language.es_AR/strings.po
@ -710,6 +710,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Obligar transcodificar fotografías"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.es_ES/strings.po
+++ b/resources/language/resource.language.es_ES/strings.po
@ -712,6 +712,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Obligar transcodificar fotografías"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.es_MX/strings.po
+++ b/resources/language/resource.language.es_MX/strings.po
@ -710,6 +710,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Obligar transcodificar fotografías"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.fr_CA/strings.po
+++ b/resources/language/resource.language.fr_CA/strings.po
@ -715,6 +715,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Forcer le transcodage des images"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.fr_FR/strings.po
+++ b/resources/language/resource.language.fr_FR/strings.po
@ -719,6 +719,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Forcer le transcodage des images"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.hu_HU/strings.po
+++ b/resources/language/resource.language.hu_HU/strings.po
@ -718,6 +718,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Képek transzkódolásának kényszerítése"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.it_IT/strings.po
+++ b/resources/language/resource.language.it_IT/strings.po
@ -710,6 +710,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Forza transcodifica immagini"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.ko_KR/strings.po
+++ b/resources/language/resource.language.ko_KR/strings.po
@ -697,6 +697,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "사진 트랜스 코딩 강제"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.lt_LT/strings.po
+++ b/resources/language/resource.language.lt_LT/strings.po
@ -706,6 +706,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Priverstinai perkoduoti nuotraukas"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.lv_LV/strings.po
+++ b/resources/language/resource.language.lv_LV/strings.po
@ -699,6 +699,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Uzspiest attēlu pārkodēšanu"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.nl_NL/strings.po
+++ b/resources/language/resource.language.nl_NL/strings.po
@ -707,6 +707,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Forceer transcoden van foto's"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.no_NO/strings.po
+++ b/resources/language/resource.language.no_NO/strings.po
@ -704,6 +704,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Tving transkoding av bilde"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.pl_PL/strings.po
+++ b/resources/language/resource.language.pl_PL/strings.po
@ -3,7 +3,7 @@
 # Croneter None <croneter@gmail.com>, 2017
 # Wiktor Dackiewicz <wiktor.dackiewicz@gmail.com>, 2017
 # Kacpolz <kacperbrzozowski123@gmail.com>, 2019
-# Top Secret <spam210195@gmail.com>, 2020
+# Ziuta <spam210195@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: croneter@gmail.com\n"
 "POT-Creation-Date: 2017-04-15 13:13+0000\n"
 "PO-Revision-Date: 2017-04-30 08:30+0000\n"
-"Last-Translator: Top Secret <spam210195@gmail.com>, 2020\n"
+"Last-Translator: Ziuta <spam210195@gmail.com>, 2020\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/croneter/teams/73837/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -695,6 +695,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr ""

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.pt_BR/strings.po
+++ b/resources/language/resource.language.pt_BR/strings.po
@ -694,6 +694,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Forçar transcodificação de imagens"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.pt_PT/strings.po
+++ b/resources/language/resource.language.pt_PT/strings.po
@ -697,6 +697,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Forçar transcodificação de imagens"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.ru_RU/strings.po
+++ b/resources/language/resource.language.ru_RU/strings.po
@ -711,6 +711,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Принудительно транскодировать изображения"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.sv_SE/strings.po
+++ b/resources/language/resource.language.sv_SE/strings.po
@ -706,6 +706,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Tvinga omkodning av bilder"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.uk_UA/strings.po
+++ b/resources/language/resource.language.uk_UA/strings.po
@ -706,6 +706,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "Примусове перекодування зображень"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.zh_CN/strings.po
+++ b/resources/language/resource.language.zh_CN/strings.po
@ -689,6 +689,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "强制图片转码"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.zh_TW/strings.po
+++ b/resources/language/resource.language.zh_TW/strings.po
@ -687,6 +687,21 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr "強制圖片轉碼"

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/lib/itemtypes/movies_tmdb.py
+++ b/resources/lib/itemtypes/movies_tmdb.py
@ -1,35 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import logging
-import os
-import sys
-
-import xbmcvfs
-import xbmcaddon
-
-# Import the existing Kodi add-on metadata.themoviedb.org.python
-__ADDON__ = xbmcaddon.Addon(id='metadata.themoviedb.org.python')
-__TEMP_PATH__ = os.path.join(__ADDON__.getAddonInfo('path'), 'python', 'lib')
-__BASE__ = xbmcvfs.translatePath(__TEMP_PATH__)
-sys.path.append(__BASE__)
-import tmdbscraper.tmdb as tmdb
-
-logger = logging.getLogger('PLEX.movies_tmdb')
-
-
-def get_tmdb_scraper(settings):
-    language = settings.getSettingString('language')
-    certcountry = settings.getSettingString('tmdbcertcountry')
-    return tmdb.TMDBMovieScraper(__ADDON__, language, certcountry)
-
-
-# Instantiate once in order to prevent having to re-read the add-on settings
-# for every single movie
-__SCRAPER__ = get_tmdb_scraper(__ADDON__)
-
-def get_tmdb_details(unique_ids):
-    details = __SCRAPER__.get_details(unique_ids)
-    if 'error' in details:
-        logger.debug('Could not get tmdb details for %s. Error: %s',
-                     unique_ids, details)
-    return details
--- a/resources/lib/library_sync/additional_metadata_tmdb.py
+++ b/resources/lib/library_sync/additional_metadata_tmdb.py
@ -27,6 +27,12 @@ TMDB_SUPPORTED_IDS = ('tmdb', 'imdb')
 def get_tmdb_scraper(settings):
    language = settings.getSettingString('language')
    certcountry = settings.getSettingString('tmdbcertcountry')
+    # Simplify this in the future
+    # See https://github.com/croneter/PlexKodiConnect/issues/1657
+    search_language = settings.getSettingString('searchlanguage')
+    if search_language:
+        return tmdb.TMDBMovieScraper(settings, language, certcountry, search_language)
+    else:
        return tmdb.TMDBMovieScraper(settings, language, certcountry)