2.3.6 with new api

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

@@ -64,6 +64,14 @@ msgctxt "#30204"
 msgid "Help 30204"
 msgstr ""
 
+msgctxt "#30211"
+msgid "Live endpoint"
+msgstr ""
+
+msgctxt "#30212"
+msgid "Help 30212"
+msgstr ""
+
 msgctxt "#30205"
 msgid "Use login credentials"
 msgstr ""

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

@@ -62,7 +62,15 @@ msgstr "Fournisseur d'accès à internet"
 
 msgctxt "#30204"
 msgid "Help 30204"
-msgstr "Sélectionner votre fournisser"
+msgstr "Sélectionner votre fournisseur"
+
+msgctxt "#30211"
+msgid "Live endpoint"
+msgstr "Endpoint pour le live"
+
+msgctxt "#30212"
+msgid "Help 30212"
+msgstr "Sélectionner l'endpoint pour le live"
 
 msgctxt "#30205"
 msgid "Use login credentials"

resources/lib/providers/fr/orange_france.py

@@ -8,6 +8,7 @@ class OrangeFranceProvider(AbstractOrangeProvider):
 
     def __init__(self):
         """Initialize Orange France provider."""
+        super().__init__()
         self.mco = "OFR"
         self.groups = {
             "TNT": [192, 4, 80, 34, 47, 118, 111, 445, 119, 195, 446, 444, 234, 78, 481, 226, 458, 482, 1404, 1401]

resources/lib/utils/gui.py

@@ -53,7 +53,11 @@ def create_play_item(stream_info: dict = None, inputstream_addon: str = "") -> L
 
     play_item.setProperty("inputstream", inputstream_addon)
     play_item.setProperty("inputstream.adaptive.manifest_type", stream_info.get("protocol"))
-    play_item.setProperty("inputstream.adaptive.play_timeshift_buffer", "true")
+
+    # https://github.com/xbmc/inputstream.adaptive/issues/574
+    start = stream_info['start']
+    InfoTagVideo = play_item.getVideoInfoTag()
+    InfoTagVideo.setResumePoint(start, 1)
 
     drm_config = stream_info.get("drm_config", {})
     keys = ["license_type", "license_key", "license_data", "server_certificate", "license_flags", "pre_init_data"]

resources/lib/utils/request.py

@@ -38,7 +38,7 @@ def get_random_ua() -> str:
     return _RANDOM_USER_AGENT
 
 
-def request(method: str, url: str, headers: Mapping[str, str] = None, data=None, session: Session = None) -> Response:
+def request(method: str, url: str, headers: Mapping[str, str] = {}, data=None, session: Session = None) -> Response:
     """Send HTTP request using requests."""
     default_headers = {
         "Accept": "application/json",
@@ -48,17 +48,20 @@ def request(method: str, url: str, headers: Mapping[str, str] = None, data=None,
         "User-Agent": get_random_ua(),
     }
 
-    headers = {**(session.headers if session is not None else default_headers), **(headers or {})}
     session = session or Session()
+    if 'User-Agent' in session.headers:
+        del session.headers['User-Agent']
+    session.headers = {**default_headers, **session.headers, **headers}
 
     log(f"Fetching {url}", xbmc.LOGDEBUG)
-    res = session.request(method, url, headers=headers, data=data)
-    res.raise_for_status()
+    res = session.request(method, url, data=data)
     log(f" -> {res.status_code}", xbmc.LOGDEBUG)
+    log(f" -> {res.text}", xbmc.LOGDEBUG)
+    res.raise_for_status()
     return res
 
 
-def request_json(url: str, headers: Mapping[str, str] = None, default: Union[dict, list] = None) -> Union[dict, list]:
+def request_json(url: str, headers: Mapping[str, str] = {}, default: Union[dict, list] = None) -> Union[dict, list]:
     """Send HTTP request and load json response."""
     try:
         res = request("GET", url, headers=headers)

resources/settings.xml

@@ -11,10 +11,10 @@
 
   <!-- Provider -->
   <category label="30200">
-  <setting id="provider.country" label="30201" help="30202" type="select" values="France" default="France"/>
+    <setting id="provider.country" label="30201" help="30202" type="select" values="France" default="France"/>
     <setting id="provider.name" visible="eq(-1,France)" label="30203" help="30204" type="labelenum" values="OQEE by Free|Orange|Orange Caraïbe|Orange Réunion" default="Orange"/>
+    <setting id="provider.live" visible="eq(-1,Orange)" label="30211" help="30212" type="labelenum" values="livecontrol|live" default="livecontrol"/>
     <setting type="lsep"/>
-    <setting id="provider.session_data" visible="false" default="{}"/>
     <setting id="provider.use_credentials" label="30205" help="30206" type="bool" default="false"/>
     <setting id="provider.username" label="30207" help="30208" enable="eq(-1,true)" type="text" default=""/>
     <setting id="provider.password" label="30209" help="30210" enable="eq(-2,true)" type="text" default="" option="hidden"/>