upnext changes

* add missing translations * fix typing errors in upnext.py * send call to UpNext only if enabled
smirgol · May 14, 2024 · c3aabb3 · c3aabb3
1 parent fd0dd73
commit c3aabb3
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 11 deletions.
diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po
@@ -32,6 +32,10 @@ msgctxt "#30230"
 msgid "Other"
 msgstr "Sonstiges"
 
+msgctxt "#30240"
+msgid "Addons"
+msgstr "Erweiterungen"
+
 msgctxt "#30101"
 msgid "Email"
 msgstr "E-Mail"
@@ -267,3 +271,27 @@ msgstr "Profil auswählen"
 msgctxt "#30080"
 msgid "There are too many active streams. Please try again later."
 msgstr "Es sind zu viele Streams aktiv. Bitte probiere es später noch einmal."
+
+msgctxt "#30089"
+msgid "UpNext fixed or unavailable end detection duration"
+msgstr "Vorlaufzeit für UpNext wenn \"Statisch\" oder keine Credits/Vorschau"
+
+msgctxt "#30090"
+msgid "UpNext integration"
+msgstr "UpNext Integration"
+
+msgctxt "#30091"
+msgid "At credits start, if nothing after"
+msgstr "Zu Beginn der Credits, wenn danach keine Vorschau kommt"
+
+msgctxt "#30092"
+msgid "At preview start"
+msgstr "Zu Beginn der Vorschau"
+
+msgctxt "#30093"
+msgid "Fixed"
+msgstr "Statisch"
+
+msgctxt "#30094"
+msgid "Disabled"
+msgstr "Deaktiviert"
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -31,6 +31,10 @@ msgctxt "#30230"
 msgid "Other"
 msgstr ""
 
+msgctxt "#30240"
+msgid "Addons"
+msgstr ""
+
 msgctxt "#30001"
 msgid "Email"
 msgstr ""
@@ -269,3 +273,27 @@ msgstr ""
 msgctxt "#30080"
 msgid "There are too many active streams. Please try again later."
 msgstr ""
+
+msgctxt "#30089"
+msgid "UpNext fixed or unavailable end detection duration"
+msgstr ""
+
+msgctxt "#30090"
+msgid "UpNext integration"
+msgstr ""
+
+msgctxt "#30091"
+msgid "At credits start, if nothing after"
+msgstr ""
+
+msgctxt "#30092"
+msgid "At preview start"
+msgstr ""
+
+msgctxt "#30093"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "#30094"
+msgid "Disabled"
+msgstr ""
diff --git a/resources/language/resource.language.es_es/strings.po b/resources/language/resource.language.es_es/strings.po
@@ -31,6 +31,10 @@ msgctxt "#30230"
 msgid "Other"
 msgstr "Otro"
 
+msgctxt "#30240"
+msgid "Addons"
+msgstr ""
+
 msgctxt "#30001"
 msgid "Email"
 msgstr "Email"
@@ -269,3 +273,27 @@ msgstr ""
 msgctxt "#30080"
 msgid "There are too many active streams. Please try again later."
 msgstr ""
+
+msgctxt "#30089"
+msgid "UpNext fixed or unavailable end detection duration"
+msgstr ""
+
+msgctxt "#30090"
+msgid "UpNext integration"
+msgstr ""
+
+msgctxt "#30091"
+msgid "At credits start, if nothing after"
+msgstr ""
+
+msgctxt "#30092"
+msgid "At preview start"
+msgstr ""
+
+msgctxt "#30093"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "#30094"
+msgid "Disabled"
+msgstr ""
diff --git a/resources/language/resource.language.pt_br/strings.po b/resources/language/resource.language.pt_br/strings.po
@@ -31,6 +31,10 @@ msgctxt "#30230"
 msgid "Other"
 msgstr "Outros"
 
+msgctxt "#30240"
+msgid "Addons"
+msgstr ""
+
 msgctxt "#30001"
 msgid "Username"
 msgstr "E-mail"
@@ -265,4 +269,28 @@ msgstr ""
 
 msgctxt "#30080"
 msgid "There are too many active streams. Please try again later."
-msgstr "Muitas streams ativas. Por favor, tente mais tarde"
+msgstr "Muitas streams ativas. Por favor, tente mais tarde"
+
+msgctxt "#30089"
+msgid "UpNext fixed or unavailable end detection duration"
+msgstr ""
+
+msgctxt "#30090"
+msgid "UpNext integration"
+msgstr ""
+
+msgctxt "#30091"
+msgid "At credits start, if nothing after"
+msgstr ""
+
+msgctxt "#30092"
+msgid "At preview start"
+msgstr ""
+
+msgctxt "#30093"
+msgid "Fixed"
+msgstr ""
+
+msgctxt "#30094"
+msgid "Disabled"
+msgstr ""
diff --git a/resources/lib/addons/upnext.py b/resources/lib/addons/upnext.py
@@ -16,29 +16,39 @@
 
 from base64 import b64encode
 from json import dumps
+from typing import Optional
 
 from resources.lib.model import Args, PlayableItem, SeriesData
 
 from . import utils
 
-def send_next_info(args: Args, current_episode: PlayableItem, next_episode: PlayableItem, play_url: str, notification_offset: int | None = None, series: SeriesData | None = None):
+
+def send_next_info(
+        args: Args,
+        current_episode: PlayableItem,
+        next_episode: PlayableItem,
+        play_url: str,
+        notification_offset: Optional[int] = None,
+        series: Optional[SeriesData] = None
+):
     """
     Notify next episode info to upnext.
     See https://github.com/im85288/service.upnext/wiki/Integration#sending-data-to-up-next for implementation details.
     """
-    current = UpnextEpisode(current_episode, series)
-    next = UpnextEpisode(next_episode, series)
+    current_upnext_episode = UpnextEpisode(current_episode, series)
+    next_upnext_episode = UpnextEpisode(next_episode, series)
     next_info = {
-        "current_episode": current.__dict__,
-        "next_episode": next.__dict__,
+        "current_episode": current_upnext_episode.__dict__,
+        "next_episode": next_upnext_episode.__dict__,
         "play_url": play_url,
     }
     if notification_offset is not None:
         next_info["notification_offset"] = notification_offset
     upnext_signal(args.addon_id, next_info)
 
+
 class UpnextEpisode:
-    def __init__(self, dto: PlayableItem, series_dto: SeriesData | None):
+    def __init__(self, dto: PlayableItem, series_dto: Optional[SeriesData]):
         self.episodeid: str | None = dto.episode_id
         self.tvshowid: str | None = dto.series_id
         self.title: str = dto.title_unformatted
@@ -62,6 +72,7 @@ def __init__(self, dto: PlayableItem, series_dto: SeriesData | None):
         self.firstaired: str = dto.year
         self.runtime: int = dto.duration
 
+
 def upnext_signal(sender, next_info):
     """Send upnext_data to Kodi using JSON RPC"""
     data = [utils.to_unicode(b64encode(dumps(next_info).encode()))]

diff --git a/resources/lib/videoplayer.py b/resources/lib/videoplayer.py
@@ -227,10 +227,23 @@ def _handle_upnext(self):
                 "video_episode_play"
             )
             show_next_at_seconds = self._compute_when_episode_ends()
-            # Needs to wait 1s, otherwise, upnext will show next dialog at episode start...
-            xbmc.sleep(1000)
-            utils.crunchy_log("_handle_upnext: Next URL (shown at %ds): %s" % (show_next_at_seconds, next_url))
-            upnext.send_next_info(G.args, self._stream_data.playable_item, next_episode, next_url, show_next_at_seconds, self._stream_data.playable_item_parent)
+            if show_next_at_seconds is not None:
+                # Needs to wait 1s, otherwise, upnext will show next dialog at episode start...
+                xbmc.sleep(1000)
+                utils.crunchy_log("_handle_upnext: Next URL (shown at %ds / %ds): %s" % (
+                    show_next_at_seconds,
+                    self._stream_data.playable_item.duration,
+                    next_url
+                ))
+
+                upnext.send_next_info(
+                    G.args,
+                    self._stream_data.playable_item,
+                    next_episode,
+                    next_url,
+                    show_next_at_seconds,
+                    self._stream_data.playable_item_parent
+                )
         except Exception:
             utils.crunchy_log("_handle_upnext: Cannot send upnext notification", xbmc.LOGERROR)