mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
fix(FastAPI): get_pkgbase -> get_pkg_or_base
`get_pkgbase` has been replaced with `get_pkg_or_base`, which is quite similar, but it does take a new `cls` keyword argument which is to be the model class which we search for via its `Name` column. Additionally, this change fixes a bug in the `/packages/{name}` route by supplying the Package object in question to the context and modifying the template to use it instead of a hacky through-base workaround. Examples: pkgbase = get_pkg_or_base("some_pkgbase_name", PackageBase) pkg = get_pkg_or_base("some_package_name", Package) Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
f849e8b696
commit
5e95cfbc8a
3 changed files with 19 additions and 16 deletions
|
@ -1,6 +1,6 @@
|
|||
from collections import defaultdict
|
||||
from http import HTTPStatus
|
||||
from typing import Dict, List
|
||||
from typing import Dict, List, Union
|
||||
|
||||
import orjson
|
||||
|
||||
|
@ -101,24 +101,24 @@ def provides_list(package: Package, depname: str) -> list:
|
|||
return string
|
||||
|
||||
|
||||
def get_pkgbase(name: str) -> PackageBase:
|
||||
def get_pkg_or_base(name: str, cls: Union[Package, PackageBase] = PackageBase):
|
||||
""" Get a PackageBase instance by its name or raise a 404 if
|
||||
it can't be foudn in the database.
|
||||
it can't be found in the database.
|
||||
|
||||
:param name: PackageBase.Name
|
||||
:raises HTTPException: With status code 404 if PackageBase doesn't exist
|
||||
:return: PackageBase instance
|
||||
:param name: {Package,PackageBase}.Name
|
||||
:raises HTTPException: With status code 404 if record doesn't exist
|
||||
:return: {Package,PackageBase} instance
|
||||
"""
|
||||
pkgbase = db.query(PackageBase).filter(PackageBase.Name == name).first()
|
||||
if not pkgbase:
|
||||
raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
|
||||
|
||||
provider = db.query(OfficialProvider).filter(
|
||||
OfficialProvider.Name == name).first()
|
||||
if provider:
|
||||
raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
|
||||
|
||||
return pkgbase
|
||||
instance = db.query(cls).filter(cls.Name == name).first()
|
||||
if cls == PackageBase and not instance:
|
||||
raise HTTPException(status_code=int(HTTPStatus.NOT_FOUND))
|
||||
|
||||
return instance
|
||||
|
||||
|
||||
@register_filter("out_of_date")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue