diff --git a/server/web/api/route.go b/server/web/api/route.go index 731f874..24620b7 100644 --- a/server/web/api/route.go +++ b/server/web/api/route.go @@ -15,18 +15,20 @@ func SetupRoute(route gin.IRouter) { authorized := route.Group("/", auth.CheckAuth()) authorized.GET("/shutdown", shutdown) + authorized.GET("/shutdown/*reason", shutdown) authorized.POST("/settings", settings) authorized.POST("/torrents", torrents) + authorized.POST("/torrent/upload", torrentUpload) authorized.POST("/cache", cache) route.HEAD("/stream", stream) - route.HEAD("/stream/*fname", stream) - route.GET("/stream", stream) + + route.HEAD("/stream/*fname", stream) route.GET("/stream/*fname", stream) route.HEAD("/play/:hash/:id", play) @@ -35,8 +37,9 @@ func SetupRoute(route gin.IRouter) { authorized.POST("/viewed", viewed) authorized.GET("/playlistall/all.m3u", allPlayList) + route.GET("/playlist", playList) - route.GET("/playlist/*fname", playList) // Is this endpoint still needed ? `fname` is never used in handler + route.GET("/playlist/*fname", playList) authorized.GET("/download/:size", download) diff --git a/server/web/api/shutdown.go b/server/web/api/shutdown.go index 6c3837f..71f54f9 100644 --- a/server/web/api/shutdown.go +++ b/server/web/api/shutdown.go @@ -2,6 +2,7 @@ package api import ( "net/http" + "strings" "time" sets "server/settings" @@ -19,7 +20,8 @@ import ( // @Success 200 // @Router /shutdown [get] func shutdown(c *gin.Context) { - if sets.ReadOnly { + reasonStr := strings.ReplaceAll(c.Param("reason"), `/`, "") + if sets.ReadOnly && reasonStr == "" { c.Status(http.StatusForbidden) return } diff --git a/server/web/pages/template/html.go b/server/web/pages/template/html.go index bc9ef22..e7e40a1 100644 --- a/server/web/pages/template/html.go +++ b/server/web/pages/template/html.go @@ -118,20 +118,20 @@ var Mstile150x150png []byte //go:embed pages/site.webmanifest var Sitewebmanifest []byte -//go:embed pages/static/js/2.63f74d95.chunk.js -var Staticjs263f74d95chunkjs []byte +//go:embed pages/static/js/2.15e75e72.chunk.js +var Staticjs215e75e72chunkjs []byte -//go:embed pages/static/js/2.63f74d95.chunk.js.LICENSE.txt -var Staticjs263f74d95chunkjsLICENSEtxt []byte +//go:embed pages/static/js/2.15e75e72.chunk.js.LICENSE.txt +var Staticjs215e75e72chunkjsLICENSEtxt []byte -//go:embed pages/static/js/2.63f74d95.chunk.js.map -var Staticjs263f74d95chunkjsmap []byte +//go:embed pages/static/js/2.15e75e72.chunk.js.map +var Staticjs215e75e72chunkjsmap []byte -//go:embed pages/static/js/main.2ae81b65.chunk.js -var Staticjsmain2ae81b65chunkjs []byte +//go:embed pages/static/js/main.60265001.chunk.js +var Staticjsmain60265001chunkjs []byte -//go:embed pages/static/js/main.2ae81b65.chunk.js.map -var Staticjsmain2ae81b65chunkjsmap []byte +//go:embed pages/static/js/main.60265001.chunk.js.map +var Staticjsmain60265001chunkjsmap []byte //go:embed pages/static/js/runtime-main.f542387e.js var Staticjsruntimemainf542387ejs []byte diff --git a/server/web/pages/template/pages/asset-manifest.json b/server/web/pages/template/pages/asset-manifest.json index 48468f9..c384a4e 100644 --- a/server/web/pages/template/pages/asset-manifest.json +++ b/server/web/pages/template/pages/asset-manifest.json @@ -1,17 +1,17 @@ { "files": { - "main.js": "/static/js/main.2ae81b65.chunk.js", - "main.js.map": "/static/js/main.2ae81b65.chunk.js.map", + "main.js": "/static/js/main.60265001.chunk.js", + "main.js.map": "/static/js/main.60265001.chunk.js.map", "runtime-main.js": "/static/js/runtime-main.f542387e.js", "runtime-main.js.map": "/static/js/runtime-main.f542387e.js.map", - "static/js/2.63f74d95.chunk.js": "/static/js/2.63f74d95.chunk.js", - "static/js/2.63f74d95.chunk.js.map": "/static/js/2.63f74d95.chunk.js.map", + "static/js/2.15e75e72.chunk.js": "/static/js/2.15e75e72.chunk.js", + "static/js/2.15e75e72.chunk.js.map": "/static/js/2.15e75e72.chunk.js.map", "index.html": "/index.html", - "static/js/2.63f74d95.chunk.js.LICENSE.txt": "/static/js/2.63f74d95.chunk.js.LICENSE.txt" + "static/js/2.15e75e72.chunk.js.LICENSE.txt": "/static/js/2.15e75e72.chunk.js.LICENSE.txt" }, "entrypoints": [ "static/js/runtime-main.f542387e.js", - "static/js/2.63f74d95.chunk.js", - "static/js/main.2ae81b65.chunk.js" + "static/js/2.15e75e72.chunk.js", + "static/js/main.60265001.chunk.js" ] } \ No newline at end of file diff --git a/server/web/pages/template/pages/index.html b/server/web/pages/template/pages/index.html index a4c38f2..1c60449 100644 --- a/server/web/pages/template/pages/index.html +++ b/server/web/pages/template/pages/index.html @@ -1 +1 @@ -TorrServer MatriX
\ No newline at end of file +TorrServer MatriX
\ No newline at end of file diff --git a/server/web/pages/template/route.go b/server/web/pages/template/route.go index e20c5ed..9fcc357 100644 --- a/server/web/pages/template/route.go +++ b/server/web/pages/template/route.go @@ -280,46 +280,46 @@ func RouteWebPages(route gin.IRouter) { c.Data(200, "application/manifest+json", Sitewebmanifest) }) - route.GET("/static/js/2.63f74d95.chunk.js", func(c *gin.Context) { - etag := fmt.Sprintf("%x", md5.Sum(Staticjs263f74d95chunkjs)) + route.GET("/static/js/2.15e75e72.chunk.js", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjs215e75e72chunkjs)) c.Header("Cache-Control", "public, max-age=31536000") c.Header("ETag", etag) - c.Data(200, "text/javascript; charset=utf-8", Staticjs263f74d95chunkjs) + c.Data(200, "application/javascript; charset=utf-8", Staticjs215e75e72chunkjs) }) - route.GET("/static/js/2.63f74d95.chunk.js.LICENSE.txt", func(c *gin.Context) { - etag := fmt.Sprintf("%x", md5.Sum(Staticjs263f74d95chunkjsLICENSEtxt)) + route.GET("/static/js/2.15e75e72.chunk.js.LICENSE.txt", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjs215e75e72chunkjsLICENSEtxt)) c.Header("Cache-Control", "public, max-age=31536000") c.Header("ETag", etag) - c.Data(200, "text/plain; charset=utf-8", Staticjs263f74d95chunkjsLICENSEtxt) + c.Data(200, "text/plain; charset=utf-8", Staticjs215e75e72chunkjsLICENSEtxt) }) - route.GET("/static/js/2.63f74d95.chunk.js.map", func(c *gin.Context) { - etag := fmt.Sprintf("%x", md5.Sum(Staticjs263f74d95chunkjsmap)) + route.GET("/static/js/2.15e75e72.chunk.js.map", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjs215e75e72chunkjsmap)) c.Header("Cache-Control", "public, max-age=31536000") c.Header("ETag", etag) - c.Data(200, "application/json", Staticjs263f74d95chunkjsmap) + c.Data(200, "application/json", Staticjs215e75e72chunkjsmap) }) - route.GET("/static/js/main.2ae81b65.chunk.js", func(c *gin.Context) { - etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain2ae81b65chunkjs)) + route.GET("/static/js/main.60265001.chunk.js", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain60265001chunkjs)) c.Header("Cache-Control", "public, max-age=31536000") c.Header("ETag", etag) - c.Data(200, "text/javascript; charset=utf-8", Staticjsmain2ae81b65chunkjs) + c.Data(200, "application/javascript; charset=utf-8", Staticjsmain60265001chunkjs) }) - route.GET("/static/js/main.2ae81b65.chunk.js.map", func(c *gin.Context) { - etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain2ae81b65chunkjsmap)) + route.GET("/static/js/main.60265001.chunk.js.map", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain60265001chunkjsmap)) c.Header("Cache-Control", "public, max-age=31536000") c.Header("ETag", etag) - c.Data(200, "application/json", Staticjsmain2ae81b65chunkjsmap) + c.Data(200, "application/json", Staticjsmain60265001chunkjsmap) }) route.GET("/static/js/runtime-main.f542387e.js", func(c *gin.Context) { etag := fmt.Sprintf("%x", md5.Sum(Staticjsruntimemainf542387ejs)) c.Header("Cache-Control", "public, max-age=31536000") c.Header("ETag", etag) - c.Data(200, "text/javascript; charset=utf-8", Staticjsruntimemainf542387ejs) + c.Data(200, "application/javascript; charset=utf-8", Staticjsruntimemainf542387ejs) }) route.GET("/static/js/runtime-main.f542387e.js.map", func(c *gin.Context) { diff --git a/web/src/components/About/index.jsx b/web/src/components/About/index.jsx index 70cd2b6..eead26c 100644 --- a/web/src/components/About/index.jsx +++ b/web/src/components/About/index.jsx @@ -57,7 +57,7 @@ export default function AboutDialog() {
{t('About')}
{torrServerVersion} - ts-icon + ts-icon
diff --git a/web/src/components/Donate/DonateDialog.jsx b/web/src/components/Donate/DonateDialog.jsx index 7d3b46b..b74d891 100644 --- a/web/src/components/Donate/DonateDialog.jsx +++ b/web/src/components/Donate/DonateDialog.jsx @@ -24,7 +24,7 @@ export default function DonateDialog({ onClose }) { - + {/* */} {/* */} {/* */}