From 6a1303be830ea3e7b5b5482f07f8ca32b9cb2c9b Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 6 Jan 2023 09:19:32 +0100
Subject: [PATCH] Partly revert 9c609e66d413013

we still want to link to the base package in the queue if possible
---
 app/templates/queue.html |  8 ++++++--
 app/web.py               | 13 ++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/templates/queue.html b/app/templates/queue.html
index 4318db0..4f02295 100644
--- a/app/templates/queue.html
+++ b/app/templates/queue.html
@@ -65,7 +65,7 @@
         </tr>
       </thead>
       <tbody>
-          {% for (srcinfo, p, status) in updates %}
+          {% for (srcinfo, s, p, status) in updates %}
           <tr>
             <td class="mytooltip">
                 <a href="{{ srcinfo.history_url }}">{{ srcinfo.date.split()[0] }}</a>
@@ -73,7 +73,11 @@
                     {{ srcinfo.date }} <span class="text-muted">(UTC)</span>
                 </template>
             </td>
-            <td><a href="{{ srcinfo.source_url }}">{{ srcinfo.pkgbase }}</a></td>
+            {% if s %}
+                <td><a href="{{ url_for('base', base_name=s.name) }}">{{ srcinfo.pkgbase }}</a></td>
+            {% else %}
+                <td><a href="{{ srcinfo.source_url }}">{{ srcinfo.pkgbase }}</a></td>
+            {% endif %}
             {% if p %}
               <td class="text-version">{{ p.version }}</td>
             {% else %}
diff --git a/app/web.py b/app/web.py
index 62d9bc0..65a2685 100644
--- a/app/web.py
+++ b/app/web.py
@@ -582,7 +582,7 @@ def get_build_status(srcinfo: SrcInfoPackage, repo_list: Set[str] = set()) -> Li
 async def queue(request: Request, response: Response, repo: str = "") -> Response:
     # Create entries for all packages where the version doesn't match
 
-    UpdateEntry = Tuple[SrcInfoPackage, Optional[Package], List[PackageBuildStatus]]
+    UpdateEntry = Tuple[SrcInfoPackage, Optional[Source], Optional[Package], List[PackageBuildStatus]]
 
     repo_filter = repo or None
     repos = get_repositories()
@@ -599,7 +599,8 @@ async def queue(request: Request, response: Response, repo: str = "") -> Respons
                 if version_is_newer_than(srcinfo.build_version, p.version):
                     srcinfo_repos.setdefault(srcinfo.pkgbase, set()).add(srcinfo.repo)
                     repo_list = srcinfo_repos[srcinfo.pkgbase] if not repo_filter else set([repo_filter])
-                    grouped[srcinfo.pkgbase] = (srcinfo, p, get_build_status(srcinfo, repo_list))
+                    new_src = state.sources.get(srcinfo.pkgbase)
+                    grouped[srcinfo.pkgbase] = (srcinfo, new_src, p, get_build_status(srcinfo, repo_list))
 
     # new packages
     available: Dict[str, List[SrcInfoPackage]] = {}
@@ -616,10 +617,12 @@ async def queue(request: Request, response: Response, repo: str = "") -> Respons
         for srcinfo in srcinfos:
             srcinfo_repos.setdefault(srcinfo.pkgbase, set()).add(srcinfo.repo)
             repo_list = srcinfo_repos[srcinfo.pkgbase] if not repo_filter else set([repo_filter])
-            pkg = None
+            src, pkg = None, None
             if srcinfo.pkgbase in grouped:
-                pkg = grouped[srcinfo.pkgbase][1]
-            grouped[srcinfo.pkgbase] = (srcinfo, pkg, get_build_status(srcinfo, repo_list))
+                src, pkg = grouped[srcinfo.pkgbase][1:3]
+            elif srcinfo.pkgbase in state.sources:
+                src = state.sources[srcinfo.pkgbase]
+            grouped[srcinfo.pkgbase] = (srcinfo, src, pkg, get_build_status(srcinfo, repo_list))
 
     updates: List[UpdateEntry] = []
     updates = list(grouped.values())