]> git.ipfire.org Git - pbs.git/commitdiff
web: Drop self.pakfire from BaseHandler
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Oct 2017 16:29:01 +0000 (17:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Oct 2017 16:29:01 +0000 (17:29 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
12 files changed:
src/web/api.py
src/web/auth.py
src/web/base.py
src/web/builders.py
src/web/builds.py
src/web/distributions.py
src/web/handlers.py
src/web/jobs.py
src/web/keys.py
src/web/packages.py
src/web/search.py
src/web/users.py

index df84c5122844f3c1360b3e55ff2cb585715ea6ac..a9400f5cc54c35d5e60a3fe08a88c2a33b0f086b 100644 (file)
@@ -11,7 +11,7 @@ class ApiPackagesAutocomplete(base.ApiBaseHandler):
                        raise tornado.web.HTTPError(400)
 
                # Query database.
-               packages = self.pakfire.packages.autocomplete(query, limit=8)
+               packages = self.backend.packages.autocomplete(query, limit=8)
 
                res = {
                        "query"    : query,
index dd4b7eec619def8a340d6aaa6284ced1bf5b1dbc..4538db54b6842897f30426d684af1178a988a129 100644 (file)
@@ -19,7 +19,7 @@ class LoginHandler(base.BaseHandler):
                passphrase = self.get_argument("pass", None)
 
                # Log in the user
-               user = self.pakfire.users.auth(name, passphrase)
+               user = self.backend.users.auth(name, passphrase)
 
                # If the login was unsuccessful
                if not user:
@@ -107,7 +107,7 @@ class RegisterHandler(base.BaseHandler):
 
 class ActivationHandler(base.BaseHandler):
        def get(self, _user):
-               user = self.pakfire.users.get_by_name(_user)
+               user = self.backend.users.get_by_name(_user)
                if not user:
                        raise tornado.web.HTTPError(404)
 
index 6bf8c32e7d5d2dd6d30be1b24383303238a7e12d..f4e246c430268e4d4dde0bea201f0e824370f5ec 100644 (file)
@@ -77,7 +77,7 @@ class BaseHandler(tornado.web.RequestHandler):
 
                ns.update({
                        "backend"         : self.backend,
-                       "bugtracker"      : self.pakfire.bugzilla,
+                       "bugtracker"      : self.backend.bugzilla,
                        "hostname"        : self.request.host,
                        "format_date"     : self.format_date,
                        "format_size"     : misc.format_size,
@@ -112,10 +112,6 @@ class BaseHandler(tornado.web.RequestHandler):
                self.render(error_document, status_code=status_code,
                        status_message=status_message, exc_info=exc_info, tb=tb, **kwargs)
 
-       @property
-       def pakfire(self):
-               return self.backend
-
 
 class ApiBaseHandler(BaseHandler):
        pass
index 1de3a2adb90474f0a04d8e16cd0f50209017c463..b60c2864a83d037e4dec798f864ae9d65c933bd7 100644 (file)
@@ -11,10 +11,10 @@ class BuilderListHandler(base.BaseHandler):
 
 class BuilderDetailHandler(base.BaseHandler):
        def get(self, hostname):
-               builder = self.pakfire.builders.get_by_name(hostname)
+               builder = self.backend.builders.get_by_name(hostname)
 
                # Get running and pending jobs.
-               jobs = self.pakfire.jobs.get_active(builder=builder)
+               jobs = self.backend.jobs.get_active(builder=builder)
                jobs += builder.jobqueue
 
                # Get log.
@@ -27,7 +27,7 @@ class BuilderDetailHandler(base.BaseHandler):
                if not self.current_user.has_perm("maintain_mirrors"):
                        raise tornado.web.HTTPError(403, "User is not allowed to do this.")
 
-               builder = self.pakfire.builders.get_by_name(hostname)
+               builder = self.backend.builders.get_by_name(hostname)
 
                with self.db.transaction():
                        builder.description = self.get_argument("description", None)
@@ -57,7 +57,7 @@ class BuilderNewHandler(base.BaseHandler):
 class BuilderEditHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, hostname):
-               builder = self.pakfire.builders.get_by_name(hostname)
+               builder = self.backend.builders.get_by_name(hostname)
                if not builder:
                        raise tornado.web.HTTPError(404, "Builder not found")
 
@@ -65,7 +65,7 @@ class BuilderEditHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, hostname):
-               builder = self.pakfire.builders.get_by_name(hostname)
+               builder = self.backend.builders.get_by_name(hostname)
                if not builder:
                        raise tornado.web.HTTPError(404, "Builder not found: %s" % hostname)
 
@@ -94,7 +94,7 @@ class BuilderEditHandler(base.BaseHandler):
 class BuilderRenewPassphraseHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, name):
-               builder = self.pakfire.builders.get_by_name(name)
+               builder = self.backend.builders.get_by_name(name)
 
                passphrase = builder.regenerate_passphrase()
 
@@ -105,7 +105,7 @@ class BuilderRenewPassphraseHandler(base.BaseHandler):
 class BuilderDeleteHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, name):
-               builder = self.pakfire.builders.get_by_name(name)
+               builder = self.backend.builders.get_by_name(name)
                if not builder:
                        raise tornado.web.HTTPError(404, "Builder not found: %s" % name)
 
@@ -129,7 +129,7 @@ class BuilderStatusChangeHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def get(self, hostname):
-               builder = self.pakfire.builders.get_by_name(hostname)
+               builder = self.backend.builders.get_by_name(hostname)
                if not builder:
                        raise tornado.web.HTTPError(404, "Builder not found: %s" % hostname)
 
index c11a162bbfce8ed6fa8d7cd687fe2febd341b8db..dd28ca058e8908276400fe02f618025fa38e1722 100644 (file)
@@ -25,7 +25,7 @@ class BuildsHandler(base.BaseHandler):
 
 class BuildBaseHandler(base.BaseHandler):
        def get_build(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "No such build: %s" % uuid)
 
@@ -79,7 +79,7 @@ class BuildDeleteHandler(BuildBaseHandler):
 class BuildBugsHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "No such build: %s" % uuid)
 
