fixeeeeeed
This commit is contained in:
parent
f31fe2d300
commit
32c859fc96
3 changed files with 24 additions and 26 deletions
11
test.py
11
test.py
|
@ -1,5 +1,6 @@
|
|||
from checkuser import checkuser
|
||||
if checkuser('minecraft','Lighyzhh'):
|
||||
print('t')
|
||||
else:
|
||||
print('f')
|
||||
from wikim import wikim
|
||||
import asyncio
|
||||
loop = asyncio.get_event_loop()
|
||||
result = loop.run_until_complete(wikim('wiki Netherite'))
|
||||
print(result)
|
||||
loop.close()
|
23
wikim/m.py
23
wikim/m.py
|
@ -7,28 +7,25 @@ import urllib
|
|||
async def m(lang,str1):
|
||||
if lang =='en':
|
||||
metaurl = 'https://minecraft.gamepedia.com/api.php?action=query&format=json&prop=info&inprop=url&redirects&titles='
|
||||
l = 'https://minecraft.gamepedia.com/'
|
||||
else:
|
||||
metaurl = 'https://minecraft-'+lang+'.gamepedia.com/api.php?action=query&format=json&prop=info&inprop=url&redirects&titles='
|
||||
pagename = str1
|
||||
l = 'https://minecraft-'+lang+'.gamepedia.com/'
|
||||
try:
|
||||
pagename = str1
|
||||
url = metaurl+pagename
|
||||
metatext = requests.get(url,timeout=5)
|
||||
file = json.loads(metatext.text)
|
||||
try:
|
||||
file = json.loads(metatext.text)
|
||||
x = file['query']['pages']
|
||||
y = sorted(x.keys())[0]
|
||||
if int(y) == -1:
|
||||
d = x[y]
|
||||
if d.has_key('missing') == False:
|
||||
return ('您要的'+pagename+':'+'https://'+path+'.gamepedia.com/'+urllib.parse.quote(pagename.encode('UTF-8')))
|
||||
else:
|
||||
if 'missing' in x['-1']:
|
||||
try:
|
||||
if lang =='en':
|
||||
h = re.match(r'https://minecraft.gamepedia.com/(.*)', z, re.M | re.I)
|
||||
searchurl = 'https://minecraft.gamepedia.com/api.php?action=query&generator=search&gsrsearch='+h.group(1)+'&gsrsort=just_match&gsrenablerewrites&prop=info&gsrlimit=1&format=json'
|
||||
searchurl = 'https://minecraft.gamepedia.com/api.php?action=query&generator=search&gsrsearch='+str1+'&gsrsort=just_match&gsrenablerewrites&prop=info&gsrlimit=1&format=json'
|
||||
else:
|
||||
h = re.match(r'https://minecraft-(.*).gamepedia.com/(.*)', z, re.M | re.I)
|
||||
searchurl = 'https://minecraft-'+h.group(1)+'.gamepedia.com/api.php?action=query&generator=search&gsrsearch='+h.group(2)+'&gsrsort=just_match&gsrenablerewrites&prop=info&gsrlimit=1&format=json'
|
||||
searchurl = 'https://minecraft-'+lang+'.gamepedia.com/api.php?action=query&generator=search&gsrsearch='+str1+'&gsrsort=just_match&gsrenablerewrites&prop=info&gsrlimit=1&format=json'
|
||||
f = requests.get(searchurl)
|
||||
g = json.loads(f.text)
|
||||
j=g['query']['pages']
|
||||
|
@ -37,6 +34,8 @@ async def m(lang,str1):
|
|||
return ('找不到条目,您是否要找的是:'+m+'?')
|
||||
except Exception:
|
||||
return('找不到条目。')
|
||||
else:
|
||||
return ('您要的'+pagename+':'+l+urllib.parse.quote(pagename.encode('UTF-8')))
|
||||
else:
|
||||
try:
|
||||
z = x[y]['fullurl']
|
||||
|
@ -53,7 +52,7 @@ async def m(lang,str1):
|
|||
return('您要的'+pagename+":"+xx)
|
||||
except Exception:
|
||||
return('您要的'+pagename+":"+z)
|
||||
except Exception:
|
||||
except Exception:
|
||||
return('发生错误:内容非法。')
|
||||
except Exception as e:
|
||||
except Exception as e:
|
||||
return('发生错误:'+str(e))
|
|
@ -10,21 +10,19 @@ def Wiki(path1,pagename):
|
|||
x = file['query']['pages']
|
||||
y = sorted(x.keys())[0]
|
||||
if int(y) == -1:
|
||||
try:
|
||||
d = x[y]
|
||||
if d.has_key('missing') == False:
|
||||
return ('您要的'+pagename+':'+'https://'+path+'.gamepedia.com/'+urllib.parse.quote(pagename.encode('UTF-8')))
|
||||
else:
|
||||
h = re.match(path1+r'/(.*)', z, re.M | re.I)
|
||||
searchurl = path1+'/api.php?action=query&generator=search&gsrsearch=' + h.group(1) + '&gsrsort=just_match&gsrenablerewrites&prop=info&gsrlimit=1&format=json'
|
||||
if 'missing' in x['-1']:
|
||||
try:
|
||||
searchurl = path1+'/api.php?action=query&generator=search&gsrsearch=' + pagename + '&gsrsort=just_match&gsrenablerewrites&prop=info&gsrlimit=1&format=json'
|
||||
f = requests.get(searchurl)
|
||||
g = json.loads(f.text)
|
||||
j = g['query']['pages']
|
||||
b = sorted(j.keys())[0]
|
||||
m = j[b]['title']
|
||||
return ('找不到条目,您是否要找的是:' + m +'?')
|
||||
except Exception:
|
||||
return ('找不到条目。')
|
||||
except Exception:
|
||||
return ('找不到条目。')
|
||||
else:
|
||||
return ('您要的'+pagename+':'+'https://'+path1+'.gamepedia.com/'+urllib.parse.quote(pagename.encode('UTF-8')))
|
||||
else:
|
||||
try:
|
||||
z = x[y]['fullurl']
|
||||
|
|
Reference in a new issue