Archived
1
0
Fork 0
This commit is contained in:
yzhh 2020-08-04 16:01:42 +08:00
parent 6995e92ea4
commit 8237ebcfce
2 changed files with 5 additions and 5 deletions

View file

@ -1,5 +1,5 @@
import re import re
from .wikilib import Wiki,m from .wikilib import Wiki,wiki2
import asyncio import asyncio
import traceback import traceback
async def wikim(str1,group = 0): async def wikim(str1,group = 0):
@ -17,7 +17,7 @@ async def wikim(str1,group = 0):
w = q.group(1) w = q.group(1)
print(w) print(w)
if (w == "cs" or w == "de" or w == "el" or w == "es" or w == "fr" or w == "hu" or w == "it" or w == "ja" or w == "ko" or w == "nl" or w == "pl" or w == "pt" or w == "ru" or w == "th" or w == "tr" or w == "uk" or w == "zh"): if (w == "cs" or w == "de" or w == "el" or w == "es" or w == "fr" or w == "hu" or w == "it" or w == "ja" or w == "ko" or w == "nl" or w == "pl" or w == "pt" or w == "ru" or w == "th" or w == "tr" or w == "uk" or w == "zh"):
return(await m(q.group(1),q.group(2))) return(await wiki2(q.group(1),q.group(2)))
else: else:
return('未知语言,请使用~wiki -h查看帮助。') return('未知语言,请使用~wiki -h查看帮助。')
except: except:
@ -65,4 +65,4 @@ async def wikim(str1,group = 0):
traceback.print_exc() traceback.print_exc()
return ('发生错误:' + str(e)) return ('发生错误:' + str(e))
except Exception: except Exception:
return(await m('en',q.group(1))) return(await wiki2('en',q.group(1)))

View file

@ -70,7 +70,7 @@ async def Wiki(path1,pagename):
w = re.match(r'(.*?):(.*)',pagename) w = re.match(r'(.*?):(.*)',pagename)
i = w.group(1) i = w.group(1)
if (i == "ftb" or i == "aether" or i == "cs" or i == "de" or i == "el" or i == "en" or i == "es" or i == "fr" or i == "hu" or i == "it" or i == "ja" or i == "ko" or i == "nl" or i == "pl" or i == "pt" or i == "ru" or i == "th" or i == "tr" or i == "uk" or i == "zh"): if (i == "ftb" or i == "aether" or i == "cs" or i == "de" or i == "el" or i == "en" or i == "es" or i == "fr" or i == "hu" or i == "it" or i == "ja" or i == "ko" or i == "nl" or i == "pl" or i == "pt" or i == "ru" or i == "th" or i == "tr" or i == "uk" or i == "zh"):
return(await m(i,w.group(2))) return(await wiki2(i,w.group(2)))
else: else:
return('发生错误:内容非法。') return('发生错误:内容非法。')
except Exception as e: except Exception as e:
@ -78,7 +78,7 @@ async def Wiki(path1,pagename):
return('发生错误:'+str(e)) return('发生错误:'+str(e))
async def m(lang,str1): async def wiki2(lang,str1):
try: try:
if lang =='en': if lang =='en':
metaurl = 'https://minecraft.gamepedia.com' metaurl = 'https://minecraft.gamepedia.com'