From 20e6a3d24cb785a94d9047de546096a58269acf9 Mon Sep 17 00:00:00 2001 From: Christopher Kaliszewski Date: Sun, 24 Oct 2021 01:50:15 -0400 Subject: [PATCH] Add auto skip intro functionality --- resources/language/resource.language.cs_CZ/strings.po | 7 ++++++- resources/language/resource.language.da_DK/strings.po | 7 ++++++- resources/language/resource.language.de_DE/strings.po | 7 ++++++- resources/language/resource.language.el_GR/strings.po | 7 ++++++- resources/language/resource.language.en_gb/strings.po | 9 +++++++-- resources/language/resource.language.es_AR/strings.po | 7 ++++++- resources/language/resource.language.es_ES/strings.po | 7 ++++++- resources/language/resource.language.es_MX/strings.po | 7 ++++++- resources/language/resource.language.fr_CA/strings.po | 7 ++++++- resources/language/resource.language.fr_FR/strings.po | 7 ++++++- resources/language/resource.language.hu_HU/strings.po | 7 ++++++- resources/language/resource.language.it_IT/strings.po | 7 ++++++- resources/language/resource.language.ko_KR/strings.po | 7 ++++++- resources/language/resource.language.lt_LT/strings.po | 7 ++++++- resources/language/resource.language.lv_LV/strings.po | 7 ++++++- resources/language/resource.language.nl_NL/strings.po | 7 ++++++- resources/language/resource.language.no_NO/strings.po | 7 ++++++- resources/language/resource.language.pl_PL/strings.po | 7 ++++++- resources/language/resource.language.pt_BR/strings.po | 7 ++++++- resources/language/resource.language.pt_PT/strings.po | 7 ++++++- resources/language/resource.language.ru_RU/strings.po | 7 ++++++- resources/language/resource.language.sv_SE/strings.po | 7 ++++++- resources/language/resource.language.uk_UA/strings.po | 7 ++++++- resources/language/resource.language.zh_CN/strings.po | 7 ++++++- resources/language/resource.language.zh_TW/strings.po | 7 ++++++- resources/lib/skip_plex_intro.py | 8 ++++++-- resources/lib/windows/skip_intro.py | 7 +++++-- resources/settings.xml | 3 ++- 28 files changed, 164 insertions(+), 31 deletions(-) diff --git a/resources/language/resource.language.cs_CZ/strings.po b/resources/language/resource.language.cs_CZ/strings.po index 13f7d9c6..8380a357 100644 --- a/resources/language/resource.language.cs_CZ/strings.po +++ b/resources/language/resource.language.cs_CZ/strings.po @@ -2,7 +2,7 @@ # Translators: # Croneter None , 2017 # Michal Kuncl , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1676,3 +1676,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Nahradit uživatelské hodnocení počtem verzí média" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.da_DK/strings.po b/resources/language/resource.language.da_DK/strings.po index c6162e93..1c94ece0 100644 --- a/resources/language/resource.language.da_DK/strings.po +++ b/resources/language/resource.language.da_DK/strings.po @@ -3,7 +3,7 @@ # Croneter None , 2017 # Thomas H. , 2019 # coz2001 , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1684,3 +1684,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Erstat brugerbedømmelser med antal af medieversioner" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.de_DE/strings.po b/resources/language/resource.language.de_DE/strings.po index 7f18ec32..7a3d33a3 100644 --- a/resources/language/resource.language.de_DE/strings.po +++ b/resources/language/resource.language.de_DE/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # Croneter None , 2021 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1713,3 +1713,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Benutzerbewertungen durch verfügbare Anzahl Versionen ersetzen" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.el_GR/strings.po b/resources/language/resource.language.el_GR/strings.po index ac4eb2a2..e223c336 100644 --- a/resources/language/resource.language.el_GR/strings.po +++ b/resources/language/resource.language.el_GR/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # Croneter None , 2017 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1601,3 +1601,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index c930a0a7..220a4ab1 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -1139,12 +1139,12 @@ msgctxt "#39082" msgid "Direct Paths" msgstr "" -# Dialog for manually entering PMS +# Dialog for manually entering PMS msgctxt "#39083" msgid "Enter PMS IP or URL" msgstr "" -# Dialog for manually entering PMS +# Dialog for manually entering PMS msgctxt "#39084" msgid "Enter PMS port" msgstr "" @@ -1501,3 +1501,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.es_AR/strings.po b/resources/language/resource.language.es_AR/strings.po index 299dc9e8..addfa449 100644 --- a/resources/language/resource.language.es_AR/strings.po +++ b/resources/language/resource.language.es_AR/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # Croneter None , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1699,3 +1699,8 @@ msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" "Reemplazar valoraciones de usuario con cantidad de versiones de medios" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.es_ES/strings.po b/resources/language/resource.language.es_ES/strings.po index ba8f2c17..53528953 100644 --- a/resources/language/resource.language.es_ES/strings.po +++ b/resources/language/resource.language.es_ES/strings.po @@ -3,7 +3,7 @@ # Dani , 2019 # Bartolome Soriano , 2019 # Croneter None , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1701,3 +1701,8 @@ msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" "Reemplazar valoraciones de usuario con cantidad de versiones de medios" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.es_MX/strings.po b/resources/language/resource.language.es_MX/strings.po index 29c14f97..a11da862 100644 --- a/resources/language/resource.language.es_MX/strings.po +++ b/resources/language/resource.language.es_MX/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # Croneter None , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1699,3 +1699,8 @@ msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" "Reemplazar valoraciones de usuario con cantidad de versiones de medios" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.fr_CA/strings.po b/resources/language/resource.language.fr_CA/strings.po index 9714c428..d9afe371 100644 --- a/resources/language/resource.language.fr_CA/strings.po +++ b/resources/language/resource.language.fr_CA/strings.po @@ -3,7 +3,7 @@ # Elixir59, 2019 # Croneter None , 2020 # Raph Mell, 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1719,3 +1719,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Remplacer les notes d'utilisateurs par le nombre de versions du média" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.fr_FR/strings.po b/resources/language/resource.language.fr_FR/strings.po index dd1ddb09..3d0e8f14 100644 --- a/resources/language/resource.language.fr_FR/strings.po +++ b/resources/language/resource.language.fr_FR/strings.po @@ -7,7 +7,7 @@ # julien benoist , 2019 # Croneter None , 2020 # Raph Mell, 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1723,3 +1723,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Remplacer les notes d'utilisateurs par le nombre de versions du média" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.hu_HU/strings.po b/resources/language/resource.language.hu_HU/strings.po index 04cd89f3..b37c17ab 100644 --- a/resources/language/resource.language.hu_HU/strings.po +++ b/resources/language/resource.language.hu_HU/strings.po @@ -2,7 +2,7 @@ # Translators: # Croneter None , 2019 # Savage93 , 2021 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1712,3 +1712,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Felhasználói osztályzatok lecserélése a médiaverziók számára" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.it_IT/strings.po b/resources/language/resource.language.it_IT/strings.po index a08dee26..a75735e4 100644 --- a/resources/language/resource.language.it_IT/strings.po +++ b/resources/language/resource.language.it_IT/strings.po @@ -4,7 +4,7 @@ # Angela Calò , 2018 # Cristiano Bozzi , 2018 # Luigi Mantellini , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1711,3 +1711,8 @@ msgid "Replace user ratings with number of media versions" msgstr "" "Sostituisci la valutazione contenuti con il numero delle versioni del " "contenuto disponibili" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.ko_KR/strings.po b/resources/language/resource.language.ko_KR/strings.po index 7752a1f8..f101f690 100644 --- a/resources/language/resource.language.ko_KR/strings.po +++ b/resources/language/resource.language.ko_KR/strings.po @@ -7,7 +7,7 @@ # k irbymaker , 2020 # Croneter None , 2021 # so.o.bima , 2021 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1632,3 +1632,8 @@ msgstr "사용자 지정 사용자 등급을 보유하고있는 미디어 항목 msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "사용자 등급을 미디어 버전 수로 대체" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.lt_LT/strings.po b/resources/language/resource.language.lt_LT/strings.po index c618ae10..587ed2a4 100644 --- a/resources/language/resource.language.lt_LT/strings.po +++ b/resources/language/resource.language.lt_LT/strings.po @@ -2,7 +2,7 @@ # Translators: # tigriso1 , 2019 # Egidijus Mz , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1697,3 +1697,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Pakeiskite naudotojų reitingus medijos versijų skaičiumi" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.lv_LV/strings.po b/resources/language/resource.language.lv_LV/strings.po index fd869e8b..ad8b7be1 100644 --- a/resources/language/resource.language.lv_LV/strings.po +++ b/resources/language/resource.language.lv_LV/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # marcisbe , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1632,3 +1632,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.nl_NL/strings.po b/resources/language/resource.language.nl_NL/strings.po index 0aacdd81..62068bb3 100644 --- a/resources/language/resource.language.nl_NL/strings.po +++ b/resources/language/resource.language.nl_NL/strings.po @@ -5,7 +5,7 @@ # Panja0 , 2019 # Nick Corthals , 2019 # Rick van Soest , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1683,3 +1683,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Vervang ratings met aantal media versies" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.no_NO/strings.po b/resources/language/resource.language.no_NO/strings.po index c0e44000..6978927c 100644 --- a/resources/language/resource.language.no_NO/strings.po +++ b/resources/language/resource.language.no_NO/strings.po @@ -3,7 +3,7 @@ # Croneter None , 2017 # Jon Mjørud , 2017 # Kyb ntnu, 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1677,3 +1677,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Erstatt rating med antall versjoner av media" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.pl_PL/strings.po b/resources/language/resource.language.pl_PL/strings.po index a0660851..808c38f5 100644 --- a/resources/language/resource.language.pl_PL/strings.po +++ b/resources/language/resource.language.pl_PL/strings.po @@ -4,7 +4,7 @@ # Wiktor Dackiewicz , 2017 # Kacpolz , 2019 # Ziuta , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1606,3 +1606,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.pt_BR/strings.po b/resources/language/resource.language.pt_BR/strings.po index 71396a79..d85197ab 100644 --- a/resources/language/resource.language.pt_BR/strings.po +++ b/resources/language/resource.language.pt_BR/strings.po @@ -2,7 +2,7 @@ # Translators: # Croneter None , 2017 # Daniel Leite , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1674,3 +1674,8 @@ msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" "Substituir classificações do utilizador com numero de versões de média" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.pt_PT/strings.po b/resources/language/resource.language.pt_PT/strings.po index 41484f77..d3558288 100644 --- a/resources/language/resource.language.pt_PT/strings.po +++ b/resources/language/resource.language.pt_PT/strings.po @@ -3,7 +3,7 @@ # Croneter None , 2017 # Goncalo Campos , 2018 # Bruno Guerreiro , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1677,3 +1677,8 @@ msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" "Substituir classificações do utilizador com numero de versões de média" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.ru_RU/strings.po b/resources/language/resource.language.ru_RU/strings.po index 047e8fab..73f64f9f 100644 --- a/resources/language/resource.language.ru_RU/strings.po +++ b/resources/language/resource.language.ru_RU/strings.po @@ -6,7 +6,7 @@ # Alex Freit , 2019 # Vladimir Supranenok , 2019 # Vlad Anisimov , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1691,3 +1691,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Заменить пользовательский рейтинг счетчиком версий элемента" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.sv_SE/strings.po b/resources/language/resource.language.sv_SE/strings.po index 8d87d11c..dd33a53a 100644 --- a/resources/language/resource.language.sv_SE/strings.po +++ b/resources/language/resource.language.sv_SE/strings.po @@ -7,7 +7,7 @@ # Nisse Karlsson , 2019 # Ludwig Johnson , 2019 # namob , 2021 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1685,3 +1685,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Ersätt användarbetyg med antalet mediaobjekt" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.uk_UA/strings.po b/resources/language/resource.language.uk_UA/strings.po index 95be95d7..385c5f58 100644 --- a/resources/language/resource.language.uk_UA/strings.po +++ b/resources/language/resource.language.uk_UA/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # Vlad Anisimov , 2020 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1691,3 +1691,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "Замінити користувацький рейтинг лічильником версій елемента" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.zh_CN/strings.po b/resources/language/resource.language.zh_CN/strings.po index d9eda772..2671bb36 100644 --- a/resources/language/resource.language.zh_CN/strings.po +++ b/resources/language/resource.language.zh_CN/strings.po @@ -3,7 +3,7 @@ # Croneter None , 2017 # Tony Z , 2017 # Jingen Chen , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1602,3 +1602,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/language/resource.language.zh_TW/strings.po b/resources/language/resource.language.zh_TW/strings.po index dfdcb423..401c689b 100644 --- a/resources/language/resource.language.zh_TW/strings.po +++ b/resources/language/resource.language.zh_TW/strings.po @@ -1,7 +1,7 @@ # XBMC Media Center language file # Translators: # Croneter None , 2017 -# +# msgid "" msgstr "" "Project-Id-Version: PlexKodiConnect\n" @@ -1598,3 +1598,8 @@ msgstr "" msgctxt "#39719" msgid "Replace user ratings with number of media versions" msgstr "" + +# PKC Settings - Playback +msgctxt "#39720" +msgid "Auto skip intro" +msgstr "" diff --git a/resources/lib/skip_plex_intro.py b/resources/lib/skip_plex_intro.py index b3590cab..3ab4cddc 100644 --- a/resources/lib/skip_plex_intro.py +++ b/resources/lib/skip_plex_intro.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- from .windows.skip_intro import SkipIntroDialog -from . import app, variables as v +from . import app, utils, variables as v def skip_intro(intros): @@ -20,7 +20,11 @@ def skip_intro(intros): 'default', '1080i', intro_end=end) - app.APP.skip_intro_dialog.show() + + if utils.settings('enableAutoSkipIntro') == "true": + app.APP.skip_intro_dialog.seekTimeToIntroEnd() + else: + app.APP.skip_intro_dialog.show() elif not in_intro and app.APP.skip_intro_dialog is not None: app.APP.skip_intro_dialog.close() app.APP.skip_intro_dialog = None diff --git a/resources/lib/windows/skip_intro.py b/resources/lib/windows/skip_intro.py index fa66582b..75e9b9be 100644 --- a/resources/lib/windows/skip_intro.py +++ b/resources/lib/windows/skip_intro.py @@ -36,12 +36,15 @@ class SkipIntroDialog(WindowXMLDialog): logger.debug('Closing dialog') WindowXMLDialog.close(self) + def seekTimeToIntroEnd(self): + logger.info('Skipping intro, seeking to %s', self.intro_end) + app.APP.player.seekTime(self.intro_end) + def onClick(self, control_id): # pylint: disable=invalid-name if self.intro_end and control_id == 3002: # 3002 = Skip Intro button if app.APP.is_playing: self.on_hold = True - logger.info('Skipping intro, seeking to %s', self.intro_end) - app.APP.player.seekTime(self.intro_end) + self.seekTimeToIntroEnd() self.close() def onAction(self, action): # pylint: disable=invalid-name diff --git a/resources/settings.xml b/resources/settings.xml index 46066caf..231b62a5 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -114,6 +114,7 @@ + @@ -142,7 +143,7 @@ - +