Moved Rest controllers to 'api' package. Also removed annotation routes

2016-02-25 16:31:06 -05:00
parent 543e195744
commit 39757f884a
14 changed files with 20 additions and 143 deletions
@@ -1,22 +1,25 @@
 package routers

 import (
-	"github.com/deluan/gosonic/controllers"
+	"github.com/deluan/gosonic/api"

 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/context"
+	"github.com/deluan/gosonic/controllers"
 )

 func init() {
-	beego.Include(
-		&controllers.MainController{},
-		&controllers.PingController{},
-		&controllers.GetLicenseController{},
-		&controllers.GetMusicFoldersController{},
+	ns := beego.NewNamespace("/rest",
+		beego.NSRouter("/ping.view", &api.PingController{}),
+		beego.NSRouter("/getLicense.view", &api.GetLicenseController{}),
+		beego.NSRouter("/getMusicFolders.view", &api.GetMusicFoldersController{}),
 	)
+	beego.AddNamespace(ns)
+
+	beego.Router("/", &controllers.MainController{})

 	var ValidateRequest = func(ctx *context.Context) {
-		controllers.Validate(&beego.Controller{Ctx: ctx})
+		api.Validate(&beego.Controller{Ctx: ctx})
 	}

 	beego.InsertFilter("/rest/*", beego.BeforeRouter, ValidateRequest)