@@ -91,7 +91,7 @@ class BuildBugsHandler(base.BaseHandler):
                fixed_bugs = build.get_bugs()
                open_bugs = []
 
-               for bug in self.pakfire.bugzilla.get_bugs_from_component(build.pkg.name):
+               for bug in self.backend.bugzilla.get_bugs_from_component(build.pkg.name):
                        if bug in fixed_bugs:
                                continue
 
@@ -102,7 +102,7 @@ class BuildBugsHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "No such build: %s" % uuid)
 
@@ -137,7 +137,7 @@ class BuildsCommentsHandler(base.BaseHandler):
        def get(self, user_name=None):
                user = None
                if user_name:
-                       user = self.pakfire.users.get_by_name(user_name)
+                       user = self.backend.users.get_by_name(user_name)
 
                limit  = self.get_argument("limit", 10)
                offset = self.get_argument("offset", 0)
@@ -150,7 +150,7 @@ class BuildsCommentsHandler(base.BaseHandler):
 
                # Try to get one more comment than requested and check if there
                # is a next page that it to be shown.
-               comments = self.pakfire.builds.get_comments(limit=limit + 1,
+               comments = self.backend.builds.get_comments(limit=limit + 1,
                        offset=offset, user=user)
 
                # Set markers for next and prev pages.
@@ -166,7 +166,7 @@ class BuildsCommentsHandler(base.BaseHandler):
 
 class BuildStateHandler(base.BaseHandler):
        def get(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "No such build: %s" % uuid)
 
@@ -174,7 +174,7 @@ class BuildStateHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "No such build: %s" % uuid)
 
