From af0a83b5cf24ba1c92a4abfa223311a0e7975940 Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Mon, 25 Jan 2021 23:06:41 +0100
Subject: [PATCH] migliorie a proxytranslate, possibile fix tests

---
 channels.json                    |  2 +-
 channels/altadefinizioneclick.py |  2 +-
 core/httptools.py                |  2 +-
 lib/proxytranslate.py            | 10 +++++++---
 tests/test_generic.py            |  7 +++----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/channels.json b/channels.json
index cc261028..1c5e1a4a 100644
--- a/channels.json
+++ b/channels.json
@@ -29,7 +29,7 @@
         "guardaserieicu": "https://guardaserie.shop", 
         "hd4me": "https://hd4me.net", 
         "ilcorsaronero": "https://ilcorsaronero.link", 
-        "ilgeniodellostreaming": "https://ilgeniodellostreaming.cat", 
+        "ilgeniodellostreaming": "https://ilgeniodellostreaming.dev",
         "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.gold", 
         "italiaserie": "https://italiaserie.top", 
         "mediasetplay": "https://www.mediasetplay.mediaset.it", 
diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py
index a910e579..7b142536 100644
--- a/channels/altadefinizioneclick.py
+++ b/channels/altadefinizioneclick.py
@@ -23,7 +23,7 @@ from platformcode import config
 
 def findhost(url):
     data = support.httptools.downloadpage(url).data
-    host = support.scrapertools.find_single_match(data, '<div class="elementor-button-wrapper"> <a href="([^"]+)"')
+    host = support.scrapertools.find_single_match(data, '<div class="elementor-button-wrapper">\s*<a href="([^"]+)"')
     return host
 
 host = config.get_channel_url(findhost)
diff --git a/core/httptools.py b/core/httptools.py
index 59f71d54..dd57a952 100755
--- a/core/httptools.py
+++ b/core/httptools.py
@@ -418,7 +418,7 @@ def downloadpage(url, **opt):
             response['data'] = response['data'].decode('ISO-8859-1')
 
     if req.headers.get('Server', '').startswith('cloudflare') and response_code in [429, 503, 403]\
-            and not opt.get('CF', False) and 'Ray ID' in response['data']:
+            and not opt.get('CF', False) and 'Ray ID' in response['data'] and not opt.get('post', None):
         logger.debug("CF retry... for domain: %s" % domain)
         from lib import proxytranslate
         gResp = proxytranslate.process_request_proxy(url)
diff --git a/lib/proxytranslate.py b/lib/proxytranslate.py
index e063e6ba..b098aa6f 100644
--- a/lib/proxytranslate.py
+++ b/lib/proxytranslate.py
@@ -21,9 +21,11 @@ HEADERS = {
 }
 
 MAX_CONECTION_THREAD = 10
+SL = 'en'
+TL = 'it'
 
 BASE_URL_PROXY = 'https://translate.googleusercontent.com'
-BASE_URL_TRANSLATE = 'https://translate.google.com/translate?hl=it&sl=en&tl=it&u=[TARGET_URL]&sandbox=0'  # noqa: E501
+BASE_URL_TRANSLATE = 'https://translate.google.com/translate?hl=it&sl=' + SL + '&tl=' + TL + '&u=[TARGET_URL]&sandbox=0'  # noqa: E501
 
 
 def checker_url(html, url):
@@ -52,7 +54,7 @@ def process_request_proxy(url):
 
         url_request = checker_url(
             return_html.text,
-            BASE_URL_PROXY + '/translate_p?hl=it&sl=en&tl=it&u='
+            BASE_URL_PROXY + '/translate_p?hl=it&sl=' + SL + '&tl=' + TL + '&u='
         )
 
         logger.debug(url_request)
@@ -85,7 +87,9 @@ def process_request_proxy(url):
         data = re.sub('\s(\w+)=(?!")([^<>\s]+)', r' \1="\2"', data)
         data = re.sub('https://translate\.googleusercontent\.com/.*?u=(.*?)&amp;usg=[A-Za-z0-9_-]+', '\\1', data)
         data = re.sub('https?://[a-zA-Z0-9]+--' + domain.replace('.', '-') + '\.translate\.goog(/[a-zA-Z0-9#/-]+)', 'https://' + domain + '\\1', data)
+        data = re.sub('\s+<', '<', data)
+        data = data.replace('&amp;', '&').replace('https://translate.google.com/website?sl=' + SL + '&tl=' + TL + '&u=', '')
 
-        return {'url': url.strip(), 'result': result, 'data': data.replace('&amp;', '&')}
+        return {'url': url.strip(), 'result': result, 'data': data}
     except Exception as e:
         logger.error(e)
diff --git a/tests/test_generic.py b/tests/test_generic.py
index 39a25a50..10a93461 100644
--- a/tests/test_generic.py
+++ b/tests/test_generic.py
@@ -180,8 +180,6 @@ for chItem in channel_list:
 
                 itemlist = getattr(module, it.action)(it)
                 menuItemlist[it.title] = itemlist
-                logMenu[it.title] = logger.recordedLog
-                logger.recordedLog = ''
 
                 # some sites might have no link inside, but if all results are without servers, there's something wrong
                 for resIt in itemlist:
@@ -207,8 +205,9 @@ for chItem in channel_list:
             except:
                 import traceback
                 logger.error(traceback.format_exc())
-                logMenu[it.title] = logger.recordedLog
-                logger.recordedLog = ''
+
+            logMenu[it.title] = logger.recordedLog
+            logger.recordedLog = ''
 
         results.append(
             {'ch': ch, 'hasChannelConfig': hasChannelConfig, 'mainlist': [it.title for it in mainlist],