From: Michael Tremer Date: Tue, 24 Oct 2017 21:00:09 +0000 (+0100) Subject: Drop get_all function from builds X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4ea3aeddd2e06f0545aae2f87431d9e6c5af1c5;p=pbs.git Drop get_all function from builds Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index 6b3b344a..c5f995ef 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -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 = [] diff --git a/src/web/handlers_builds.py b/src/web/handlers_builds.py index 622c2326..8a4ea62f 100644 --- a/src/web/handlers_builds.py +++ b/src/web/handlers_builds.py @@ -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)