@@ -210,7 +210,7 @@ class BuildQueueHandler(base.BaseHandler):
 class BuildDetailCommentHandler(base.BaseHandler):
        @tornado.web.authenticated
        def post(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found")
@@ -237,7 +237,7 @@ class BuildDetailCommentHandler(base.BaseHandler):
 class BuildManageHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found: %s" % uuid)
 
@@ -256,7 +256,7 @@ class BuildManageHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found: %s" % uuid)
 
@@ -294,7 +294,7 @@ class BuildManageHandler(base.BaseHandler):
 class BuildPriorityHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found")
@@ -303,7 +303,7 @@ class BuildPriorityHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found")
@@ -328,7 +328,7 @@ class BuildPriorityHandler(base.BaseHandler):
 
 class BuildWatchersHandler(base.BaseHandler):
        def get(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found")
@@ -343,7 +343,7 @@ class BuildWatchersHandler(base.BaseHandler):
 class BuildWatchersAddHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, uuid, error_msg=None):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found")
@@ -352,11 +352,11 @@ class BuildWatchersAddHandler(base.BaseHandler):
                watchers = build.get_watchers()
 
                self.render("builds-watchers-add.html", error_msg=error_msg,
-                       build=build, users=self.pakfire.users, watchers=watchers)
+                       build=build, users=self.backend.users, watchers=watchers)
 
        @tornado.web.authenticated
        def post(self, uuid):
-               build = self.pakfire.builds.get_by_uuid(uuid)
+               build = self.backend.builds.get_by_uuid(uuid)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Build not found")
@@ -368,7 +368,7 @@ class BuildWatchersAddHandler(base.BaseHandler):
                        user_id = self.get_argument("user_id", self.current_user.id)
                assert user_id
 
-               user = self.pakfire.users.get_by_id(user_id)
+               user = self.backend.users.get_by_id(user_id)
                if not user:
                        _ = self.locale.translate
                        error_msg = _("User not found.")
@@ -387,7 +387,7 @@ class BuildListHandler(base.BaseHandler):
                builder = self.get_argument("builder", None)
                state = self.get_argument("state", None)
 
-               builds = self.pakfire.builds.get_latest(state=state, builder=builder,
+               builds = self.backend.builds.get_latest(state=state, builder=builder,
                        limit=25)
 
                self.render("build-list.html", builds=builds)
@@ -395,8 +395,8 @@ class BuildListHandler(base.BaseHandler):
 
 class BuildFilterHandler(base.BaseHandler):
        def get(self):
-               builders = self.pakfire.builders.get_all()
-               distros  = self.pakfire.distros.get_all()
+               builders = self.backend.builders.get_all()
+               distros  = self.backend.distros.get_all()
 
                self.render("build-filter.html", builders=builders, distros=distros)
 
index 5c8ac88180101fc459a2e572e8580011ea8ef2fc..b85e484a67bc52adfcd3cdf4a96c9b70da078489 100644 (file)
@@ -11,7 +11,7 @@ class DistributionListHandler(base.BaseHandler):
 
 class DistributionDetailHandler(base.BaseHandler):
        def get(self, name):
-               distro = self.pakfire.distros.get_by_name(name)
+               distro = self.backend.distros.get_by_name(name)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distro not found")
 
@@ -20,11 +20,11 @@ class DistributionDetailHandler(base.BaseHandler):
 
 class DistributionEditHandler(base.BaseHandler):
        def prepare(self):
-               self.sources = self.pakfire.sources.get_all()
+               self.sources = self.backend.sources.get_all()
 
        @tornado.web.authenticated
        def get(self, name):
-               distro = self.pakfire.distros.get_by_name(name)
+               distro = self.backend.distros.get_by_name(name)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distro not found")
 
@@ -33,7 +33,7 @@ class DistributionEditHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, name):
-               distro = self.pakfire.distros.get_by_name(name)
+               distro = self.backend.distros.get_by_name(name)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distro not found")
 
