almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Update projects list to return only the unique projects

Browse Source 
The projects_list function uses a different yum request, and doesn't
return a full project dict. Updated it to also return only the unique
project names.

Related: rhbz#1657055
This commit is contained in:
Brian C. Lane 2018-12-07 15:07:36 -08:00
parent b449d1cd81
commit 5797099552
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pylorax/api/projects.py
View File

@ -182,7 +182,8 @@ def projects_list(yb):
raise ProjectsError("There was a problem listing projects: %s" % str(e)) raise ProjectsError("There was a problem listing projects: %s" % str(e))
finally: finally:
yb.closeRpmDB() yb.closeRpmDB()
return sorted(map(yaps_to_project, ybl.available), key=lambda p: p["name"].lower()) projs = _unique_dicts(map(yaps_to_project, ybl.available), key=lambda p: p["name"].lower())
return sorted(projs, key=lambda p: p["name"].lower())
def projects_info(yb, project_names): def projects_info(yb, project_names):
"""Return details about specific projects """Return details about specific projects
@ -200,15 +201,24 @@ def projects_info(yb, project_names):
raise ProjectsError("There was a problem with info for %s: %s" % (project_names, str(e))) raise ProjectsError("There was a problem with info for %s: %s" % (project_names, str(e)))
finally: finally:
yb.closeRpmDB() yb.closeRpmDB()
return _unique_projs(ybl.available)
# iterate over pkgs def _unique_projs(projs):
# - if pkg.name isn't in the results yet, add pkg_to_project_info in sorted position """Return a sorted list of projects with builds combined into one project entry
# - if pkg.name is already in results, get its builds. If the build for pkg is different
:param yaps: Yum object with package details
:type yaps: YumAvailablePackageSqlite
:returns: List of project info dicts with yaps_to_project as well as epoch, version, release, etc.
:rtype: list of dicts
"""
# iterate over ybl.available
# - if ybl.name isn't in the results yet, add yaps_to_project_info in sorted position
# - if ybl.name is already in results, get its builds. If the build for the project is different
# in any way (version, arch, etc.) add it to the entry's builds list. If it is the same, # in any way (version, arch, etc.) add it to the entry's builds list. If it is the same,
# skip it. # skip it.
results = [] results = []
results_names = {} results_names = {}
for p in ybl.available: for p in projs:
if p.name.lower() not in results_names: if p.name.lower() not in results_names:
idx = insort_left(results, yaps_to_project_info(p), key=lambda p: p["name"].lower()) idx = insort_left(results, yaps_to_project_info(p), key=lambda p: p["name"].lower())
results_names[p.name.lower()] = idx results_names[p.name.lower()] = idx