diff --git a/core/app.py b/core/app.py index 74f1ae85..2db46f34 100644 --- a/core/app.py +++ b/core/app.py @@ -1,7 +1,7 @@ import base64 from http.server import BaseHTTPRequestHandler, HTTPServer import xbmc - +from core import jsontools from platformcode import logger from urllib.parse import parse_qs hostName = "localhost" @@ -13,9 +13,7 @@ call = 'kodapp://app.kod/open?s={}&cb=http://{}:{}/cb' class MyServer(BaseHTTPRequestHandler): def do_POST(self): length = int(self.headers['content-length']) - postvars = parse_qs( - self.rfile.read(length), - keep_blank_values=True) + postvars = self.rfile.read(length) logger.info(postvars) self.send_response(200) global cookie_ricevuto @@ -25,7 +23,8 @@ class MyServer(BaseHTTPRequestHandler): def call_url(url): webServer = HTTPServer((hostName, serverPort), MyServer) logger.info("Server started http://%s:%s" % (hostName, serverPort)) - xbmc.executebuiltin('StartAndroidActivity("",{})'.format(call.format(base64.b64encode(url), hostName, serverPort))) + s = jsontools.dump({'url': url}) + xbmc.executebuiltin('StartAndroidActivity("",{})'.format(call.format(base64.b64encode(s), hostName, serverPort))) while not cookie_ricevuto: webServer.handle_request() logger.info("Server stopped.") diff --git a/core/httptools.py b/core/httptools.py index 807dda0a..8fa2fc76 100755 --- a/core/httptools.py +++ b/core/httptools.py @@ -431,13 +431,15 @@ def downloadpage(url, **opt): 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('post', None): logger.debug("CF retry... for domain: %s" % domain) - from lib import proxytranslate - gResp = proxytranslate.process_request_proxy(url) - if gResp: - req = gResp['result'] - response_code = req.status_code - response['url'] = gResp['url'] - response['data'] = gResp['data'] + from core import app + app.call_url(url) + # from lib import proxytranslate + # gResp = proxytranslate.process_request_proxy(url) + # if gResp: + # req = gResp['result'] + # response_code = req.status_code + # response['url'] = gResp['url'] + # response['data'] = gResp['data'] if not response['data']: response['data'] = ''