@@ -69,7 +69,7 @@ class DistributionEditHandler(base.BaseHandler):
 
 class DistroSourceDetailHandler(base.BaseHandler):
        def get(self, distro_ident, source_ident):
-               distro = self.pakfire.distros.get_by_name(distro_ident)
+               distro = self.backend.distros.get_by_name(distro_ident)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distro not found")
 
@@ -87,7 +87,7 @@ class DistroSourceDetailHandler(base.BaseHandler):
 
 class DistroSourceCommitsHandler(base.BaseHandler):
        def get(self, distro_ident, source_ident):
-               distro = self.pakfire.distros.get_by_name(distro_ident)
+               distro = self.backend.distros.get_by_name(distro_ident)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distro not found")
 
@@ -116,7 +116,7 @@ class DistroSourceCommitsHandler(base.BaseHandler):
 
 class DistroSourceCommitDetailHandler(base.BaseHandler):
        def get(self, distro_ident, source_ident, commit_ident):
-               distro = self.pakfire.distros.get_by_name(distro_ident)
+               distro = self.backend.distros.get_by_name(distro_ident)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distribution '%s' not found" % distro_ident)
 
@@ -137,7 +137,7 @@ class DistroSourceCommitDetailHandler(base.BaseHandler):
 class DistroSourceCommitResetHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, distro_ident, source_ident, commit_ident):
-               distro = self.pakfire.distros.get_by_name(distro_ident)
+               distro = self.backend.distros.get_by_name(distro_ident)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distribution '%s' not found" % distro_ident)
 
@@ -168,14 +168,14 @@ class DistroSourceCommitResetHandler(base.BaseHandler):
 
 class DistroUpdateCreateHandler(base.BaseHandler):
        def get(self, distro_ident):
-               distro = self.pakfire.distros.get_by_name(distro_ident)
+               distro = self.backend.distros.get_by_name(distro_ident)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distribution '%s' not found" % distro_ident)
 
                # Get all preset builds.
                builds = []
                for build in self.get_arguments("builds", []):
-                       build = self.pakfire.builds.get_by_uuid(build)
+                       build = self.backend.builds.get_by_uuid(build)
                        builds.append(build)
 
                builds.sort()
@@ -186,7 +186,7 @@ class DistroUpdateCreateHandler(base.BaseHandler):
 
 class DistroUpdateDetailHandler(base.BaseHandler):
        def get(self, distro_ident, year, num):
-               distro = self.pakfire.distros.get_by_name(distro_ident)
+               distro = self.backend.distros.get_by_name(distro_ident)
                if not distro:
                        raise tornado.web.HTTPError(404, "Distribution '%s' not found" % distro_ident)
 
@@ -200,13 +200,13 @@ class DistroUpdateDetailHandler(base.BaseHandler):
 # XXX currently unused
 class SourceListHandler(base.BaseHandler):
        def get(self):
-               sources = self.pakfire.sources.get_all()
+               sources = self.backend.sources.get_all()
 
                self.render("source-list.html", sources=sources)
 
 
 class SourceDetailHandler(base.BaseHandler):
        def get(self, id):
-               source = self.pakfire.sources.get_by_id(id)
+               source = self.backend.sources.get_by_id(id)
 
                self.render("source-detail.html", source=source)
index d86e25663a7e641fa1f489900f817ee5cc3468b3..2480a8430d87e4b387520859c3bb649977641eea 100644 (file)
@@ -6,14 +6,14 @@ from . import base
 
 class IndexHandler(base.BaseHandler):
        def get(self):
-               jobs = self.pakfire.jobs.get_active()
-               jobs += self.pakfire.jobs.get_latest(age="24 hours", limit=5)
+               jobs = self.backend.jobs.get_active()
+               jobs += self.backend.jobs.get_latest(age="24 hours", limit=5)
 
                # Updates
                updates = []
                active = True
                for type in ("stable", "unstable", "testing"):
