Revert "try aur4 url first"

This reverts commit fd0c7d57ae.

AUR4 has merged into current AUR.
This commit is contained in:
lilydjwg 2015-08-20 01:38:27 +08:00
parent 011ae94c4d
commit 8a6fbf4a9a
1 changed files with 3 additions and 18 deletions

View File

@ -6,30 +6,15 @@ from tornado.httpclient import AsyncHTTPClient
from tornado.escape import url_escape
AUR_URL = 'https://aur.archlinux.org/rpc.php?type=info&arg='
AUR4_URL = 'https://aur4.archlinux.org/rpc.php?type=info&arg='
logger = logging.getLogger(__name__)
def get_version(name, conf, callback):
aurname = conf.get('aur') or name
url4 = AUR4_URL + url_escape(aurname)
AsyncHTTPClient().fetch(url4, partial(_aur4_done, name, aurname, callback))
url = AUR_URL + url_escape(aurname)
AsyncHTTPClient().fetch(url, partial(_aur_done, name, callback))
def _aur4_done(name, aurname, callback, res):
if res.error:
raise res.error
data = json.loads(res.body.decode('utf-8'))
if not data['results']:
url = AUR_URL + url_escape(aurname)
AsyncHTTPClient().fetch(url, partial(_aur_done, name, aurname, callback))
return
version = data['results']['Version']
callback(name, version)
def _aur_done(name, aurname, callback, res):
def _aur_done(name, callback, res):
if res.error:
raise res.error