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

routers.packages: Simplify some existence checks

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-08-06 00:59:38 -07:00
parent bace345da4
commit 4ade8b0539
6 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
aurweb/packages/util.py
View file

@ -54,10 +54,9 @@ def dep_extra_desc(dep: PackageDependency) -> str:
@register_filter("pkgname_link")
def pkgname_link(pkgname: str) -> str:
base = "/".join([OFFICIAL_BASE, "packages"])
pkg = db.query(Package).filter(Package.Name == pkgname)
official = db.query(OfficialProvider).filter(
OfficialProvider.Name == pkgname)
if not pkg.count() or official.count():
if official.scalar():
return f"{base}/?q={pkgname}"
return f"/packages/{pkgname}"
@ -67,7 +66,7 @@ def package_link(package: Package) -> str:
base = "/".join([OFFICIAL_BASE, "packages"])
official = db.query(OfficialProvider).filter(
OfficialProvider.Name == package.Name)
if official.count():
if official.scalar():
return f"{base}/?q={package.Name}"
return f"/packages/{package.Name}"
@ -82,19 +81,14 @@ def provides_list(package: Package, depname: str) -> list:
)
)
string = str()
has_providers = providers.count() > 0
if has_providers:
string += "<em>("
string += ", ".join([
string = ", ".join([
f'<a href="{package_link(pkg)}">{pkg.Name}</a>'
for pkg in providers
])
if has_providers:
string += ")</em>"
if string:
# If we actually constructed a string, wrap it.
string = f"<em>({string})</em>"
return string