-                       u = self.pakfire.updates.get_latest(type=type)
+                       u = self.backend.updates.get_latest(type=type)
                        if u:
                                updates.append((type, u, active))
                                active = False
@@ -52,7 +52,7 @@ class DocsWhatsthisHandler(base.BaseHandler):
 
 class FileDetailHandler(base.BaseHandler):
        def get(self, uuid):
-               pkg, file = self.pakfire.packages.get_with_file_by_uuid(uuid)
+               pkg, file = self.backend.packages.get_with_file_by_uuid(uuid)
 
                if not file:
                        raise tornado.web.HTTPError(404, "File not found")
@@ -62,7 +62,7 @@ class FileDetailHandler(base.BaseHandler):
 
 class LogHandler(base.BaseHandler):
        def get(self):
-               self.render("log.html", log=self.pakfire.log)
+               self.render("log.html", log=self.backend.log)
 
 
 class SessionsHandler(base.BaseHandler):
@@ -90,7 +90,7 @@ class SessionsHandler(base.BaseHandler):
 
 class RepositoryDetailHandler(base.BaseHandler):
        def get(self, distro, repo):
-               distro = self.pakfire.distros.get_by_name(distro)
+               distro = self.backend.distros.get_by_name(distro)
                if not distro:
                        raise tornado.web.HTTPError(404)
 
@@ -125,7 +125,7 @@ class RepositoryDetailHandler(base.BaseHandler):
 class RepositoryEditHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, distro, repo):
-               distro = self.pakfire.distros.get_by_name(distro)
+               distro = self.backend.distros.get_by_name(distro)
                if not distro:
                        raise tornado.web.HTTPError(404)
 
@@ -140,7 +140,7 @@ class RepositoryEditHandler(base.BaseHandler):
 
 class RepositoryConfHandler(base.BaseHandler):
        def get(self, distro, repo):
-               distro = self.pakfire.distros.get_by_name(distro)
+               distro = self.backend.distros.get_by_name(distro)
                if not distro:
                        raise tornado.web.HTTPError(404)
 
@@ -160,7 +160,7 @@ class RepositoryConfHandler(base.BaseHandler):
 
 class RepositoryMirrorlistHandler(base.BaseHandler):
        def get(self, distro, repo):
-               distro = self.pakfire.distros.get_by_name(distro)
+               distro = self.backend.distros.get_by_name(distro)
                if not distro:
                        raise tornado.web.HTTPError(404)
 
@@ -207,7 +207,7 @@ class RepoActionHandler(base.BaseHandler):
 
                action_id = self.get_argument("id")
 
-               action = self.pakfire.repos.get_action_by_id(action_id)
+               action = self.backend.repos.get_action_by_id(action_id)
                if not action:
                        raise tornado.web.HTTPError(400)
 
index f17817bb13a0492b85609c440424276ca2c385b0..defdefbaf5f2ec22a3766485b2509d5e0e1d7047 100644 (file)
@@ -19,7 +19,7 @@ class ShowQueueHandler(base.BaseHandler):
 
 class JobDetailHandler(base.BaseHandler):
        def get(self, uuid):
-               job = self.pakfire.jobs.get_by_uuid(uuid)
+               job = self.backend.jobs.get_by_uuid(uuid)
                if not job:
                        raise tornado.web.HTTPError(404, "No such job: %s" % job)
 
@@ -31,7 +31,7 @@ class JobDetailHandler(base.BaseHandler):
 
 class JobBuildrootHandler(base.BaseHandler):
        def get(self, uuid):
-               job = self.pakfire.jobs.get_by_uuid(uuid)
+               job = self.backend.jobs.get_by_uuid(uuid)
                if not job:
                        raise tornado.web.HTTPError(404, "Job not found: %s" % uuid)
 
@@ -59,7 +59,7 @@ class JobScheduleHandler(base.BaseHandler):
                type = self.get_argument("type")
                assert type in self.allowed_types
 
