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

Fix Support e scrapertools per Kodi 19

Browse Source
This commit is contained in:
Alhaziel01
2020-08-17 17:40:01 +02:00
parent a102dd7e32
commit 76df639e42
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/scrapertools.py
View File

@@ -89,7 +89,8 @@ def decodeHtmlentities(data):
else:
cp = html5.get(ent)
if cp:
return cp.decode("unicode-escape").encode('utf-8') + res
if PY3: return cp + res
else: return cp.decode("unicode-escape").encode('utf-8') + res
else:
return match.group()

18
core/support.py
View File

@@ -105,7 +105,7 @@ def dbg():
def regexDbg(item, patron, headers, data=''):
if config.dev_mode():
import json, urllib2, webbrowser
import json, webbrowser
url = 'https://regex101.com'
if not data:
@@ -116,14 +116,15 @@ def regexDbg(item, patron, headers, data=''):
html = data
headers = {'content-type': 'application/json'}
data = {
'regex': patron.decode('utf-8'),
'regex': patron if PY3 else patron.decode('utf-8'),
'flags': 'gm',
'testString': html.decode('utf-8'),
'testString': html if PY3 else html.decode('utf-8'),
'delimiter': '"""',
'flavor': 'python'
}
r = urllib2.Request(url + '/api/regex', json.dumps(data, encoding='latin1'), headers=headers)
r = urllib2.urlopen(r).read()
data = json.dumps(data).encode() if PY3 else json.dumps(data, encoding='latin1')
r = urllib.Request(url + '/api/regex', data, headers=headers)
r = urllib.urlopen(r).read()
permaLink = json.loads(r)['permalinkFragment']
webbrowser.open(url + "/r/" + permaLink)
@@ -961,7 +962,7 @@ def match(item_url_string, **args):
def match_dbg(data, patron):
import json, urllib2, webbrowser
import json, webbrowser
url = 'https://regex101.com'
headers = {'content-type': 'application/json'}
data = {
@@ -971,8 +972,9 @@ def match_dbg(data, patron):
'delimiter': '"""',
'flavor': 'python'
}
r = urllib2.Request(url + '/api/regex', json.dumps(data, encoding='latin1'), headers=headers)
r = urllib2.urlopen(r).read()
js = json.dumps(data).encode() if PY3 else json.dumps(data, encoding='latin1')
r = urllib.Request(url + '/api/regex', js, headers=headers)
r = urllib.urlopen(r).read()
permaLink = json.loads(r)['permalinkFragment']
webbrowser.open(url + "/r/" + permaLink)