Fix toonitalia, alcuni link su eurostreaming, aggiunto server VOE (by alfa)

lib/proxytranslate.py

@@ -53,47 +53,46 @@ def process_request_proxy(url):
         else:
             print(target_url)
 
-        return_html = session.get(target_url, timeout=20)
-
-        if not return_html:
+        result = session.get(target_url, timeout=20)
+        if not result:
             return
+        data = result.text
+        # logger.debug(data)
+        if '<title>Google Traduttore' in data:
+            url_request = checker_url(
+                result.text,
+                BASE_URL_PROXY + '/translate_p?hl=it&sl=' + SL + '&tl=' + TL + '&u='
+            )
 
-        url_request = checker_url(
-            return_html.text,
-            BASE_URL_PROXY + '/translate_p?hl=it&sl=' + SL + '&tl=' + TL + '&u='
-        )
+            if logger:
+                logger.debug(url_request)
+            else:
+                print(url_request)
 
-        if logger:
-            logger.debug(url_request)
-        else:
-            print(url_request)
-
-        request_final = session.get(
-            url_request,
-            timeout=20
-        )
-
-        url_request_proxy = checker_url(
-            request_final.text, 'translate.google')
-
-        if logger:
-            logger.debug(url_request_proxy)
-        else:
-            print(url_request_proxy)
-
-        data = None
-        result = None
-        while not data or 'Sto traducendo' in data:
-            time.sleep(0.5)
-            result = session.get(
-                url_request_proxy,
+            request_final = session.get(
+                url_request,
                 timeout=20
             )
-            data = result.content.decode('utf-8', 'ignore')
-            if not PY3:
-                data = data.encode('utf-8')
+
+            url_request_proxy = checker_url(
+                request_final.text, 'translate.google')
+
             if logger:
                 logger.debug(url_request_proxy)
+            else:
+                print(url_request_proxy)
+
+            data = None
+            result = None
+            while not data or 'Sto traducendo' in data:
+                time.sleep(0.5)
+                result = session.get(
+                    url_request_proxy,
+                    timeout=20
+                )
+                data = result.text
+                if logger:
+                    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)

lib/unshortenit.py

@@ -42,6 +42,7 @@ class UnshortenIt(object):
     _swzz_regex = r'swzz\.xyz'
     _stayonline_regex = r'stayonline\.pro'
     _snip_regex = r'[0-9a-z]+snip\.|uprotector\.xyz'
+    _linksafe_regex = r'linksafe\.cc'
     # for services that only include real link inside iframe
     _simple_iframe_regex = r'cryptmango|xshield\.net|vcrypt\.club'
     # for services that only do redirects
@@ -49,7 +50,7 @@ class UnshortenIt(object):
 
     listRegex = [_adfly_regex, _linkbucks_regex, _adfocus_regex, _lnxlu_regex, _shst_regex, _hrefli_regex, _anonymz_regex,
                  _shrink_service_regex, _rapidcrypt_regex, _simple_iframe_regex, _linkup_regex, _linkhub_regex,
-                 _swzz_regex, _stayonline_regex, _snip_regex, _simple_redirect]
+                 _swzz_regex, _stayonline_regex, _snip_regex, _linksafe_regex, _simple_redirect]
 
     _maxretries = 5
 
@@ -98,6 +99,8 @@ class UnshortenIt(object):
                 uri, code = self._unshorten_stayonline(uri)
             if re.search(self._snip_regex, uri, re.IGNORECASE):
                 uri, code = self._unshorten_snip(uri)
+            if re.search(self._linksafe_regex, uri, re.IGNORECASE):
+                uri, code = self._unshorten_linksafe(uri)
             if re.search(self._simple_redirect, uri, re.IGNORECASE):
                 p = httptools.downloadpage(uri)
                 uri = p.url
@@ -666,6 +669,9 @@ class UnshortenIt(object):
             #     uri = new_uri
         return uri, 200
 
+    def _unshorten_linksafe(self, uri):
+        return b64decode(uri.split('?url=')[-1]).decode(), 200
+
 
 def decrypt_aes(text, key):
     try: