external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change(packages.util): handle queried record links via .is_official

Browse source 
This removes an unneeded query from our path.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-12-30 19:07:39 -08:00
parent fc229d755b
commit 6fdaeee026
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
4 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
aurweb/models/official_provider.py
View file

@ -11,6 +11,9 @@ class OfficialProvider(Base):
__tablename__ = __table__.name
__mapper_args__ = {"primary_key": [__table__.c.ID]}
# OfficialProvider instances are official packages.
is_official = True
def __init__(self, **kwargs):
super().__init__(**kwargs)

3
aurweb/models/package.py
View file

@ -16,6 +16,9 @@ class Package(Base):
cascade="all, delete"),
foreign_keys=[__table__.c.PackageBaseID])
# No Package instances are official packages.
is_official = False
def __init__(self, **kwargs):
super().__init__(**kwargs)

16
aurweb/packages/util.py
View file

@ -9,7 +9,7 @@ from sqlalchemy import and_, orm
from aurweb import db, l10n, models, util
from aurweb.models import Package, PackageBase, User
from aurweb.models.official_provider import OFFICIAL_BASE
from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
from aurweb.models.package_comaintainer import PackageComaintainer
from aurweb.models.package_dependency import PackageDependency
from aurweb.models.relation_type import PROVIDES_ID
@ -61,20 +61,18 @@ def dep_extra_desc(dep: models.PackageDependency) -> str:
@register_filter("pkgname_link")
def pkgname_link(pkgname: str) -> str:
base = "/".join([OFFICIAL_BASE, "packages"])
official = db.query(models.OfficialProvider).filter(
models.OfficialProvider.Name == pkgname).exists()
official = db.query(OfficialProvider).filter(
OfficialProvider.Name == pkgname).exists()
if db.query(official).scalar():
base = "/".join([OFFICIAL_BASE, "packages"])
return f"{base}/?q={pkgname}"
return f"/packages/{pkgname}"
@register_filter("package_link")
def package_link(package: models.Package) -> str:
base = "/".join([OFFICIAL_BASE, "packages"])
official = db.query(models.OfficialProvider).filter(
models.OfficialProvider.Name == package.Name).exists()
if db.query(official).scalar():
def package_link(package: Union[Package, OfficialProvider]) -> str:
if package.is_official:
base = "/".join([OFFICIAL_BASE, "packages"])
return f"{base}/?q={package.Name}"
return f"/packages/{package.Name}"