Refactoring: rename package routers -> routes

cmd/hook.go

@@ -23,7 +23,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/httplib"
 	"github.com/gogits/gogs/pkg/setting"
-	http "github.com/gogits/gogs/routers/repo"
+	http "github.com/gogits/gogs/routes/repo"
 )
 
 var (

cmd/serv.go

@@ -19,7 +19,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
 	"github.com/gogits/gogs/pkg/setting"
-	http "github.com/gogits/gogs/routers/repo"
+	http "github.com/gogits/gogs/routes/repo"
 )
 
 const (

cmd/web.go

@@ -36,13 +36,13 @@ import (
 	"github.com/gogits/gogs/pkg/mailer"
 	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/pkg/template"
-	"github.com/gogits/gogs/routers"
-	"github.com/gogits/gogs/routers/admin"
-	apiv1 "github.com/gogits/gogs/routers/api/v1"
-	"github.com/gogits/gogs/routers/dev"
-	"github.com/gogits/gogs/routers/org"
-	"github.com/gogits/gogs/routers/repo"
-	"github.com/gogits/gogs/routers/user"
+	"github.com/gogits/gogs/routes"
+	"github.com/gogits/gogs/routes/admin"
+	apiv1 "github.com/gogits/gogs/routes/api/v1"
+	"github.com/gogits/gogs/routes/dev"
+	"github.com/gogits/gogs/routes/org"
+	"github.com/gogits/gogs/routes/repo"
+	"github.com/gogits/gogs/routes/user"
 )
 
 var Web = cli.Command{
@@ -160,7 +160,7 @@ func runWeb(c *cli.Context) error {
 	if c.IsSet("config") {
 		setting.CustomConf = c.String("config")
 	}
-	routers.GlobalInit()
+	routes.GlobalInit()
 	checkVersion()
 
 	m := newMacaron()
@@ -175,17 +175,17 @@ func runWeb(c *cli.Context) error {
 	// FIXME: not all routes need go through same middlewares.
 	// Especially some AJAX requests, we can reduce middleware number to improve performance.
 	// Routers.
-	m.Get("/", ignSignIn, routers.Home)
+	m.Get("/", ignSignIn, routes.Home)
 	m.Group("/explore", func() {
 		m.Get("", func(c *context.Context) {
 			c.Redirect(setting.AppSubURL + "/explore/repos")
 		})
-		m.Get("/repos", routers.ExploreRepos)
-		m.Get("/users", routers.ExploreUsers)
-		m.Get("/organizations", routers.ExploreOrganizations)
+		m.Get("/repos", routes.ExploreRepos)
+		m.Get("/users", routes.ExploreUsers)
+		m.Get("/organizations", routes.ExploreOrganizations)
 	}, ignSignIn)
-	m.Combo("/install", routers.InstallInit).Get(routers.Install).
-		Post(bindIgnErr(form.Install{}), routers.InstallPost)
+	m.Combo("/install", routes.InstallInit).Get(routes.Install).
+		Post(bindIgnErr(form.Install{}), routes.InstallPost)
 	m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues)
 
 	// ***** START: User *****
@@ -651,7 +651,7 @@ func runWeb(c *cli.Context) error {
 	})
 
 	// Not found handler.
-	m.NotFound(routers.NotFound)
+	m.NotFound(routes.NotFound)
 
 	// Flag for port number in case first time run conflict.
 	if c.IsSet("port") {

gogs.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogits/gogs/pkg/setting"
 )
 
-const APP_VER = "0.11.19.0609"
+const APP_VER = "0.11.19.0611"
 
 func init() {
 	setting.AppVer = APP_VER

routes/admin/orgs.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers"
+	"github.com/gogits/gogs/routes"
 )
 
 const (
@@ -20,7 +20,7 @@ func Organizations(c *context.Context) {
 	c.Data["PageIsAdmin"] = true
 	c.Data["PageIsAdminOrganizations"] = true
 
-	routers.RenderUserSearch(c, &routers.UserSearchOptions{
+	routes.RenderUserSearch(c, &routes.UserSearchOptions{
 		Type:     models.USER_TYPE_ORGANIZATION,
 		Counter:  models.CountOrganizations,
 		Ranger:   models.Organizations,

routes/admin/users.go

@@ -15,7 +15,7 @@ import (
 	"github.com/gogits/gogs/pkg/form"
 	"github.com/gogits/gogs/pkg/mailer"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers"
+	"github.com/gogits/gogs/routes"
 )
 
 const (
@@ -29,7 +29,7 @@ func Users(c *context.Context) {
 	c.Data["PageIsAdmin"] = true
 	c.Data["PageIsAdminUsers"] = true
 
-	routers.RenderUserSearch(c, &routers.UserSearchOptions{
+	routes.RenderUserSearch(c, &routes.UserSearchOptions{
 		Type:     models.USER_TYPE_INDIVIDUAL,
 		Counter:  models.CountUsers,
 		Ranger:   models.Users,

routes/api/v1/admin/org.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/gogits/gogs/routes/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/user"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization

routes/api/v1/admin/org_team.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/gogits/gogs/routes/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/user"
 )
 
 func CreateTeam(c *context.APIContext, form api.CreateTeamOption) {

routes/api/v1/admin/repo.go

@@ -8,8 +8,8 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/repo"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/gogits/gogs/routes/api/v1/repo"
+	"github.com/gogits/gogs/routes/api/v1/user"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository

routes/api/v1/admin/user.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/mailer"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/gogits/gogs/routes/api/v1/user"
 )
 
 func parseLoginSource(c *context.APIContext, u *models.User, sourceID int64, loginName string) {

routes/api/v1/api.go

@@ -16,11 +16,11 @@ import (
 	"github.com/gogits/gogs/models/errors"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/form"
-	"github.com/gogits/gogs/routers/api/v1/admin"
-	"github.com/gogits/gogs/routers/api/v1/misc"
-	"github.com/gogits/gogs/routers/api/v1/org"
-	"github.com/gogits/gogs/routers/api/v1/repo"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/gogits/gogs/routes/api/v1/admin"
+	"github.com/gogits/gogs/routes/api/v1/misc"
+	"github.com/gogits/gogs/routes/api/v1/org"
+	"github.com/gogits/gogs/routes/api/v1/repo"
+	"github.com/gogits/gogs/routes/api/v1/user"
 )
 
 func repoAssignment() macaron.Handler {

routes/api/v1/org/org.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/gogits/gogs/routes/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/user"
 )
 
 func listUserOrgs(c *context.APIContext, u *models.User, all bool) {

routes/api/v1/org/team.go

@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/convert"
 )
 
 func ListTeams(c *context.APIContext) {

routes/api/v1/repo/branch.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch

routes/api/v1/repo/file.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/repo"
+	"github.com/gogits/gogs/routes/repo"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content

routes/api/v1/repo/hook.go

@@ -14,7 +14,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
 	"github.com/gogits/gogs/pkg/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks

routes/api/v1/repo/key.go

@@ -12,7 +12,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/convert"
 )
 
 func composeDeployKeysAPILink(repoPath string) string {

routes/api/v1/repo/repo.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/form"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories

routes/api/v1/user/email.go

@@ -10,7 +10,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user

routes/api/v1/user/key.go

@@ -11,8 +11,8 @@ import (
 	"github.com/gogits/gogs/models/errors"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/repo"
+	"github.com/gogits/gogs/routes/api/v1/convert"
+	"github.com/gogits/gogs/routes/api/v1/repo"
 )
 
 func GetUserByParamsName(c *context.APIContext, name string) *models.User {

routes/home.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package routers
+package routes
 
 import (
 	"github.com/Unknwon/paginater"
@@ -10,7 +10,7 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/user"
+	"github.com/gogits/gogs/routes/user"
 )
 
 const (

routes/install.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package routers
+package routes
 
 import (
 	"net/mail"

routes/org/setting.go

@@ -14,7 +14,7 @@ import (
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/form"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/user"
+	"github.com/gogits/gogs/routes/user"
 )
 
 const (

routes/user/profile.go

@@ -15,7 +15,7 @@ import (
 	"github.com/gogits/gogs/models/errors"
 	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/pkg/setting"
-	"github.com/gogits/gogs/routers/repo"
+	"github.com/gogits/gogs/routes/repo"
 )
 
 const (

templates/.VERSION

@@ -1 +1 @@
-0.11.19.0609
+0.11.19.0611