From 0e95b6bc66fc6bd23c71a793ffa96d8c0dd7fc78 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 17 Jan 2021 12:58:58 +0100 Subject: [PATCH] buildqueue: remove query parameters no longer used/needed --- app/api.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/app/api.py b/app/api.py index f9f2e77..df98b9d 100644 --- a/app/api.py +++ b/app/api.py @@ -38,29 +38,27 @@ def sort_entries(entries: List[Dict]) -> List[Dict]: @router.get('/buildqueue') -async def index(request: Request, response: Response, include_new: bool = True, include_update: bool = True) -> Response: +async def index(request: Request, response: Response) -> Response: srcinfos = [] # packages that should be updated - if include_update: - for s in state.sources.values(): - for k, p in sorted(s.packages.items()): - if p.name in state.sourceinfos: - srcinfo = state.sourceinfos[p.name] - if not version_is_newer_than(srcinfo.build_version, p.version): - continue - srcinfos.append(srcinfo) + for s in state.sources.values(): + for k, p in sorted(s.packages.items()): + if p.name in state.sourceinfos: + srcinfo = state.sourceinfos[p.name] + if not version_is_newer_than(srcinfo.build_version, p.version): + continue + srcinfos.append(srcinfo) # packages that are new - if include_new: - available: Dict[str, List[SrcInfoPackage]] = {} - for srcinfo in state.sourceinfos.values(): - available.setdefault(srcinfo.pkgname, []).append(srcinfo) - for s in state.sources.values(): - for p in s.packages.values(): - available.pop(p.name, None) - for sis in available.values(): - srcinfos.extend(sis) + available: Dict[str, List[SrcInfoPackage]] = {} + for srcinfo in state.sourceinfos.values(): + available.setdefault(srcinfo.pkgname, []).append(srcinfo) + for s in state.sources.values(): + for p in s.packages.values(): + available.pop(p.name, None) + for sis in available.values(): + srcinfos.extend(sis) def build_key(srcinfo: SrcInfoPackage) -> Tuple[str, str]: return (srcinfo.repo_url, srcinfo.repo_path)