Merge Pakfire Hub into the main webapp

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

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 005c0c49a39fda3faabd67a0b4884ec7c02623a8..07b7beecf4548e1bf9f0f65e5dd9eb846eb030c3 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -24,6 +24,7 @@ from . import mirrors
 from . import packages
 from . import repos
 from . import search
+from . import uploads
 from . import users
 from .handlers import *
 
@@ -128,12 +129,18 @@ class Application(tornado.web.Application):
                        (r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/unwatch", builds.UnwatchHandler),
                        (r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/comment", builds.BuildDetailCommentHandler),
 
+                       (r"/api/v1/builds", builds.APIv1IndexHandler),
+
+                       # Queue
                        (r"/queue", jobs.QueueHandler),
+                       (r"/api/v1/jobs/queue", jobs.APIv1QueueHandler),
 
                        # Jobs
                        (r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/abort", jobs.AbortHandler),
                        (r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/log", jobs.LogHandler),
                        (r"/job/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/buildroot", jobs.JobBuildrootHandler),
+                       (r"/api/v1/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})",
+                               jobs.APIv1DetailHandler),
 
                        # Builders
                        (r"/builders", builders.BuilderListHandler),
@@ -141,6 +148,7 @@ class Application(tornado.web.Application):
                        (r"/builders/([A-Za-z0-9\-\.]+)/delete", builders.BuilderDeleteHandler),
                        (r"/builders/([A-Za-z0-9\-\.]+)/edit", builders.BuilderEditHandler),
                        (r"/builders/([A-Za-z0-9\-\.]+)", builders.BuilderDetailHandler),
+                       (r"/api/v1/builders/stats", builders.APIv1StatsHandler),
 
                        # Distributions
                        (r"/distros", distributions.IndexHandler),
@@ -172,6 +180,11 @@ class Application(tornado.web.Application):
 
                        # Log
                        (r"/log", handlers.LogHandler),
+
+                       # Uploads
+                       (r"/api/v1/uploads", uploads.APIv1IndexHandler),
+                       (r"/api/v1/uploads/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})",
+                               uploads.APIv1DetailHandler),
                ], default_handler_class=errors.Error404Handler, **settings)
 
                # Launch backend