stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

- Fix Ricerca Globale in caso di Torrent

Browse Source 
- Fix Wstream
 - Fix SupervVideo
 - Fix TVDB
 - IP diretto per alcuni siti
 - Altri Fix per Kodi 19
This commit is contained in:
Alhaziel01
2020-12-21 17:42:59 +01:00
parent 31de200d3d
commit 3b64bbed88
14 changed files with 499 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/proxytranslate.py
+4 -4
View File
@@ -25,10 +25,10 @@ BASE_URL_TRANSLATE = 'https://translate.google.com/translate?hl=it&sl=en&tl=it&u
def checker_url(html, url):
grep_regex = re.findall(r'href="|src="|value="|((?:http[s]://|ftp[s]://)+\.*([-a-zA-Z0-9\.]+)([-a-zA-Z0-9\.]){1,}([-a-zA-Z0-9_\.\#\@\:%_/\?\=\~\&\-\//\!\'\;\(\)\s\^\:blank:\:punct:\:xdigit:\:space:\$]+))', html) # noqa: E501
grep_regex = re.findall(r'(?:href="|src="|value=")([^"]+)', html) # noqa: E501
for url_result_regex in grep_regex:
if url in url_result_regex[0]:
return url_result_regex[0].replace('&', '&')
if url in url_result_regex:
return url_result_regex.replace('&', '&')
def process_request_proxy(url):
@@ -60,7 +60,7 @@ def process_request_proxy(url):
)
url_request_proxy = checker_url(
request_final.text, BASE_URL_PROXY + '/translate_c?depth=1')
request_final.text, 'translate.google')
logger.debug(url_request_proxy)
lib/unshortenit.py
+5 -5
View File
@@ -493,7 +493,8 @@ class UnshortenIt(object):
return uri, str(e)
def _unshorten_vcrypt(self, uri):
uri = uri.replace('.net', '.pw')
httptools.set_cookies({'domain': 'vcrypt.net', 'name': 'saveMe', 'value': '1'})
httptools.set_cookies({'domain': 'vcrypt.pw', 'name': 'saveMe', 'value': '1'})
try:
headers = {}
if 'myfoldersakstream.php' in uri or '/verys/' in uri:
@@ -531,9 +532,9 @@ class UnshortenIt(object):
spl = uri.split('/')
spl[3] += '1'
if spl[3] == 'wss1':
spl[4] = b64encode(spl[4])
spl[4] = b64encode(spl[4].encode('utf-8')).decode('utf-8')
uri = '/'.join(spl)
r = httptools.downloadpage(uri, timeout=self._timeout, headers=headers, follow_redirects=False)
r = httptools.downloadpage(uri, timeout=self._timeout, headers=headers, follow_redirects=False, verify=False)
if 'Wait 1 hour' in r.data:
uri = ''
logger.error('IP bannato da vcrypt, aspetta un ora')
@@ -543,7 +544,6 @@ class UnshortenIt(object):
if uri == prev_uri:
logger.info('Use Cloudscraper')
uri = httptools.downloadpage(uri, timeout=self._timeout, headers=headers, follow_redirects=False, cf=True).headers['location']
# from core.support import dbg;dbg()
if "snip." in uri:
if 'out_generator' in uri:
uri = re.findall('url=(.*)$', uri)[0]
@@ -552,7 +552,7 @@ class UnshortenIt(object):
splitted = path.split('/')
splitted[1] = 'outlink'
new_uri = httptools.downloadpage(uri, follow_redirects=False, post={'url': splitted[2]}).headers['location']
if new_uri != uri:
if new_uri and new_uri != uri:
uri = new_uri
else:
uri = httptools.downloadpage(scheme + '://' + netloc + "/".join(splitted) + query + fragment, follow_redirects=False, post={'url': splitted[2]}).headers['location']