Enable remote sreaming using ISP credentials

CHANGELOG.md

@@ -1,13 +1,18 @@
 # 2.x
 
+## [2.2.0](https://github.com/f-lawe/plugin.video.orange.fr/releases/tag/v2.2.0) - 2024-10-03
+
+### Added
+- Support remote authentication to Orange live and catchup streams ([#22](https://github.com/f-lawe/plugin.video.orange.fr/issues/22))
+
 ## [2.1.4](https://github.com/f-lawe/plugin.video.orange.fr/releases/tag/v2.1.4) - 2024-08-08
 
-## Changed
+### Changed
 - Better UI items management
 
 ### Fixed
 - InputStream Helper is now called properly ([#50](https://github.com/f-lawe/plugin.video.orange.fr/issues/50))
-- Avoid plugin to be runned twice on catchup TV videos ([#55](https://github.com/f-lawe/plugin.video.orange.fr/issues/55))
+- Avoid plugin to be run twice on catchup TV videos ([#55](https://github.com/f-lawe/plugin.video.orange.fr/issues/55))
 
 ## [2.1.3](https://github.com/f-lawe/plugin.video.orange.fr/releases/tag/v2.1.3) - 2024-07-21
 

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.orange.fr" name="Orange TV France" version="2.1.4" provider-name="Flawe">
+<addon id="plugin.video.orange.fr" name="Orange TV France" version="2.2.0" provider-name="Flawe">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="script.module.routing" version="0.2.3"/>

resources/language/resource.language.en_gb/strings.po

@@ -27,7 +27,7 @@ msgid "Help 30102"
 msgstr ""
 
 msgctxt "#30103"
-msgid "Enable IPTV Manager integration"
+msgid "Enable Kodi live TV"
 msgstr ""
 
 msgctxt "#30104"
@@ -64,6 +64,30 @@ msgctxt "#30204"
 msgid "Help 30204"
 msgstr ""
 
+msgctxt "#30205"
+msgid "Use login credentials"
+msgstr ""
+
+msgctxt "#30206"
+msgid "Help 30206"
+msgstr ""
+
+msgctxt "#30207"
+msgid "Login"
+msgstr ""
+
+msgctxt "#30208"
+msgid "Help 30208"
+msgstr ""
+
+msgctxt "#30209"
+msgid "Password"
+msgstr ""
+
+msgctxt "#30210"
+msgid "Help 30210"
+msgstr ""
+
 # Proxy settings (from 30300 to 30399)
 
 msgctxt "#30300"

resources/language/resource.language.fr_fr/strings.po

@@ -24,15 +24,15 @@ msgstr "Installer IPTV Manager…"
 
 msgctxt "#30102"
 msgid "Help 30102"
-msgstr ""
+msgstr "IPTV Manager est requis pour la TV en direct dans Kodi"
 
 msgctxt "#30103"
-msgid "Enable IPTV Manager integration"
-msgstr "Activer l'intégration avec IPTV Manager"
+msgid "Enable Kodi live TV"
+msgstr "Activer la TV en direct dans Kodi"
 
 msgctxt "#30104"
 msgid "Help 30104"
-msgstr ""
+msgstr "Activer cette option pour accéder à vos chaînes en direct depuis Kodi"
 
 msgctxt "#30105"
 msgid "Go to IPTV Manager settings…"
@@ -54,14 +54,38 @@ msgstr "Pays"
 
 msgctxt "#30202"
 msgid "Help 30202"
-msgstr ""
+msgstr "Sélectionner le pays de votre fournisser d'accès à internet"
 
 msgctxt "#30203"
 msgid "Internet service provider"
 msgstr "Fournisseur d'accès à internet"
 
 msgctxt "#30204"
 msgid "Help 30204"
+msgstr "Sélectionner votre fournisser"
+
+msgctxt "#30205"
+msgid "Use login credentials"
+msgstr "Utiliser des identifiants de connexion"
+
+msgctxt "#30206"
+msgid "Help 30206"
+msgstr "Certains fournisseurs peuvent demander une authentification, particulièrement si vous accéder au service depuis une connexion différente."
+
+msgctxt "#30207"
+msgid "Login"
+msgstr "Identifiant"
+
+msgctxt "#30208"
+msgid "Help 30208"
+msgstr ""
+
+msgctxt "#30209"
+msgid "Password"
+msgstr "Mot de passe"
+
+msgctxt "#30210"
+msgid "Help 30210"
 msgstr ""
 
 # Proxy settings (from 30300 to 30399)

resources/lib/managers/stream_manager.py

@@ -1,12 +1,13 @@
 """Video stream manager."""
 
 import inputstreamhelper
+import xbmc
 import xbmcplugin
 
 from lib.providers import get_provider
 from lib.router import router
 from lib.utils.gui import create_play_item
-from lib.utils.kodi import localize, ok_dialog
+from lib.utils.kodi import localize, log, ok_dialog
 
 
 class StreamManager:
@@ -29,8 +30,9 @@ def load_chatchup_stream(self, stream_id: str) -> None:
     def _load_stream(self, stream_info: dict = None) -> None:
         """Load stream."""
         if stream_info is None:
+            log("Stream not included in subscription", xbmc.LOGERROR)
             ok_dialog(localize(30900))
-            xbmcplugin.setResolvedUrl(router.handle, False)
+            xbmcplugin.setResolvedUrl(router.handle, False, create_play_item())
             return
 
         is_helper = inputstreamhelper.Helper(stream_info["manifest_type"], drm=stream_info["license_type"])
@@ -40,5 +42,6 @@ def _load_stream(self, stream_info: dict = None) -> None:
             xbmcplugin.setResolvedUrl(router.handle, True, play_item)
             return
 
+        log("Cannot load InputStream", xbmc.LOGERROR)
         ok_dialog(localize(30901))
-        xbmcplugin.setResolvedUrl(router.handle, False)
+        xbmcplugin.setResolvedUrl(router.handle, False, create_play_item())

resources/lib/providers/__init__.py

@@ -4,8 +4,8 @@
 
 from lib.utils.kodi import get_addon_setting, log
 
+from .abstract_provider import AbstractProvider
 from .fr import OrangeCaraibeProvider, OrangeFranceProvider, OrangeReunionProvider
-from .provider_interface import ProviderInterface
 
 _PROVIDERS = {
     "France.Orange": OrangeFranceProvider,
@@ -23,6 +23,6 @@
     log(f"Cannot instanciate provider: {_PROVIDER_KEY}", xbmc.LOGERROR)
 
 
-def get_provider() -> ProviderInterface:
+def get_provider() -> AbstractProvider:
     """Return the selected provider."""
     return _PROVIDER