rename router.go to old_router.go

2021-03-23 18:17:07 +10:00 · 2021-03-23 18:17:07 +10:00 · db6bccb7ec
parent 1fa6b3ff26
commit db6bccb7ec
2 changed files with 67 additions and 67 deletions
--- a/old_router.go
+++ b/old_router.go
@ -0,0 +1,67 @@
+/* Obsoleted by gen_router.go :( */
+package main
+
+//import "fmt"
+import (
+	"net/http"
+	"strings"
+	"sync"
+
+	"github.com/Azareal/Gosora/common"
+)
+
+// TODO: Support the new handler signatures created by our efforts to move the PreRoute middleware into the generated router
+// nolint Stop linting the uselessness of this file, we never know when we might need this file again
+type Router struct {
+	sync.RWMutex
+	routes map[string]func(http.ResponseWriter, *http.Request)
+}
+
+// nolint
+func NewRouter() *Router {
+	return &Router{
+		routes: make(map[string]func(http.ResponseWriter, *http.Request)),
+	}
+}
+
+// nolint
+func (router *Router) Handle(pattern string, handle http.Handler) {
+	router.Lock()
+	router.routes[pattern] = handle.ServeHTTP
+	router.Unlock()
+}
+
+// nolint
+func (router *Router) HandleFunc(pattern string, handle func(http.ResponseWriter, *http.Request)) {
+	router.Lock()
+	router.routes[pattern] = handle
+	router.Unlock()
+}
+
+// nolint
+func (router *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	if len(req.URL.Path) == 0 || req.URL.Path[0] != '/' {
+		w.WriteHeader(405)
+		w.Write([]byte(""))
+		return
+	}
+
+	var /*extraData, */ prefix string
+	if req.URL.Path[len(req.URL.Path)-1] != '/' {
+		//extraData = req.URL.Path[strings.LastIndexByte(req.URL.Path,'/') + 1:]
+		prefix = req.URL.Path[:strings.LastIndexByte(req.URL.Path, '/')+1]
+	} else {
+		prefix = req.URL.Path
+	}
+
+	router.RLock()
+	handle, ok := router.routes[prefix]
+	router.RUnlock()
+
+	if ok {
+		handle(w, req)
+		return
+	}
+	//log.Print("req.URL.Path[:strings.LastIndexByte(req.URL.Path,'/')]",req.URL.Path[:strings.LastIndexByte(req.URL.Path,'/')])
+	common.NotFound(w, req,nil)
+}
--- a/router.go
+++ b/router.go
@ -1,67 +0,0 @@
-/* Obsoleted by gen_router.go :( */
-package main
-
-//import "fmt"
-import (
-	"net/http"
-	"strings"
-	"sync"
-
-	"github.com/Azareal/Gosora/common"
-)
-
-// TODO: Support the new handler signatures created by our efforts to move the PreRoute middleware into the generated router
-// nolint Stop linting the uselessness of this file, we never know when we might need this file again
-type Router struct {
-	sync.RWMutex
-	routes map[string]func(http.ResponseWriter, *http.Request)
-}
-
-// nolint
-func NewRouter() *Router {
-	return &Router{
-		routes: make(map[string]func(http.ResponseWriter, *http.Request)),
-	}
-}
-
-// nolint
-func (router *Router) Handle(pattern string, handle http.Handler) {
-	router.Lock()
-	router.routes[pattern] = handle.ServeHTTP
-	router.Unlock()
-}
-
-// nolint
-func (router *Router) HandleFunc(pattern string, handle func(http.ResponseWriter, *http.Request)) {
-	router.Lock()
-	router.routes[pattern] = handle
-	router.Unlock()
-}
-
-// nolint
-func (router *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	if len(req.URL.Path) == 0 || req.URL.Path[0] != '/' {
-		w.WriteHeader(405)
-		w.Write([]byte(""))
-		return
-	}
-
-	var /*extraData, */ prefix string
-	if req.URL.Path[len(req.URL.Path)-1] != '/' {
-		//extraData = req.URL.Path[strings.LastIndexByte(req.URL.Path,'/') + 1:]
-		prefix = req.URL.Path[:strings.LastIndexByte(req.URL.Path, '/')+1]
-	} else {
-		prefix = req.URL.Path
-	}
-
-	router.RLock()
-	handle, ok := router.routes[prefix]
-	router.RUnlock()
-
-	if ok {
-		handle(w, req)
-		return
-	}
-	//log.Print("req.URL.Path[:strings.LastIndexByte(req.URL.Path,'/')]",req.URL.Path[:strings.LastIndexByte(req.URL.Path,'/')])
-	common.NotFound(w, req,nil)
-}