Skip to content

Fix Xtream API 403 errors by adding a fallback User-Agent (#274) #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CoderBoxer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Xtream API 403 errors by adding a fallback User-Agent (#274) #411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions usr/lib/hypnotix/xtream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@

import requests

HEADERS = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
}


class Channel:
# Required by Hypnotix
Expand Down Expand Up @@ -433,7 +437,7 @@ def authenticate(self):
self.auth_data = {}
try:
# Request authentication, wait 4 seconds maximum
r = requests.get(self.get_authenticate_URL(), timeout=(4), headers={'User-Agent': self.user_agent })
r = requests.get(self.get_authenticate_URL(), timeout=(4), headers=self._get_headers())
# If the answer is ok, process data and change state
if r.ok:
self.auth_data = r.json()
Expand Down Expand Up @@ -735,6 +739,21 @@ def get_series_info_by_id(self, get_series: dict):
)
season.episodes[episode_info["title"]] = new_episode_channel

def _get_headers(self):
"""Build the headers dictionary for outbound requests.

Uses the module-level HEADERS as a base. If the user has configured
a custom User-Agent (via Hypnotix preferences), it overrides the
default.

Returns:
dict: Headers dictionary suitable for requests.get()
"""
headers = dict(HEADERS)
if self.user_agent:
headers['User-Agent'] = self.user_agent
return headers

def _get_request(self, URL: str, timeout: Tuple = (2, 15)):
"""Generic GET Request with Error handling

Expand All @@ -746,7 +765,7 @@ def _get_request(self, URL: str, timeout: Tuple = (2, 15)):
[type]: JSON dictionary of the loaded data, or None
"""
try:
r = requests.get(URL, timeout=timeout, headers={'User-Agent': self.user_agent })
r = requests.get(URL, timeout=timeout, headers=self._get_headers())
if r.status_code == 200:
return r.json()

Expand Down