marco/yt-dlp-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code refactoring

Browse Source
This commit is contained in:
marcobaobao
2025-02-03 10:25:20 +01:00
parent 67b01f9e0b
commit cc6a562e9e
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/handlers/filebrowser.go → server/filebrowser/handlers.go
View File

@@ -1,4 +1,4 @@
package handlers package filebrowser
import ( import (
"archive/zip" "archive/zip"

17
server/server.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archiver" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/archiver"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/config"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/dbutil" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/dbutil"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/handlers" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/filebrowser"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/internal/livestream"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/logging" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/logging"
@@ -32,6 +32,7 @@ import (
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rest" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rest"
ytdlpRPC "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rpc" ytdlpRPC "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/rpc"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status" "github.com/marcopiovanello/yt-dlp-web-ui/v3/server/status"
"github.com/marcopiovanello/yt-dlp-web-ui/v3/server/user"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
) )
@@ -187,11 +188,11 @@ func newServer(c serverConfig) *http.Server {
if config.Instance().UseOpenId { if config.Instance().UseOpenId {
r.Use(openid.Middleware) r.Use(openid.Middleware)
} }
r.Post("/downloaded", handlers.ListDownloaded) r.Post("/downloaded", filebrowser.ListDownloaded)
r.Post("/delete", handlers.DeleteFile) r.Post("/delete", filebrowser.DeleteFile)
r.Get("/d/{id}", handlers.DownloadFile) r.Get("/d/{id}", filebrowser.DownloadFile)
r.Get("/v/{id}", handlers.SendFile) r.Get("/v/{id}", filebrowser.SendFile)
r.Get("/bulk", handlers.BulkDownload(c.mdb)) r.Get("/bulk", filebrowser.BulkDownload(c.mdb))
}) })
// Archive routes // Archive routes
@@ -199,8 +200,8 @@ func newServer(c serverConfig) *http.Server {
// Authentication routes // Authentication routes
r.Route("/auth", func(r chi.Router) { r.Route("/auth", func(r chi.Router) {
r.Post("/login", handlers.Login) r.Post("/login", user.Login)
r.Get("/logout", handlers.Logout) r.Get("/logout", user.Logout)
r.Route("/openid", func(r chi.Router) { r.Route("/openid", func(r chi.Router) {
r.Get("/login", openid.Login) r.Get("/login", openid.Login)

2
server/handlers/login.go → server/user/handlers.go
View File

@@ -1,4 +1,4 @@
package handlers package user
import ( import (
"encoding/json" "encoding/json"