Merge branch 'master' of git://git.ipfire.org/pbs

[pbs.git] / src / web / __init__.py

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 4ada5341ac9e88bfe0842f45927ca3b9788a2d83..5be08d83bc05dae596b34055cde772915f9020c3 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -13,8 +13,7 @@ from .. import Backend
 from ..constants import *
 from ..decorators import *
 
-from .handlers import *
-
+# Import all handlers
 from . import api
 from . import auth
 from . import builders
@@ -24,6 +23,12 @@ from . import errors
 from . import jobs
 from . import keys
 from . import mirrors
+from . import packages
+from . import search
+from . import updates
+from . import users
+from .handlers import *
+
 from . import ui_modules
 
 # Enable logging
@@ -75,9 +80,9 @@ class Application(tornado.web.Application):
                                "JobsTable"          : ui_modules.JobsTableModule,
                                "CommentsTable"      : ui_modules.CommentsTableModule,
                                "FilesTable"         : ui_modules.FilesTableModule,
+                               "LinkToUser"         : ui_modules.LinkToUserModule,
                                "LogTable"           : ui_modules.LogTableModule,
                                "LogFilesTable"      : ui_modules.LogFilesTableModule,
-                               "Maintainer"         : ui_modules.MaintainerModule,
                                "PackagesTable"      : ui_modules.PackagesTableModule,
                                "PackageTable2"      : ui_modules.PackageTable2Module,
                                "PackageHeader"      : ui_modules.PackageHeaderModule,
@@ -115,26 +120,26 @@ class Application(tornado.web.Application):
                        (r"/password-recovery", auth.PasswordRecoveryHandler),
 
                        # User profiles
-                       (r"/users", UsersHandler),
-                       (r"/user/(\w+)/impersonate", UserImpersonateHandler),
-                       (r"/user/(\w+)/passwd", UserPasswdHandler),
-                       (r"/user/(\w+)/delete", UserDeleteHandler),
-                       (r"/user/(\w+)/edit", UserEditHandler),
+                       (r"/users", users.UsersHandler),
+                       (r"/user/(\w+)/impersonate", users.UserImpersonateHandler),
+                       (r"/user/(\w+)/passwd", users.UserPasswdHandler),
+                       (r"/user/(\w+)/delete", users.UserDeleteHandler),
+                       (r"/user/(\w+)/edit", users.UserEditHandler),
                        (r"/user/(\w+)/activate", auth.ActivationHandler),
-                       (r"/user/(\w+)", UserHandler),
-                       (r"/profile", UserHandler),
-                       (r"/profile/builds", UsersBuildsHandler),
+                       (r"/user/(\w+)", users.UserHandler),
+                       (r"/profile", users.UserHandler),
+                       (r"/profile/builds", users.UsersBuildsHandler),
 
                        # Packages
-                       (r"/packages", PackageListHandler),
-                       (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", PackageDetailHandler),
-                       (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/download(.*)", PackageFileDownloadHandler),
-                       (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/view(.*)", PackageFileViewHandler),
-                       (r"/package/([\w\-\+]+)", PackageNameHandler),
-                       (r"/package/([\w\-\+]+)/builds/scratch", PackageScratchBuildsHandler),
-                       (r"/package/([\w\-\+]+)/builds/times", PackageBuildsTimesHandler),
-                       (r"/package/([\w\-\+]+)/changelog", PackageChangelogHandler),
-                       (r"/package/([\w\-\+]+)/properties", PackagePropertiesHandler),
+                       (r"/packages", packages.IndexHandler),
+                       (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", packages.PackageDetailHandler),
+                       (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/download(.*)", packages.PackageFileDownloadHandler),
+                       (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/view(.*)", packages.PackageFileViewHandler),
+                       (r"/package/([\w\-\+]+)", packages.PackageNameHandler),
+                       (r"/package/([\w\-\+]+)/builds/scratch", packages.PackageScratchBuildsHandler),
+                       (r"/package/([\w\-\+]+)/builds/times", packages.PackageBuildsTimesHandler),
+                       (r"/package/([\w\-\+]+)/changelog", packages.PackageChangelogHandler),
+                       (r"/package/([\w\-\+]+)/properties", packages.PackagePropertiesHandler),
 
                        # Files
                        (r"/file/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", FileDetailHandler),
@@ -155,9 +160,10 @@ class Application(tornado.web.Application):
                        (r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/watchers", builds.BuildWatchersHandler),
                        (r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/delete", builds.BuildDeleteHandler),
 
+                       (r"/queue", jobs.ShowQueueHandler),
+                       (r"/queue/([\w_]+)", jobs.ShowQueueHandler),
+
                        # Jobs
-                       (r"/jobs", jobs.JobsIndexHandler),
-                       (r"/jobs/filter", jobs.JobsFilterHandler),
                        (r"/job/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", jobs.JobDetailHandler),
                        (r"/job/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/abort", jobs.JobAbortHandler),
                        (r"/job/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/buildroot", jobs.JobBuildrootHandler),
@@ -205,7 +211,7 @@ class Application(tornado.web.Application):
                                distributions.DistroUpdateDetailHandler),
 
                        # Updates
-                       (r"/updates", UpdatesHandler),
+                       (r"/updates", updates.UpdatesHandler),
 
                        # Mirrors
                        (r"/mirrors",                                   mirrors.MirrorListHandler),
@@ -227,7 +233,7 @@ class Application(tornado.web.Application):
                        (r"/documents/what-is-the-pakfire-build-service", DocsWhatsthisHandler),
 
                        # Search
-                       (r"/search", SearchHandler),
+                       (r"/search", search.SearchHandler),
 
                        # Uploads
                        (r"/uploads", UploadsHandler),