Merge pull request #51 from sirstudly/2_101

Release 2.101 (torrentio/trakt fixes)

Author: funkypenguin

content/services/trakt.py

@@ -158,27 +158,29 @@ def logerror(response):
 def get(url):
     try:
         response = session.get(url, headers={
-            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36',
             'Content-type': "application/json", "trakt-api-key": client_id, "trakt-api-version": "2",
             "Authorization": "Bearer " + current_user[1]})
         logerror(response)
         header = response.headers
         response = json.loads(response.content, object_hook=lambda d: SimpleNamespace(**d))
-    except:
+    except Exception as e:
+        ui_print("[trakt] error: " + str(e), ui_settings.debug)
         response = None
         header = None
     return response, header
 
 def post(url, data):
     try:
         response = session.post(url, headers={
-            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36',
             'Content-type': "application/json", "trakt-api-key": client_id, "trakt-api-version": "2",
             "Authorization": "Bearer " + current_user[1]}, data=data)
         logerror(response)
         response = json.loads(response.content, object_hook=lambda d: SimpleNamespace(**d))
         time.sleep(1.1)
-    except:
+    except Exception as e:
+        ui_print("[trakt] error: " + str(e), ui_settings.debug)
         response = None
     return response
 
@@ -189,7 +191,8 @@ def post2(url, data):
         logerror(response)
         response = json.loads(response.content, object_hook=lambda d: SimpleNamespace(**d))
         time.sleep(1.1)
-    except:
+    except Exception as e:
+        ui_print("[trakt] error: " + str(e), ui_settings.debug)
         response = None
     return response
 

scraper/services/torrentio.py

@@ -6,13 +6,14 @@
 name = "torrentio"
 
 default_opts = "https://torrentio.strem.fun/sort=qualitysize|qualityfilter=480p,scr,cam/manifest.json"
+base_url = "https://knightcrawler.elfhosted.com/"
 
 session = custom_session()
 
 
 def get(url):
     headers = {
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'}
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36'}
     try:
         ui_print(f"[torrentio] GET url: {url} ...", ui_settings.debug)
         response = session.get(url, headers=headers, timeout=60)
@@ -70,6 +71,9 @@ def scrape(query, altquery):
     scraped_releases = []
     if not 'torrentio' in active:
         return scraped_releases
+    global base_url
+    if not base_url.endswith('/'):
+        base_url += '/'
     if altquery == "(.*)":
         altquery = query
     type = ("show" if regex.search(
@@ -115,7 +119,7 @@ def scrape(query, altquery):
                 ui_print('[torrentio] error: could not find IMDB ID. ' + str(e))
                 return scraped_releases
     if type == "movie":
-        url = 'https://torrentio.strem.fun/' + opts + \
+        url = base_url + opts + \
             ("/" if len(opts) > 0 else "") + 'stream/movie/' + query + '.json'
         response = get(url)
         if not hasattr(response, "streams") or len(response.streams) == 0:
@@ -131,7 +135,7 @@ def scrape(query, altquery):
                     ui_print('[torrentio] error: could not find IMDB ID. ' + str(e))
                     return scraped_releases
     if type == "show":
-        url = 'https://torrentio.strem.fun/' + opts + \
+        url = base_url + opts + \
             ("/" if len(opts) > 0 else "") + 'stream/series/' + \
             query + ':' + str(int(s)) + ':' + str(int(e)) + '.json'
         response = get(url)

settings/__init__.py

@@ -383,6 +383,7 @@ def get(self):
         setting('Nyaa sleep time', 'Enter a time in seconds to sleep between requests (default: "5"): ',scraper.services.nyaa, 'sleep', hidden=True),
         setting('Nyaa proxy', 'Enter a proxy to use for nyaa (default: "nyaa.si"): ',scraper.services.nyaa, 'proxy', hidden=True),
         setting('Torrentio Scraper Parameters','Please enter a valid torrentio manifest url: ',scraper.services.torrentio, 'default_opts', entry="parameter", help='This settings lets you control the torrentio scraping parameters. Visit "https://torrentio.strem.fun/configure" and configure your settings. Dont choose a debrid service. The "manifest url" will be copied to your clipboard.', hidden=True),
+        setting('Torrentio Base URL', 'Please specify your Torrentio base URL (eg. https://torrentio.strem.fun/): ', scraper.services.torrentio, 'base_url', hidden=True),
         setting('Zilean Base URL', 'Please specify your Zilean base URL: ', scraper.services.zilean, 'base_url', hidden=True),
         setting('Mediafusion Base URL', 'Please specify your Mediafusion base URL: ', scraper.services.mediafusion, 'base_url', hidden=True),
         setting('Mediafusion API Key', 'Please specify your Mediafusion API Key: ', scraper.services.mediafusion, 'api_password', hidden=True),

ui/ui_settings.py

@@ -1,4 +1,4 @@
-version = ['2.100', "Settings compatible update", []]
+version = ['2.101', "Settings compatible update", []]
 run_directly = "true"
 debug = "false"
 log = "false"