-               job = self.pakfire.jobs.get_by_uuid(uuid)
+               job = self.backend.jobs.get_by_uuid(uuid)
                if not job:
                        raise tornado.web.HTTPError(404, "Job not found: %s" % uuid)
 
@@ -70,7 +70,7 @@ class JobScheduleHandler(base.BaseHandler):
                type = self.get_argument("type")
                assert type in self.allowed_types
 
-               job = self.pakfire.jobs.get_by_uuid(uuid)
+               job = self.backend.jobs.get_by_uuid(uuid)
                if not job:
                        raise tornado.web.HTTPError(404, "Job not found: %s" % uuid)
 
@@ -93,7 +93,7 @@ class JobScheduleHandler(base.BaseHandler):
 
 class JobAbortHandler(base.BaseHandler):
        def get_job(self, uuid):
-               job = self.pakfire.jobs.get_by_uuid(uuid)
+               job = self.backend.jobs.get_by_uuid(uuid)
                if not job:
                        raise tornado.web.HTTPError(404, "Job not found: %s" % uuid)
 
index 99b9442d10f798d87663e2a8b6027aff08a3003d..097aa71af45aa4bff37e46ab2c98ae25ef68aa76 100644 (file)
@@ -19,7 +19,7 @@ class KeysImportHandler(KeysActionHandler):
        def post(self):
                data = self.get_argument("data")
 
-               key = self.pakfire.keys.create(data)
+               key = self.backend.keys.create(data)
                assert key
 
                self.redirect("/keys")
@@ -28,7 +28,7 @@ class KeysImportHandler(KeysActionHandler):
 class KeysDeleteHandler(KeysActionHandler):
        @tornado.web.authenticated
        def get(self, fingerprint):
-               key = self.pakfire.keys.get_by_fpr(fingerprint)
+               key = self.backend.keys.get_by_fpr(fingerprint)
                if not key:
                        raise tornado.web.HTTPError(404, "Could not find key: %s" % fingerprint)
 
@@ -43,14 +43,14 @@ class KeysDeleteHandler(KeysActionHandler):
 
 class KeysListHandler(base.BaseHandler):
        def get(self):
-               keys = self.pakfire.keys.get_all()
+               keys = self.backend.keys.get_all()
 
                self.render("keys-list.html", keys=keys)
 
 
 class KeysDownloadHandler(base.BaseHandler):
        def get(self, fingerprint):
-               key = self.pakfire.keys.get_by_fpr(fingerprint)
+               key = self.backend.keys.get_by_fpr(fingerprint)
                if not key:
                        raise tornado.web.HTTPError(404, "Could not find key: %s" % fingerprint)
 
index 8c0344af514bd85dbc821dde741b281afb939bed..4ec12aa86968f421c810e43dbc7d4b9921b95169 100644 (file)
@@ -32,7 +32,7 @@ class PackageListHandler(base.BaseHandler):
                        states = ["building", "stable", "testing"]
 
                # Get all packages that fulfill the required parameters.
