[Pkg-debile-commits] [debile-web] 01/02: Improve the filter contition for the unfinished/queued job/source lists.

[Jon Severinsson]

This is an automated email from the git hooks/post-receive script.

jonno-guest pushed a commit to branch master
in repository debile-web.

commit 3dc62188f2494f03d2b45681faac91fedebbf6f3
Author: Jon Severinsson <jon at severinsson.net>
Date:   Mon Apr 21 17:13:29 2014 +0200

    Improve the filter contition for the unfinished/queued job/source lists.
---
 debileweb/blueprints/frontend.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index 2f7bd0a..fe15442 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -93,14 +93,15 @@ def index():
 
     info = {}
     info['unfinished_sources'] = session.query(Source).filter(
-        Source.jobs.any(Job.finished_at == None),
+        Source.jobs.any(Job.failed.is_(None)),
     ).count()
     info['queued_sources'] = session.query(Source).filter(
         Source.jobs.any(
             ~Job.depedencies.any() &
             (Job.externally_blocked == False) &
             (Job.assigned_at == None) &
-            (Job.finished_at == None)
+            (Job.finished_at == None) &
+            Job.failed.is_(None)
         ),
     ).count()
     info['unbuilt_sources'] = session.query(Source).filter(
@@ -114,13 +115,14 @@ def index():
     ).count()
 
     info['unfinished_jobs'] = session.query(Job).filter(
-        Job.finished_at == None,
+        Job.failed.is_(None),
     ).count()
     info['queued_jobs'] = session.query(Job).filter(
         ~Job.depedencies.any(),
         Job.externally_blocked == False,
         Job.assigned_at == None,
         Job.finished_at == None,
+        Job.failed.is_(None),
     ).count()
     info['unbuilt_jobs'] = session.query(Job).filter(
         Job.check.has(Check.build == True),
@@ -184,7 +186,7 @@ def sources(search="", prefix="recent", page=0):
     elif prefix == "unfinished":
         desc = "All source packages with unfinished jobs."
         query = session.query(Source).filter(
-            Source.jobs.any(Job.finished_at == None),
+            Source.jobs.any(Job.failed.is_(None)),
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
@@ -196,7 +198,8 @@ def sources(search="", prefix="recent", page=0):
                 ~Job.depedencies.any() &
                 (Job.externally_blocked == False) &
                 (Job.assigned_at == None) &
-                (Job.finished_at == None)
+                (Job.finished_at == None) &
+                Job.failed.is_(None)
             ),
         ).order_by(
             Source.name.asc(),
@@ -281,7 +284,7 @@ def jobs(prefix="recent", page=0):
     elif prefix == "unfinished":
         desc = "All unfinished jobs."
         query = session.query(Job).join(Job.source).filter(
-            Job.finished_at == None,
+            Job.failed.is_(None),
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
@@ -294,6 +297,7 @@ def jobs(prefix="recent", page=0):
             ~Job.depedencies.any(),
             Job.assigned_at == None,
             Job.finished_at == None,
+            Job.failed.is_(None),
         ).order_by(
             Check.build.desc(),
             Source.uploaded_at.asc(),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git