]> git.ipfire.org Git - pbs.git/commitdiff
Drop get_all function from builds
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Oct 2017 21:00:09 +0000 (22:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Oct 2017 21:00:32 +0000 (22:00 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/builds.py
src/web/handlers_builds.py

index 6b3b344a53384159ef58c3ff8f04d06409c25b5b..c5f995efbc2e0d6370da3471d8c4d42998291c38 100644 (file)
@@ -31,6 +31,11 @@ class Builds(base.Object):
                for row in res:
                        yield Build(self.backend, row.id, data=row)
 
+       def __iter__(self):
+               builds = self._get_builds("SELECT * FROM builds ORDER BY time_created DESC")
+
+               return iter(builds)
+
        def get_by_id(self, id, data=None):
                return Build(self.backend, id, data=data)
 
@@ -40,14 +45,6 @@ class Builds(base.Object):
                if build:
                        return self.get_by_id(build.id)
 
-       def get_all(self, limit=50):
-               query = "SELECT * FROM builds ORDER BY time_created DESC"
-
-               if limit:
-                       query += " LIMIT %d" % limit
-
-               return [self.get_by_id(b.id, b) for b in self.db.query(query)]
-
        def get_by_user(self, user, type=None):
                args = []
                conditions = []
index 622c23260053d49c6704f4870f57b27de4258eec..8a4ea62f8f1a9f584cb9393e5398ba429397b563 100644 (file)
@@ -12,7 +12,13 @@ class BuildsHandler(BaseHandler):
                except (TypeError, ValueError):
                        limit = 25
 
-               builds = self.pakfire.builds.get_all(limit=limit)
+               builds = []
+               for build in self.backend.builds:
+                       builds.append(build)
+
+                       limit -= 1
+                       if not limit:
+                               break
 
                self.render("build-index.html", builds=builds)