-               pkgs = self.pakfire.packages.get_all_names(
+               pkgs = self.backend.packages.get_all_names(
                        user=self.current_user, states=states)
 
                # Sort all packages in an array like "<first char>" --> [packages, ...]
@@ -50,7 +50,7 @@ class PackageListHandler(base.BaseHandler):
 
 class PackageNameHandler(base.BaseHandler):
        def get(self, name):
-               builds = self.pakfire.builds.get_active_builds(name)
+               builds = self.backend.builds.get_active_builds(name)
                if not builds:
                        raise tornado.web.HTTPError(404, "Package '%s' was not found" % name)
 
@@ -58,7 +58,7 @@ class PackageNameHandler(base.BaseHandler):
                latest_build = builds[0]
 
                # Get the latest bugs from bugzilla.
-               bugs = self.pakfire.bugzilla.get_bugs_from_component(name)
+               bugs = self.backend.bugzilla.get_bugs_from_component(name)
 
                self.render("package-detail-list.html", name=name, builds=builds,
                        latest_build=latest_build, pkg=latest_build.pkg, bugs=bugs)
@@ -69,13 +69,13 @@ class PackageScratchBuildsHandler(base.BaseHandler):
                offset = self.get_argument("offset", 0)
                limit  = self.get_argument("limit", 10)
 
-               scratch_builds = self.pakfire.builds.get_by_name(name, type="scratch",
+               scratch_builds = self.backend.builds.get_by_name(name, type="scratch",
                        limit=limit, offset=offset)
 
                if scratch_builds:
                        latest_build = scratch_builds[0]
                else:
-                       release_builds = self.pakfire.builds.get_by_name(name, type="release", limit=1)
+                       release_builds = self.backend.builds.get_by_name(name, type="release", limit=1)
                        if not release_builds:
                                raise tornado.web.HTTPError(404, "Could not find any build with this name: %s" % name)
 
@@ -101,7 +101,7 @@ class PackageChangelogHandler(base.BaseHandler):
 
                # Get one more build than requested to find out if there are more items
                # to display (next button).
-               builds = self.pakfire.builds.get_changelog(name, limit=limit + 1, offset=offset)
+               builds = self.backend.builds.get_changelog(name, limit=limit + 1, offset=offset)
 
                if len(builds) >= limit:
                        have_next = True
@@ -122,7 +122,7 @@ class PackageChangelogHandler(base.BaseHandler):
 
 class PackageDetailHandler(base.BaseHandler):
        def get(self, uuid):
-               pkg = self.pakfire.packages.get_by_uuid(uuid)
+               pkg = self.backend.packages.get_by_uuid(uuid)
                if not pkg:
                        raise tornado.web.HTTPError(404, "Package not found: %s" % uuid)
 
@@ -130,7 +130,7 @@ class PackageDetailHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, name, epoch, version, release):
-               pkg = self.pakfire.packages.get_by_tuple(name, epoch, version, release)
+               pkg = self.backend.packages.get_by_tuple(name, epoch, version, release)
 
                action = self.get_argument("action", None)
 
@@ -149,7 +149,7 @@ class PackageDetailHandler(base.BaseHandler):
 class PackagePropertiesHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, name):
-               build = self.pakfire.builds.get_latest_by_name(name)
+               build = self.backend.builds.get_latest_by_name(name)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Package '%s' was not found" % name)
@@ -164,7 +164,7 @@ class PackagePropertiesHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, name):
-               build = self.pakfire.builds.get_latest_by_name(name)
+               build = self.backend.builds.get_latest_by_name(name)
 
                if not build:
                        raise tornado.web.HTTPError(404, "Package '%s' was not found" % name)
@@ -185,7 +185,7 @@ class PackagePropertiesHandler(base.BaseHandler):
 class PackageFileDownloadHandler(base.BaseHandler):
        def get_file(self, pkg_uuid, filename):
                # Fetch package.
-               pkg = self.pakfire.packages.get_by_uuid(pkg_uuid)
+               pkg = self.backend.packages.get_by_uuid(pkg_uuid)
                if not pkg:
                        raise tornado.web.HTTPError(404, "Package not found: %s" % pkg_uuid)
 
@@ -246,14 +246,14 @@ class PackageFileViewHandler(PackageFileDownloadHandler):
 
 class PackageBuildsTimesHandler(base.BaseHandler):
        def get(self, name):
-               latest_build = self.pakfire.builds.get_latest_by_name(name)
+               latest_build = self.backend.builds.get_latest_by_name(name)
 
                # If no build with this name was found, we cannot go on.
                if not latest_build:
                        raise tornado.web.HTTPError(404)
 
                # Get the summary stats.
-               build_times_summary = self.pakfire.builds.get_build_times_summary(name)
+               build_times_summary = self.backend.builds.get_build_times_summary(name)
 
                self.render("packages/builds/times.html", pkg=latest_build.pkg,
                        build_times_summary=build_times_summary)
