From dc38f21294f570192bfb071978ec4c3c57807ff5 Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Mon, 11 Jul 2022 17:12:50 +0800 Subject: [PATCH] chore: rename controllers to handles --- server/{controllers => handles}/account.go | 2 +- server/{controllers => handles}/aria2.go | 2 +- server/{controllers => handles}/auth.go | 2 +- server/{controllers => handles}/down.go | 2 +- server/{controllers => handles}/driver.go | 2 +- server/{controllers => handles}/fsmanage.go | 2 +- server/{controllers => handles}/fsread.go | 2 +- server/{controllers => handles}/meta.go | 2 +- server/{controllers => handles}/setting.go | 2 +- server/{controllers => handles}/task.go | 2 +- server/{controllers => handles}/user.go | 2 +- server/router.go | 100 ++++++++++---------- 12 files changed, 61 insertions(+), 61 deletions(-) rename server/{controllers => handles}/account.go (98%) rename server/{controllers => handles}/aria2.go (98%) rename server/{controllers => handles}/auth.go (98%) rename server/{controllers => handles}/down.go (99%) rename server/{controllers => handles}/driver.go (96%) rename server/{controllers => handles}/fsmanage.go (99%) rename server/{controllers => handles}/fsread.go (99%) rename server/{controllers => handles}/meta.go (99%) rename server/{controllers => handles}/setting.go (98%) rename server/{controllers => handles}/task.go (99%) rename server/{controllers => handles}/user.go (98%) diff --git a/server/controllers/account.go b/server/handles/account.go similarity index 98% rename from server/controllers/account.go rename to server/handles/account.go index e9e096c1..07977b92 100644 --- a/server/controllers/account.go +++ b/server/handles/account.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "strconv" diff --git a/server/controllers/aria2.go b/server/handles/aria2.go similarity index 98% rename from server/controllers/aria2.go rename to server/handles/aria2.go index bb0971e7..951fb8de 100644 --- a/server/controllers/aria2.go +++ b/server/handles/aria2.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "github.com/alist-org/alist/v3/internal/aria2" diff --git a/server/controllers/auth.go b/server/handles/auth.go similarity index 98% rename from server/controllers/auth.go rename to server/handles/auth.go index ae0225a1..de95895e 100644 --- a/server/controllers/auth.go +++ b/server/handles/auth.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "time" diff --git a/server/controllers/down.go b/server/handles/down.go similarity index 99% rename from server/controllers/down.go rename to server/handles/down.go index 35fa98d8..05d9c576 100644 --- a/server/controllers/down.go +++ b/server/handles/down.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "fmt" diff --git a/server/controllers/driver.go b/server/handles/driver.go similarity index 96% rename from server/controllers/driver.go rename to server/handles/driver.go index 5690bbee..531c95d3 100644 --- a/server/controllers/driver.go +++ b/server/handles/driver.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "fmt" diff --git a/server/controllers/fsmanage.go b/server/handles/fsmanage.go similarity index 99% rename from server/controllers/fsmanage.go rename to server/handles/fsmanage.go index e5c9b01f..eff87def 100644 --- a/server/controllers/fsmanage.go +++ b/server/handles/fsmanage.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "fmt" diff --git a/server/controllers/fsread.go b/server/handles/fsread.go similarity index 99% rename from server/controllers/fsread.go rename to server/handles/fsread.go index e4fe9d6a..a5a09972 100644 --- a/server/controllers/fsread.go +++ b/server/handles/fsread.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "fmt" diff --git a/server/controllers/meta.go b/server/handles/meta.go similarity index 99% rename from server/controllers/meta.go rename to server/handles/meta.go index 9f646a0a..0f1929e2 100644 --- a/server/controllers/meta.go +++ b/server/handles/meta.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "fmt" diff --git a/server/controllers/setting.go b/server/handles/setting.go similarity index 98% rename from server/controllers/setting.go rename to server/handles/setting.go index 9dc7df42..a1eb94bd 100644 --- a/server/controllers/setting.go +++ b/server/handles/setting.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "github.com/alist-org/alist/v3/internal/conf" diff --git a/server/controllers/task.go b/server/handles/task.go similarity index 99% rename from server/controllers/task.go rename to server/handles/task.go index 13b84d04..666d8a2b 100644 --- a/server/controllers/task.go +++ b/server/handles/task.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "github.com/alist-org/alist/v3/internal/aria2" diff --git a/server/controllers/user.go b/server/handles/user.go similarity index 98% rename from server/controllers/user.go rename to server/handles/user.go index 7ce0a0a0..dc4aa03b 100644 --- a/server/controllers/user.go +++ b/server/handles/user.go @@ -1,4 +1,4 @@ -package controllers +package handles import ( "strconv" diff --git a/server/router.go b/server/router.go index f2a131c3..22e1feef 100644 --- a/server/router.go +++ b/server/router.go @@ -4,7 +4,7 @@ import ( "github.com/alist-org/alist/v3/internal/conf" "github.com/alist-org/alist/v3/internal/message" "github.com/alist-org/alist/v3/server/common" - "github.com/alist-org/alist/v3/server/controllers" + "github.com/alist-org/alist/v3/server/handles" "github.com/alist-org/alist/v3/server/middlewares" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" @@ -15,60 +15,60 @@ func Init(r *gin.Engine) { Cors(r) WebDav(r) - r.GET("/d/*path", middlewares.Down, controllers.Down) - r.GET("/p/*path", middlewares.Down, controllers.Proxy) + r.GET("/d/*path", middlewares.Down, handles.Down) + r.GET("/p/*path", middlewares.Down, handles.Proxy) - r.POST("/api/auth/login", controllers.Login) + r.POST("/api/auth/login", handles.Login) api := r.Group("/api", middlewares.Auth) - api.GET("/auth/current", controllers.CurrentUser) + api.GET("/auth/current", handles.CurrentUser) admin := api.Group("/admin", middlewares.AuthAdmin) meta := admin.Group("/meta") - meta.GET("/list", controllers.ListMetas) - meta.POST("/create", controllers.CreateMeta) - meta.POST("/update", controllers.UpdateMeta) - meta.POST("/delete", controllers.DeleteMeta) + meta.GET("/list", handles.ListMetas) + meta.POST("/create", handles.CreateMeta) + meta.POST("/update", handles.UpdateMeta) + meta.POST("/delete", handles.DeleteMeta) user := admin.Group("/user") - user.GET("/list", controllers.ListUsers) - user.POST("/create", controllers.CreateUser) - user.POST("/update", controllers.UpdateUser) - user.POST("/delete", controllers.DeleteUser) + user.GET("/list", handles.ListUsers) + user.POST("/create", handles.CreateUser) + user.POST("/update", handles.UpdateUser) + user.POST("/delete", handles.DeleteUser) storage := admin.Group("/storage") - storage.GET("/list", controllers.ListStorages) - storage.POST("/create", controllers.CreateStorage) - storage.POST("/update", controllers.UpdateStorage) - storage.POST("/delete", controllers.DeleteStorage) + storage.GET("/list", handles.ListStorages) + storage.POST("/create", handles.CreateStorage) + storage.POST("/update", handles.UpdateStorage) + storage.POST("/delete", handles.DeleteStorage) driver := admin.Group("/driver") - driver.GET("/list", controllers.ListDriverItems) - driver.GET("/names", controllers.ListDriverNames) - driver.GET("/items", controllers.GetDriverItems) + driver.GET("/list", handles.ListDriverItems) + driver.GET("/names", handles.ListDriverNames) + driver.GET("/items", handles.GetDriverItems) setting := admin.Group("/setting") - setting.GET("/get", controllers.GetSetting) - setting.GET("/list", controllers.ListSettings) - setting.POST("/save", controllers.SaveSettings) - setting.POST("/delete", controllers.DeleteSetting) - setting.POST("/reset_token", controllers.ResetToken) - setting.POST("/set_aria2", controllers.SetAria2) + setting.GET("/get", handles.GetSetting) + setting.GET("/list", handles.ListSettings) + setting.POST("/save", handles.SaveSettings) + setting.POST("/delete", handles.DeleteSetting) + setting.POST("/reset_token", handles.ResetToken) + setting.POST("/set_aria2", handles.SetAria2) task := admin.Group("/task") - task.GET("/down/undone", controllers.UndoneDownTask) - task.GET("/down/done", controllers.DoneDownTask) - task.POST("/down/cancel", controllers.CancelDownTask) - task.GET("/transfer/undone", controllers.UndoneTransferTask) - task.GET("/transfer/done", controllers.DoneTransferTask) - task.POST("/transfer/cancel", controllers.CancelTransferTask) - task.GET("/upload/undone", controllers.UndoneUploadTask) - task.GET("/upload/done", controllers.DoneUploadTask) - task.POST("/upload/cancel", controllers.CancelUploadTask) - task.GET("/copy/undone", controllers.UndoneCopyTask) - task.GET("/copy/done", controllers.DoneCopyTask) - task.POST("/copy/cancel", controllers.CancelCopyTask) + task.GET("/down/undone", handles.UndoneDownTask) + task.GET("/down/done", handles.DoneDownTask) + task.POST("/down/cancel", handles.CancelDownTask) + task.GET("/transfer/undone", handles.UndoneTransferTask) + task.GET("/transfer/done", handles.DoneTransferTask) + task.POST("/transfer/cancel", handles.CancelTransferTask) + task.GET("/upload/undone", handles.UndoneUploadTask) + task.GET("/upload/done", handles.DoneUploadTask) + task.POST("/upload/cancel", handles.CancelUploadTask) + task.GET("/copy/undone", handles.UndoneCopyTask) + task.GET("/copy/done", handles.DoneCopyTask) + task.POST("/copy/cancel", handles.CancelCopyTask) ms := admin.Group("/message") ms.GET("/get", message.PostInstance.GetHandle) @@ -76,22 +76,22 @@ func Init(r *gin.Engine) { // guest can public := api.Group("/public") - r.Any("/api/public/settings", controllers.PublicSettings) + r.Any("/api/public/settings", handles.PublicSettings) //public.GET("/settings", controllers.PublicSettings) - public.Any("/list", controllers.FsList) - public.Any("/get", controllers.FsGet) - public.Any("/dirs", controllers.FsDirs) + public.Any("/list", handles.FsList) + public.Any("/get", handles.FsGet) + public.Any("/dirs", handles.FsDirs) // gust can't fs := api.Group("/fs") - fs.POST("/mkdir", controllers.FsMkdir) - fs.POST("/rename", controllers.FsRename) - fs.POST("/move", controllers.FsMove) - fs.POST("/copy", controllers.FsCopy) - fs.POST("/remove", controllers.FsRemove) - fs.POST("/put", controllers.FsPut) - fs.POST("/link", middlewares.AuthAdmin, controllers.Link) - fs.POST("/add_aria2", controllers.AddAria2) + fs.POST("/mkdir", handles.FsMkdir) + fs.POST("/rename", handles.FsRename) + fs.POST("/move", handles.FsMove) + fs.POST("/copy", handles.FsCopy) + fs.POST("/remove", handles.FsRemove) + fs.POST("/put", handles.FsPut) + fs.POST("/link", middlewares.AuthAdmin, handles.Link) + fs.POST("/add_aria2", handles.AddAria2) } func Cors(r *gin.Engine) {