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

Merge branch 'fix-rpc-search-generation' into pu

Browse source
This commit is contained in:
Kevin Morris 2021-10-31 23:19:02 -07:00
commit 4d214b9cd9
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
aurweb/rpc.py
View file

@ -162,7 +162,20 @@ class RPC:
"Popularity": pop, "Popularity": pop,
"OutOfDate": package.PackageBase.OutOfDateTS, "OutOfDate": package.PackageBase.OutOfDateTS,
"FirstSubmitted": package.PackageBase.SubmittedTS, "FirstSubmitted": package.PackageBase.SubmittedTS,
"LastModified": package.PackageBase.ModifiedTS, "LastModified": package.PackageBase.ModifiedTS
})
if package.PackageBase.Maintainer is not None:
# We do have a maintainer: set the Maintainer key.
data["Maintainer"] = package.PackageBase.Maintainer.Username
return data
def _get_info_json_data(self, package: models.Package):
data = self._get_json_data(package)
# Add licenses and keywords to info output.
data.update({
"License": [ "License": [
lic.License.Name for lic in package.package_licenses lic.License.Name for lic in package.package_licenses
], ],
@ -171,10 +184,6 @@ class RPC:
] ]
}) })
if package.PackageBase.Maintainer is not None:
# We do have a maintainer: set the Maintainer key.
data["Maintainer"] = package.PackageBase.Maintainer.Username
self._update_json_depends(package, data) self._update_json_depends(package, data)
self._update_json_relations(package, data) self._update_json_relations(package, data)
return data return data
@ -184,7 +193,7 @@ class RPC:
args = set(args) args = set(args)
packages = db.query(models.Package).filter( packages = db.query(models.Package).filter(
models.Package.Name.in_(args)) models.Package.Name.in_(args))
return [self._get_json_data(pkg) for pkg in packages] return [self._get_info_json_data(pkg) for pkg in packages]
def _handle_search_type(self, by: str = defaults.RPC_SEARCH_BY, def _handle_search_type(self, by: str = defaults.RPC_SEARCH_BY,
args: List[str] = []): args: List[str] = []):