reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aur: Modify origin URL for listed packages

Browse source 
Use https://aur.archlinux.org/packages/<package_name> instead
of https://aur.archlinux.org/<package_name>.git
This commit is contained in:
Antoine Lambert 2022-09-02 15:42:01 +02:00
parent 92baa2b45c
commit d76fbb3447
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
swh/lister/aur/lister.py
View file

@ -43,6 +43,7 @@ class AurLister(StatelessLister[AurListerPage]):
DEFAULT_PACKAGES_INDEX_URL = "{base_url}/packages-meta-v1.json.gz"
PACKAGE_VCS_URL_PATTERN = "{base_url}/{pkgname}.git"
PACKAGE_SNAPSHOT_URL_PATTERN = "{base_url}/cgit/aur.git/snapshot/{pkgname}.tar.gz"
ORIGIN_URL_PATTERN = "{base_url}/packages/{pkgname}"
def __init__(
self,
@ -92,7 +93,10 @@ class AurLister(StatelessLister[AurListerPage]):
yield {
"pkgname": pkgname,
"version": version,
"url": self.PACKAGE_VCS_URL_PATTERN.format(
"url": self.ORIGIN_URL_PATTERN.format(
base_url=self.BASE_URL, pkgname=pkgname
),
"git_url": self.PACKAGE_VCS_URL_PATTERN.format(
base_url=self.BASE_URL, pkgname=pkgname
),
"snapshot_url": self.PACKAGE_SNAPSHOT_URL_PATTERN.format(
@ -112,7 +116,6 @@ class AurLister(StatelessLister[AurListerPage]):
"""
assert self.lister_obj.id is not None
url = origin["url"]
last_update = datetime.datetime.fromisoformat(origin["last_modified"])
filename = origin["snapshot_url"].split("/")[-1]
@ -135,7 +138,7 @@ class AurLister(StatelessLister[AurListerPage]):
yield ListedOrigin(
lister_id=self.lister_obj.id,
visit_type=self.VISIT_TYPE,
url=url,
url=origin["url"],
last_update=last_update,
extra_loader_arguments={
"artifacts": artifacts,

12
swh/lister/aur/tests/test_lister.py
View file

@ -12,7 +12,8 @@ from swh.lister.aur.lister import AurLister
expected_origins = [
{
"visit_type": "aur",
"url": "https://aur.archlinux.org/hg-evolve.git",
"url": "https://aur.archlinux.org/packages/hg-evolve",
"git_url": "https://aur.archlinux.org/hg-evolve.git",
"extra_loader_arguments": {
"artifacts": [
{
@ -33,7 +34,8 @@ expected_origins = [
},
{
"visit_type": "aur",
"url": "https://aur.archlinux.org/ibus-git.git",
"url": "https://aur.archlinux.org/packages/ibus-git",
"git_url": "https://aur.archlinux.org/ibus-git.git",
"extra_loader_arguments": {
"artifacts": [
{
@ -54,7 +56,8 @@ expected_origins = [
},
{
"visit_type": "aur",
"url": "https://aur.archlinux.org/libervia-web-hg.git",
"url": "https://aur.archlinux.org/packages/libervia-web-hg",
"git_url": "https://aur.archlinux.org/libervia-web-hg.git",
"extra_loader_arguments": {
"artifacts": [
{
@ -75,7 +78,8 @@ expected_origins = [
},
{
"visit_type": "aur",
"url": "https://aur.archlinux.org/tealdeer-git.git",
"url": "https://aur.archlinux.org/packages/tealdeer-git",
"git_url": "https://aur.archlinux.org/tealdeer-git.git",
"extra_loader_arguments": {
"artifacts": [
{