mirror of
https://github.com/vinefeeder/TwinVine.git
synced 2026-07-15 18:10:04 +02:00
API update
This commit is contained in:
@@ -71,7 +71,7 @@ dependencies = [
|
|||||||
"webvtt-py>=0.5.1,<0.6",
|
"webvtt-py>=0.5.1,<0.6",
|
||||||
"isodate>=0.7.2,<0.8",
|
"isodate>=0.7.2,<0.8",
|
||||||
"scrapy>=2.14.0,<3",
|
"scrapy>=2.14.0,<3",
|
||||||
"mypy>=1.19.1,<2",
|
"mypy>=1.19.1,<=2.1.0",
|
||||||
"httpx>=0.28.0,<0.35",
|
"httpx>=0.28.0,<0.35",
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -116,12 +116,10 @@ class TPTV(Service):
|
|||||||
cache = self.cache.get(f"tokens_{credential.sha1}")
|
cache = self.cache.get(f"tokens_{credential.sha1}")
|
||||||
# first contact
|
# first contact
|
||||||
fc_headers = {
|
fc_headers = {
|
||||||
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:138.0) Gecko/20100101 Firefox/138.0',
|
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:135.0) Gecko/20100101 Firefox/151.0',
|
||||||
'Accept': '*/*',
|
'Accept': '*/*',
|
||||||
'Accept-Language': 'en-GB,en;q=0.5',
|
'Accept-Language': 'en-GB,en;q=0.5',
|
||||||
'api-key': 'zq5pyPd0RTbNg3Fyj52PrkKL9c2Af38HHh4itgZTKDaCzjAyhd',
|
'api-key': 'zq5pyPd0RTbNg3Fyj52PrkKL9c2Af38HHh4itgZTKDaCzjAyhd',
|
||||||
'Referer': 'https://tptvencore.co.uk/',
|
|
||||||
'tenant': 'encore',
|
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
'Origin': 'https://tptvencore.co.uk',
|
'Origin': 'https://tptvencore.co.uk',
|
||||||
'DNT': '1',
|
'DNT': '1',
|
||||||
@@ -132,13 +130,15 @@ class TPTV(Service):
|
|||||||
'Priority': 'u=0',
|
'Priority': 'u=0',
|
||||||
|
|
||||||
}
|
}
|
||||||
payload = {}
|
|
||||||
r = self.session.post(self.config["endpoints"]["session"], headers=fc_headers, json=payload)
|
|
||||||
|
r = self.session.get(self.config["endpoints"]["initial"], headers=fc_headers)
|
||||||
if r.status_code != 200:
|
if r.status_code != 200:
|
||||||
raise ConnectionError
|
raise ConnectionError
|
||||||
else:
|
else:
|
||||||
session_id = r.json()['id']
|
headers = r.headers
|
||||||
self.session.headers.update({'session': session_id})
|
self.session.headers.update({'session': headers.get('session')})
|
||||||
|
|
||||||
|
|
||||||
# login
|
# login
|
||||||
if cache and not cache.expired:
|
if cache and not cache.expired:
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ headers:
|
|||||||
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:138.0) Gecko/20100101 Firefox/138.0
|
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:138.0) Gecko/20100101 Firefox/138.0
|
||||||
Accept: '*/*'
|
Accept: '*/*'
|
||||||
Accept-Language: en-GBen;q=0.5
|
Accept-Language: en-GBen;q=0.5
|
||||||
Access-Control-Request-Method: POST
|
|
||||||
Access-Control-Request-Headers: baggagecontent-typesentry-tracesessiontenant
|
|
||||||
Referer: https://tptvencore.co.uk/
|
Referer: https://tptvencore.co.uk/
|
||||||
Origin: https://tptvencore.co.uk
|
Origin: https://tptvencore.co.uk
|
||||||
DNT: '1'
|
DNT: '1'
|
||||||
@@ -17,7 +15,8 @@ session:
|
|||||||
api-key: zq5pyPd0RTbNg3Fyj52PrkKL9c2Af38HHh4itgZTKDaCzjAyhd
|
api-key: zq5pyPd0RTbNg3Fyj52PrkKL9c2Af38HHh4itgZTKDaCzjAyhd
|
||||||
|
|
||||||
endpoints:
|
endpoints:
|
||||||
|
initial: https://tptvencore.co.uk/
|
||||||
login: https://tptvencore.co.uk/api/core/auth/login?locale=en
|
login: https://tptvencore.co.uk/api/core/auth/login?locale=en
|
||||||
session: https://prod.suggestedtv.com/api/client/v1/session
|
session: https://tptvencore.co.uk/api/core/hello?locale=en
|
||||||
search: https://tptvencore.co.uk/api/core/search?q={query}
|
search: https://tptvencore.co.uk/api/core/search?q={query}&page=1&pageSize=20&locale=en
|
||||||
|
|
||||||
|
|||||||
@@ -48,11 +48,13 @@ class TptvLoader(BaseLoader):
|
|||||||
}
|
}
|
||||||
super().__init__(headers)
|
super().__init__(headers)
|
||||||
payload = {}
|
payload = {}
|
||||||
r = self.post_data("https://prod.suggestedtv.com/api/client/v1/session", json=payload, headers=headers)
|
r = self.client.get("https://tptvencore.co.uk/", headers=headers)
|
||||||
if r.status_code != 200:
|
if r.status_code != 200:
|
||||||
raise ConnectionError
|
raise ConnectionError
|
||||||
else:
|
else:
|
||||||
self.session_id = r.json()['id']
|
#headers = r.headers
|
||||||
|
#self.client.headers.update({'headers': headers.get('headers')})
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def receive(
|
def receive(
|
||||||
@@ -154,8 +156,6 @@ class TptvLoader(BaseLoader):
|
|||||||
get_headers = suggested_headers.copy()
|
get_headers = suggested_headers.copy()
|
||||||
get_headers['Access-Control-Request-Headers'] = 'session,tenant'
|
get_headers['Access-Control-Request-Headers'] = 'session,tenant'
|
||||||
get_headers['Access-Control-Request-Method'] = 'GET'
|
get_headers['Access-Control-Request-Method'] = 'GET'
|
||||||
get_headers['session'] = self.session_id
|
|
||||||
#get_headers['tenant'] = 'encore'
|
|
||||||
response = self.get_data(suggested_url, headers=get_headers)
|
response = self.get_data(suggested_url, headers=get_headers)
|
||||||
myjson = json.loads(response)
|
myjson = json.loads(response)
|
||||||
|
|
||||||
|
|||||||
@@ -774,7 +774,7 @@ requires-dist = [
|
|||||||
{ name = "langcodes", specifier = ">=3.4.0,<4" },
|
{ name = "langcodes", specifier = ">=3.4.0,<4" },
|
||||||
{ name = "language-data", specifier = ">=1.4.0" },
|
{ name = "language-data", specifier = ">=1.4.0" },
|
||||||
{ name = "lxml", specifier = ">=5.2.1,<7" },
|
{ name = "lxml", specifier = ">=5.2.1,<7" },
|
||||||
{ name = "mypy", specifier = ">=1.19.1,<2" },
|
{ name = "mypy", specifier = ">=1.19.1,<=2.1.0" },
|
||||||
{ name = "protobuf", specifier = ">=4.25.3,<7" },
|
{ name = "protobuf", specifier = ">=4.25.3,<7" },
|
||||||
{ name = "pycaption", specifier = ">=2.2.6,<3" },
|
{ name = "pycaption", specifier = ">=2.2.6,<3" },
|
||||||
{ name = "pycountry", specifier = ">=24.6.1" },
|
{ name = "pycountry", specifier = ">=24.6.1" },
|
||||||
|
|||||||
Reference in New Issue
Block a user