xmengnet/XZZ
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

修复若干bug

Browse source
This commit is contained in:
xmengnet 2021-05-22 10:43:26 +08:00 committed by GitHub
parent 39a76b7992
commit da6307064c
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
worker/pkg.py
View file

@ -1,5 +1,5 @@
import requests import requests
import time
from zzcore import StdAns from zzcore import StdAns
@ -16,9 +16,9 @@ class Ans(StdAns):
return msg return msg
else: else:
req = requests.get( req = requests.get(
url='https://archlinux.org/packages/search/json/?name=' + self.parms[1] + '&arch=x86_64').json() url='https://archlinux.org/packages/search/json/?name=' + self.parms[1] ).json()
if req['results'] == []: if req['results'] == []:
req = requests.get(url='https://aur.archlinux.org/rpc/?v=5&type=search&arg=' + self.parms[1]).json() req = requests.get(url='https://aur.archlinux.org/rpc/?v=5&type=info&arg=' + self.parms[1]).json()
if req['resultcount'] == 0: if req['resultcount'] == 0:
req = requests.get(url='https://aur.archlinux.org/rpc/?v=5&type=search&arg=' + self.parms[1]).json() req = requests.get(url='https://aur.archlinux.org/rpc/?v=5&type=search&arg=' + self.parms[1]).json()
# print(req) # print(req)
@ -27,25 +27,30 @@ class Ans(StdAns):
# pkgname = req['results'][0]['pkgname'] # pkgname = req['results'][0]['pkgname']
version = '版本：' + req['results'][0]['Version'] version = '版本：' + req['results'][0]['Version']
description = '描述：' + req['results'][0]['Description'] description = '描述：' + req['results'][0]['Description']
maintainer = '维护：' + req['results'][0]['Maintainer'] maintainer = '维护：' + str(req['results'][0]['Maintainer'])
numvotes = '投票：' + str(req['results'][0]['NumVotes']) numvotes = '投票：' + str(req['results'][0]['NumVotes'])
updatetime = req['results'][0]['LastModified']
updatetime = time.localtime(int(updatetime))
updatetime = time.strftime("%Y-%m-%d %H:%M:%S", updatetime)
url = req['results'][0]['URL'] url = req['results'][0]['URL']
if url is None: if url is None:
url = '链接：None' url = '链接：None'
else: else:
url = '链接：' + url url = '链接：' + url
msg = '仓库：AUR\n' + name + '\n' + version + '\n' + description + '\n' + maintainer \ msg = '仓库：AUR\n' + name + '\n' + version + '\n' + description + '\n' + maintainer \
+ '\n' + numvotes + '\n' + url + '\n' + '\n' + numvotes + '\n更新日期' + updatetime[0:10] + '\n' + url
return msg return msg
else: else:
repo = req['results'][0]['repo'] repo = req['results'][0]['repo']
pkgname = req['results'][0]['pkgname'] pkgname = req['results'][0]['pkgname']
pkgver = req['results'][0]['pkgver'] pkgver = req['results'][0]['pkgver']+'\n'
pkgdesc = req['results'][0]['pkgdesc'] pkgdesc = req['results'][0]['pkgdesc']
url = req['results'][0]['url'] url = req['results'][0]['url']
updatetime = req['results'][0]['last_update']
updatetime = updatetime.replace('T', ' ')
updatetime = updatetime[0:16]+'\n'
# return repo,pkgname,pkgver,pkgdesc,url # return repo,pkgname,pkgver,pkgdesc,url
# print('仓库：' + repo + '\n包名：' + pkgname + '\n版本：' + pkgver + '\n描述：' + pkgdesc + '\n上游：' + url + '\n') # print('仓库：' + repo + '\n包名：' + pkgname + '\n版本：' + pkgver + '\n描述：' + pkgdesc + '\n上游：' + url + '\n')
msg = '仓库：' + repo + '\n包名：' + pkgname + '\n版本：' + pkgver + '\n描述：' + pkgdesc + '\n上游：' + url + '\n' msg = '仓库：' + repo + '\n包名：' + pkgname + '\n版本：' + pkgver + '描述：' + pkgdesc + '\n更新日期：' \
+ updatetime[0:10] + '\n上游：' + url
return msg return msg