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

fix updateDomains

Browse Source
This commit is contained in:
mac12m99
2021-02-01 09:24:19 +01:00
parent 3929bf4140
commit 7238c011d2
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/updateDomains.yml
-1
View File
@@ -18,7 +18,6 @@ jobs:
- name: Update domains - name: Update domains
run: | run: |
pip install sakee
pip install requests pip install requests
python tools/updateDomains.py python tools/updateDomains.py
lib/proxytranslate.py
+23 -7
View File
@@ -12,8 +12,11 @@ else:
import re import re
import time import time
from lib import requests import requests
from platformcode import logger try:
from platformcode import logger
except ImportError:
logger = None
HEADERS = { HEADERS = {
'Host': 'translate.google.com', 'Host': 'translate.google.com',
@@ -45,7 +48,10 @@ def process_request_proxy(url):
target_url = \ target_url = \
BASE_URL_TRANSLATE.replace('[TARGET_URL]', request.quote(url)) BASE_URL_TRANSLATE.replace('[TARGET_URL]', request.quote(url))
logger.debug(target_url) if logger:
logger.debug(target_url)
else:
print(target_url)
return_html = requests.get(target_url, timeout=20, headers=HEADERS) return_html = requests.get(target_url, timeout=20, headers=HEADERS)
@@ -57,7 +63,10 @@ def process_request_proxy(url):
BASE_URL_PROXY + '/translate_p?hl=it&sl=' + SL + '&tl=' + TL + '&u=' BASE_URL_PROXY + '/translate_p?hl=it&sl=' + SL + '&tl=' + TL + '&u='
) )
logger.debug(url_request) if logger:
logger.debug(url_request)
else:
print(url_request)
request_final = requests.get( request_final = requests.get(
url_request, url_request,
@@ -68,7 +77,10 @@ def process_request_proxy(url):
url_request_proxy = checker_url( url_request_proxy = checker_url(
request_final.text, 'translate.google') request_final.text, 'translate.google')
logger.debug(url_request_proxy) if logger:
logger.debug(url_request_proxy)
else:
print(url_request_proxy)
data = None data = None
result = None result = None
@@ -82,7 +94,8 @@ def process_request_proxy(url):
data = result.content.decode('utf-8', 'ignore') data = result.content.decode('utf-8', 'ignore')
if not PY3: if not PY3:
data = data.encode('utf-8') data = data.encode('utf-8')
logger.debug() if logger:
logger.debug()
data = re.sub('\s(\w+)=(?!")([^<>\s]+)', r' \1="\2"', data) 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://translate\.googleusercontent\.com/.*?u=(.*?)&amp;usg=[A-Za-z0-9_-]+', '\\1', data)
@@ -92,4 +105,7 @@ def process_request_proxy(url):
return {'url': url.strip(), 'result': result, 'data': data} return {'url': url.strip(), 'result': result, 'data': data}
except Exception as e: except Exception as e:
logger.error(e) if logger:
logger.error(e)
else:
print(e)