BioArchLinux/nvchecker
2
0
Fork 0
mirror of https://github.com/lilydjwg/nvchecker.git synced 2025-03-10 06:14:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert httpheader and regex file

Browse source
This commit is contained in:
Maud LAURENT 2021-05-10 17:10:54 +02:00
parent c1a7bebc78
commit 4aa5078169
2 changed files with 46 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
nvchecker_source/httpheader.py
View file

@ -3,36 +3,20 @@
import re
import sre_constants
from nvchecker.api import (
VersionResult, Entry, KeyManager,
TemporaryError, session, GetVersionError
)
async def get_version(name, conf, **kwargs):
return await get_version_real(name, conf, **kwargs)
from nvchecker.api import session, GetVersionError
async def get_version_real(
name: str, conf: Entry, *, keymanager: KeyManager,
**kwargs,
) -> VersionResult:
async def get_version(name, conf, *, cache, **kwargs):
key = tuple(sorted(conf.items()))
return await cache.get(key, get_version_impl)
url = conf.get('url')
async def get_version_impl(info):
conf = dict(info)
url = conf['url']
header = conf.get('header', 'Location')
follow_redirects = conf.get('follow_redirects', False)
method = conf.get('method', 'HEAD')
# Load token from config
token = conf.get('token')
# Load token from keyman
if token is None:
key_name = 'httpheader_' + name
token = keymanager.get_key(key_name)
# Set private token if token exists.
headers = {}
if token:
headers["Authorization"] = token
try:
regex = re.compile(conf['regex'])
except sre_constants.error as e:
@ -40,14 +24,14 @@ async def get_version_real(
res = await session.request(
url,
method=method,
headers=headers,
follow_redirects=follow_redirects,
method = method,
follow_redirects = follow_redirects,
)
header_value = res.headers.get(header)
if not header_value:
raise GetVersionError('header %s not found or is empty' % header)
try:
version = regex.findall(header_value)
except ValueError:

29
nvchecker_source/regex.py
View file

@ -3,30 +3,15 @@
import re
import sre_constants
from nvchecker.api import (
VersionResult, Entry, KeyManager,
TemporaryError, session, GetVersionError
)
async def get_version(name, conf, **kwargs):
return await get_version_real(name, conf, **kwargs)
from nvchecker.api import session, GetVersionError
async def get_version_real(
name: str, conf: Entry, *, keymanager: KeyManager,
**kwargs,
) -> VersionResult:
async def get_version(name, conf, *, cache, **kwargs):
key = tuple(sorted(conf.items()))
return await cache.get(key, get_version_impl)
# Load token from config
token = conf.get('token')
# Load token from keyman
if token is None:
key_name = 'regex_' + name
token = keymanager.get_key(key_name)
# Set private token if token exists.
headers = {}
if token:
headers["Authorization"] = token
async def get_version_impl(info):
conf = dict(info)
try:
regex = re.compile(conf['regex'])
@ -35,7 +20,7 @@ async def get_version_real(
encoding = conf.get('encoding', 'latin1')
res = await session.get(conf.get('url'), headers=headers)
res = await session.get(conf['url'])
body = res.body.decode(encoding)
try:
version = regex.findall(body)