Skip to content

Commit

Permalink
2.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
f-lawe committed Jan 15, 2025
1 parent 2f7814d commit 88c9b47
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# 2.x

## [2.3.3](https://github.com/f-lawe/plugin.video.orange.fr/releases/tag/v2.3.3) - 2025-01-15

### Changed
- Miscellaneous code improvements and cleaning

### Fixed
- Detection by IPTV Manager ([#73](https://github.com/f-lawe/plugin.video.orange.fr/issues/73))
- Authentication to Orange servers ([#74](https://github.com/f-lawe/plugin.video.orange.fr/issues/74))

## [2.3.2](https://github.com/f-lawe/plugin.video.orange.fr/releases/tag/v2.3.2) - 2024-12-05

### Changed
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
Original file line number Diff line number Diff line change
@@ -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.3.2" provider-name="Flawe">
<addon id="plugin.video.orange.fr" name="Orange TV France" version="2.3.3" provider-name="Flawe">
<requires>
<import addon="xbmc.python" version="3.0.1"/>
<import addon="script.module.requests" version="2.31.0"/>
Expand Down
13 changes: 1 addition & 12 deletions resources/lib/providers/abstract_orange_provider.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# ruff: noqa: D102
"""Orange provider template."""

import json
import re
from abc import ABC
from datetime import date, datetime, timedelta
Expand Down Expand Up @@ -30,7 +31,6 @@
_LIVE_HOMEPAGE_URL = "https://chaines-tv.orange.fr/"
_CATCHUP_VIDEO_URL = "https://replay.orange.fr/videos/{stream_id}"
_LOGIN_URL = "https://login.orange.fr"
_LOGIN_URL = "https://login.orange.fr"


class AbstractOrangeProvider(AbstractProvider, ABC):
Expand Down Expand Up @@ -259,20 +259,9 @@ def _retrieve_auth_data(self, auth_url: str, login: str = None, password: str =
tv_token, tv_token_expires, wassup = (
provider_session_data.get(k) for k in ("tv_token", "tv_token_expires", "wassup")
)
tv_token, tv_token_expires, wassup = (
provider_session_data.get(k) for k in ("tv_token", "tv_token_expires", "wassup")
)

if not tv_token_expires or datetime.utcnow().timestamp() > tv_token_expires:
URL_ROOT = "https://chaines-tv.orange.fr"
USER_AGENT_FIREFOX = "Mozilla/5.0 (Windows NT 10.0; rv:114.0) Gecko/20100101 Firefox/114.0"
session = Session()
session.headers = {
"User-Agent": USER_AGENT_FIREFOX,
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
"Accept-Language": "fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3",
"Accept-Encoding": "gzip, deflate, br",
}

if not self._is_wassup_expired(wassup):
log("Cookie reuse", xbmc.LOGINFO)
Expand Down

0 comments on commit 88c9b47

Please sign in to comment.