From ff5f40b9660d1c86f7d9a7ae62d008c53f8efd3a Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 25 Apr 2021 11:47:16 +0200
Subject: [PATCH] Fix proxytranslate, migliorie varie

---
 channels/cb01anime.py    |  4 ++--
 core/filetools.py        | 12 ++++++------
 lib/proxytranslate.py    | 10 +++++-----
 specials/globalsearch.py |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/channels/cb01anime.py b/channels/cb01anime.py
index 9258bb02..7595a15a 100644
--- a/channels/cb01anime.py
+++ b/channels/cb01anime.py
@@ -36,7 +36,7 @@ def menu(item):
 
 def search(item, texto):
     support.info(texto)
-    item.url = host + "/?s=" + texto
+    item.url = host + "/search/" + texto
     try:
         return peliculas(item)
     except:
@@ -72,7 +72,7 @@ def peliculas(item):
     if item.args == 'newest':
         patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img[^>]+src="(?P<thumb>[^"]+)"[^>]*>(?:[^>]+>){4}(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]'
     else:
-        patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>(?:[^>]+>){7}\s*<h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br />)?\s*(?P<plot>[^<]+)'
+        patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>(?:[^>]+>){7}\s*<h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br(?: /)?>)?\s*(?P<plot>[^<]+)'
         patronNext = r'<link rel="next" href="([^"]+)"'
     action = 'check'
     return locals()
diff --git a/core/filetools.py b/core/filetools.py
index d79ed7d4..130ccab9 100644
--- a/core/filetools.py
+++ b/core/filetools.py
@@ -86,15 +86,15 @@ def encode(path, _samba=False):
     @rtype: str
     @return path encoded in system character set or utf-8 if samba
     """
-    # from core.support import dbg;dbg()
     if not isinstance(path, unicode):
         path = unicode(path, "utf-8", "ignore")
 
-    if scrapertools.find_single_match(path, r'(^\w+:\/\/)') or _samba and not PY3:
-        path = path.encode("utf-8", "ignore")
-    else:
-        if fs_encoding and not PY3:
-            path = path.encode(fs_encoding, "ignore")
+    if not PY3:
+        if scrapertools.find_single_match(path, r'(^\w+:\/\/)') or _samba:
+            path = path.encode("utf-8", "ignore")
+        else:
+            if fs_encoding:
+                path = path.encode(fs_encoding, "ignore")
 
     # if PY3 and isinstance(path, bytes):
     #     if fs_encoding:
diff --git a/lib/proxytranslate.py b/lib/proxytranslate.py
index 492dda64..c0871d5f 100644
--- a/lib/proxytranslate.py
+++ b/lib/proxytranslate.py
@@ -88,20 +88,20 @@ def process_request_proxy(url):
             time.sleep(0.5)
             result = requests.get(
                 url_request_proxy,
-                timeout=20,
-                headers={'User-Agent': 'android'}
+                timeout=20
+                # headers={'User-Agent': 'android'}
             )
             data = result.content.decode('utf-8', 'ignore')
             if not PY3:
                 data = data.encode('utf-8')
             if logger:
-                logger.debug()
+                logger.debug(url_request_proxy)
 
         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('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=', '')
+        data = data.replace('&amp;', '&').replace('https://translate.google.com/website?sl=' + SL + '&tl=' + TL + '&ajax=1&u=', '')
 
         return {'url': url.strip(), 'result': result, 'data': data}
     except Exception as e:
diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 2eef627f..45ce3842 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -349,7 +349,8 @@ class SearchWindow(xbmcgui.WindowXML):
                 logger.debug('retring with original title on channel ' + channel)
                 dummy, valid, dummy = search(self.item.infoLabels.get('originaltitle'))
         except:
-            pass
+            import traceback
+            logger.error(traceback.format_exc())
 
         self.count += 1
         return self.update(channel, valid, other if other else results)