index c1a556be61a39cca3aa30c1979f352d36d712272..f9e3b8d7fabd88c08374f49dd5d5f13c07beb9f4 100644 (file)
@@ -16,19 +16,19 @@ class SearchHandler(base.BaseHandler):
                        # Search for a matching object and redirect to it.
 
                        # Search in packages.
-                       pkg = self.pakfire.packages.get_by_uuid(pattern)
+                       pkg = self.backend.packages.get_by_uuid(pattern)
                        if pkg:
                                self.redirect("/package/%s" % pkg.uuid)
                                return
 
                        # Search in builds.
-                       build = self.pakfire.builds.get_by_uuid(pattern)
+                       build = self.backend.builds.get_by_uuid(pattern)
                        if build:
                                self.redirect("/build/%s" % build.uuid)
                                return
 
                        # Search in jobs.
-                       job = self.pakfire.jobs.get_by_uuid(pattern)
+                       job = self.backend.jobs.get_by_uuid(pattern)
                        if job:
                                self.redirect("/job/%s" % job.uuid)
                                return
@@ -37,14 +37,14 @@ class SearchHandler(base.BaseHandler):
 
                if pattern.startswith("/"):
                        # Do a file search.
-                       files = self.pakfire.packages.search_by_filename(pattern, limit=50)
+                       files = self.backend.packages.search_by_filename(pattern, limit=50)
 
                else:
                        # Make fulltext search in the packages.
-                       pkgs = self.pakfire.packages.search(pattern, limit=50)
+                       pkgs = self.backend.packages.search(pattern, limit=50)
 
                        # Search for users.
-                       users = self.pakfire.users.search(pattern, limit=50)
+                       users = self.backend.users.search(pattern, limit=50)
 
                if len(pkgs) == 1 and not files and not users:
                        pkg = pkgs[0]
index 0a2c2e74cfb52a9c3359ccb5cb960ffb4a96274a..76e30127327f53ef1a8669d0802cdf8b6d7c232d 100644 (file)
@@ -11,7 +11,7 @@ class UserHandler(base.BaseHandler):
                user = self.current_user
 
                if name:
-                       user = self.pakfire.users.get_by_name(name)
+                       user = self.backend.users.get_by_name(name)
                        if not user:
                                raise tornado.web.HTTPError(404, "User does not exist: %s" % name)
 
@@ -51,7 +51,7 @@ class UserImpersonateHandler(base.BaseHandler):
 
 class UserActionHandler(base.BaseHandler):
        def get_user(self, name):
-               user = self.pakfire.users.get_by_name(name)
+               user = self.backend.users.get_by_name(name)
                if not user:
                        raise tornado.web.HTTPError(404)
 
@@ -130,7 +130,7 @@ class UserPasswdHandler(UserActionHandler):
 class UserEditHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, name):
-               user = self.pakfire.users.get_by_name(name)
+               user = self.backend.users.get_by_name(name)
                if not user:
                        raise tornado.web.HTTPError(404)
 
@@ -143,7 +143,7 @@ class UserEditHandler(base.BaseHandler):
        def post(self, name):
                _ = self.locale.translate
 
-               user = self.pakfire.users.get_by_name(name)
+               user = self.backend.users.get_by_name(name)
                if not user:
                        raise tornado.web.HTTPError(404)
 
@@ -208,11 +208,11 @@ class UsersBuildsHandler(base.BaseHandler):
                if name is None:
                        user = self.current_user
                else:
-                       user = self.pakfire.users.get_by_name(name)
+                       user = self.backend.users.get_by_name(name)
                        if not user:
                                raise tornado.web.HTTPError(404, "User not found: %s" % name)
 
                # Get a list of the builds this user has built.
-               builds = self.pakfire.builds.get_by_user(user)
+               builds = self.backend.builds.get_by_user(user)
 
                self.render("user-profile-builds.html", user=user, builds=builds)