fix ricerca guardaserieicu, prova timeout globale (requests)

channels/discoveryplus.py

@@ -2,12 +2,14 @@
 # ------------------------------------------------------------
 # Canale per Rai Play
 # ------------------------------------------------------------
+import functools
 
 import requests
-from core import support, jsontools
+from core import support, httptools
 from platformcode import logger, config
 typo = support.typo
 session = requests.Session()
+session.request = functools.partial(session.request, timeout=httptools.HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT)
 host = support.config.get_channel_url()
 
 token = session.get('https://disco-api.discoveryplus.it/token?realm=dplayit').json()['data']['attributes']['token']

channels/guardaserieicu.py

@@ -29,7 +29,7 @@ def peliculas(item):
     # debug = True
     patronBlock = r'movies-list movies-list-full(?P<block>.*?)footer>'
     if item.args == 'search':
-        patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>\s*<img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*).*?"f-desc">\s*<p>(?P<plot>[^<]+)'
+        patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>(?:\s*<span class="mli-quality">(?P<quality>[^>]+)</span>)?\s*<img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*).*?"f-desc">\s*<p>(?P<plot>[^<]+)'
     else:
         patron = r'<div data-movie-id[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>[^>]+>[^>]+><img src="(?P<thumbnail>[^"]+)[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+).*?jt-info[^>]+>[^:]+:\s*(?P<rating>[^<]+)[^>]+>[^>]+>[^>]+>(?P<year>\d*)[^>]+>[^>]+>[^>]+>(?P<duration>\d*)'
     patronNext = '<li class=.active.>.*?href=.(.*?).>'

channels/mediasetplay.py

@@ -2,12 +2,14 @@
 # ------------------------------------------------------------
 # Canale per Mediaset Play
 # ------------------------------------------------------------
+import functools
 
 from platformcode import logger, config
 import uuid, datetime, xbmc
 
 import requests, sys
-from core import jsontools, support
+from core import jsontools, support, httptools
+
 if sys.version_info[0] >= 3:
     from urllib.parse import urlencode, quote
 else:
@@ -23,6 +25,7 @@ loginData = {"client_id": clientid, "platform": "pc", "appName": "web//mediasetp
 sessionUrl = "https://api.one.accedo.tv/session?appKey=59ad346f1de1c4000dfd09c5&uuid={uuid}&gid=default"
 
 session = requests.Session()
+session.request = functools.partial(session.request, timeout=httptools.HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT)
 session.headers.update({'Content-Type': 'application/json', 'User-Agent': support.httptools.get_user_agent(), 'Referer': host})
 
 entry = 'https://api.one.accedo.tv/content/entry/{id}?locale=it'

channels/streamingcommunity.py

@@ -2,10 +2,10 @@
 # ------------------------------------------------------------
 # Canale per StreamingCommunity
 # ------------------------------------------------------------
-
+import functools
 import json, requests, sys
 from channels.mediasetplay import Token
-from core import support, channeltools
+from core import support, channeltools, httptools
 from platformcode import logger
 
 
@@ -15,6 +15,7 @@ def findhost(url):
 
 host = support.config.get_channel_url(findhost)
 session = requests.Session()
+session.request = functools.partial(session.request, timeout=httptools.HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT)
 headers = {}
 
 def getHeaders(forced=False):

channels/vvvvid.py

@@ -2,14 +2,17 @@
 # ------------------------------------------------------------
 # Canale per vvvvid
 # ----------------------------------------------------------
+import functools
+
 import requests, sys, inspect
-from core import jsontools, support, tmdb
+from core import jsontools, support, tmdb, httptools
 from platformcode import autorenumber, logger, config
 
 host = support.config.get_channel_url()
 
 # Creating persistent session
 current_session = requests.Session()
+current_session.request = functools.partial(current_session.request, timeout=httptools.HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT)
 headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36'}
 
 # Getting conn_id token from vvvvid and creating payload

lib/proxytranslate.py

@@ -53,7 +53,7 @@ def process_request_proxy(url):
         else:
             print(target_url)
 
-        result = session.get(target_url, timeout=20)
+        result = session.get(target_url, timeout=5)
         if not result:
             return
         data = result.text
@@ -71,7 +71,7 @@ def process_request_proxy(url):
 
             request_final = session.get(
                 url_request,
-                timeout=20
+                timeout=5
             )
 
             url_request_proxy = checker_url(
@@ -88,7 +88,7 @@ def process_request_proxy(url):
                 time.sleep(0.5)
                 result = session.get(
                     url_request_proxy,
-                    timeout=20
+                    timeout=5
                 )
                 data = result.text
                 if logger:

servers/vvvvid.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+import functools
 import re
 
 import requests
@@ -10,6 +10,7 @@ from platformcode import logger, config
 
 # Creating persistent session
 current_session = requests.Session()
+current_session.request = functools.partial(current_session.request, timeout=httptools.HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT)
 headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36'}
 
 # Getting conn_id token from vvvvid and creating payload