Merge pull request #1680 from OpenNOX/opennox/add-auto-intro-skip

Add auto skip intro functionality
2021-10-30 18:51:33 +02:00 · 2021-10-30 18:51:33 +02:00 · d8bb852867
commit d8bb852867
parent ce37820649 20e6a3d24c
28 changed files with 164 additions and 31 deletions
--- a/resources/language/resource.language.cs_CZ/strings.po
+++ b/resources/language/resource.language.cs_CZ/strings.po
@ -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 ""
--- a/resources/language/resource.language.da_DK/strings.po
+++ b/resources/language/resource.language.da_DK/strings.po
@ -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 ""
--- a/resources/language/resource.language.de_DE/strings.po
+++ b/resources/language/resource.language.de_DE/strings.po
@ -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 ""
--- a/resources/language/resource.language.el_GR/strings.po
+++ b/resources/language/resource.language.el_GR/strings.po
@ -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 ""
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@ -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 ""
--- a/resources/language/resource.language.es_AR/strings.po
+++ b/resources/language/resource.language.es_AR/strings.po
@ -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 ""
--- a/resources/language/resource.language.es_ES/strings.po
+++ b/resources/language/resource.language.es_ES/strings.po
@ -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 ""
--- a/resources/language/resource.language.es_MX/strings.po
+++ b/resources/language/resource.language.es_MX/strings.po
@ -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 ""
--- a/resources/language/resource.language.fr_CA/strings.po
+++ b/resources/language/resource.language.fr_CA/strings.po
@ -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 ""
--- a/resources/language/resource.language.fr_FR/strings.po
+++ b/resources/language/resource.language.fr_FR/strings.po
@ -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 ""
--- a/resources/language/resource.language.hu_HU/strings.po
+++ b/resources/language/resource.language.hu_HU/strings.po
@ -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 ""
--- a/resources/language/resource.language.it_IT/strings.po
+++ b/resources/language/resource.language.it_IT/strings.po
@ -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 ""
--- a/resources/language/resource.language.ko_KR/strings.po
+++ b/resources/language/resource.language.ko_KR/strings.po
@ -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 ""
--- a/resources/language/resource.language.lt_LT/strings.po
+++ b/resources/language/resource.language.lt_LT/strings.po
@ -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 ""
--- a/resources/language/resource.language.lv_LV/strings.po
+++ b/resources/language/resource.language.lv_LV/strings.po
@ -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 ""
--- a/resources/language/resource.language.nl_NL/strings.po
+++ b/resources/language/resource.language.nl_NL/strings.po
@ -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 ""
--- a/resources/language/resource.language.no_NO/strings.po
+++ b/resources/language/resource.language.no_NO/strings.po
@ -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 ""
--- a/resources/language/resource.language.pl_PL/strings.po
+++ b/resources/language/resource.language.pl_PL/strings.po
@ -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 ""
--- a/resources/language/resource.language.pt_BR/strings.po
+++ b/resources/language/resource.language.pt_BR/strings.po
@ -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 ""
--- a/resources/language/resource.language.pt_PT/strings.po
+++ b/resources/language/resource.language.pt_PT/strings.po
@ -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 ""
--- a/resources/language/resource.language.ru_RU/strings.po
+++ b/resources/language/resource.language.ru_RU/strings.po
@ -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 ""
--- a/resources/language/resource.language.sv_SE/strings.po
+++ b/resources/language/resource.language.sv_SE/strings.po
@ -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 ""
--- a/resources/language/resource.language.uk_UA/strings.po
+++ b/resources/language/resource.language.uk_UA/strings.po
@ -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 ""
--- a/resources/language/resource.language.zh_CN/strings.po
+++ b/resources/language/resource.language.zh_CN/strings.po
@ -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 ""
--- a/resources/language/resource.language.zh_TW/strings.po
+++ b/resources/language/resource.language.zh_TW/strings.po
@ -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 ""
--- 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,6 +20,10 @@ def skip_intro(intros):
                                                    'default',
                                                    '1080i',
                                                    intro_end=end)
+
+        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()
--- 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
--- a/resources/settings.xml
+++ b/resources/settings.xml
@ -114,6 +114,7 @@
 		<setting id="askCinema" type="bool" label="30519" default="false" visible="eq(-1,true)" subsetting="true" />
        <setting id="trailerNumber" type="slider" label="39000" default="3" visible="eq(-2,true)" range="1,1,15" option="int" />
        <setting id="enableSkipIntro" type="bool" label="30525" default="true" /><!-- Enable skipping of intros -->
+        <setting id="enableAutoSkipIntro" type="bool" label="39720" default="false" visible="eq(-1,true)" subsetting="true" /><!-- Enable auto skipping of intros -->
        <setting id="firstVideoStream" type="bool" label="30546" default="false" /><!-- Pick the first video if several versions are present -->
        <setting id="audioStreamPick" type="enum" label="30547" values="Plex|Kodi" default="0" /><!-- Who picks the audio stream on playback start? -->
        <setting id="subtitleStreamPick" type="enum" label="30548" values="Plex|Kodi" default="0" /><!-- Who picks subtitles on playback start? -->