clean up code

Author: jibon57

internal/file_del.go

@@ -1,13 +1,10 @@
 package internal
 
 import (
-	"errors"
 	"fmt"
-	"io/fs"
 	"log"
 	"os"
 	"path"
-	"strings"
 	"time"
 
 	"github.com/gofiber/fiber/v2"
@@ -40,39 +37,37 @@ func HandleDeleteFile(c *fiber.Ctx) error {
 		return sendResponse(c, fiber.StatusNotAcceptable, false, "file_path value require")
 	}
 
-	file := fmt.Sprintf("%s/%s", AppCnf.Path, *req.FilePath)
+	file := path.Join(AppCnf.Path, *req.FilePath)
 	f, err := os.Stat(file)
 	if err != nil {
-		var pathError *fs.PathError
-		if errors.As(err, &pathError) {
-			return sendResponse(c, fiber.StatusNotFound, false, *req.FilePath+" does not exist")
-		} else {
-			return sendResponse(c, fiber.StatusNotAcceptable, false, err.Error())
+		if os.IsNotExist(err) {
+			return sendResponse(c, fiber.StatusNotFound, false, fmt.Sprintf("%s does not exist", *req.FilePath))
 		}
+		log.Println("Error stating file:", err)
+		return sendResponse(c, fiber.StatusInternalServerError, false, "Error checking file status")
 	}
 
 	if f.IsDir() {
 		return sendResponse(c, fiber.StatusNotAcceptable, false, *req.FilePath+" is a directory, not allow to delete directory")
 	}
 
 	if AppCnf.EnableDelFileBackup {
-		// first with the video file
 		toFile := path.Join(AppCnf.DelFileBackupPath, f.Name())
 		err := os.Rename(file, toFile)
 		if err != nil {
-			log.Println(err)
-			return sendResponse(c, fiber.StatusNotAcceptable, false, err.Error())
+			log.Println("Failed to move file for backup:", err)
+			return sendResponse(c, fiber.StatusInternalServerError, false, "Failed to backup file")
 		}
 
-		// otherwise during cleanup will be hard to detect
 		newTime := time.Now()
 		if err := os.Chtimes(toFile, newTime, newTime); err != nil {
 			log.Println("Failed to update file modification time:", err)
 		}
 	} else {
 		err = os.Remove(file)
 		if err != nil {
-			return sendResponse(c, fiber.StatusNotAcceptable, false, err.Error())
+			log.Println("Failed to delete file:", err)
+			return sendResponse(c, fiber.StatusInternalServerError, false, "Failed to delete file")
 		}
 	}
 
@@ -82,7 +77,7 @@ func HandleDeleteFile(c *fiber.Ctx) error {
 	}
 
 	if AppCnf.DeleteEmptyDir {
-		dir := strings.Replace(file, "/"+f.Name(), "", 1)
+		dir := path.Dir(file)
 		if dir != AppCnf.Path {
 			if empty, err := IsDirEmpty(dir); err == nil && empty {
 				_ = os.Remove(dir)

internal/file_serve.go

@@ -3,47 +3,28 @@ package internal
 import (
 	"os"
 	"path"
-	"strings"
 
+	"github.com/go-jose/go-jose/v4/jwt"
 	"github.com/gofiber/fiber/v2"
 )
 
 func HandleDownloadFile(c *fiber.Ctx) error {
-	token := c.Params("token")
+	claims := c.Locals("claims").(*jwt.Claims)
 
-	if len(token) == 0 {
-		return sendResponse(c, fiber.StatusUnauthorized, false, "token require or invalid url")
-	}
-
-	out, err := verifyToken(token)
-	if err != nil {
-		return sendResponse(c, fiber.StatusUnauthorized, false, err.Error())
-	}
-
-	filePath := path.Join(AppCnf.Path, out.Subject)
+	filePath := path.Join(AppCnf.Path, claims.Subject)
 	file, err := os.Lstat(filePath)
 	if err != nil {
-		ms := strings.SplitN(err.Error(), "/", -1)
-		return sendResponse(c, fiber.StatusNotFound, false, ms[len(ms)-1])
+		return sendResponse(c, fiber.StatusNotFound, false, "file not found")
 	}
 
 	c.Attachment(file.Name())
 	return c.SendFile(filePath, AppCnf.Compress)
 }
 
 func HandleServeFile(c *fiber.Ctx) error {
-	token := c.Params("token")
-
-	if len(token) == 0 {
-		return sendResponse(c, fiber.StatusUnauthorized, false, "token require or invalid url")
-	}
-
-	out, err := verifyToken(token)
-	if err != nil {
-		return sendResponse(c, fiber.StatusUnauthorized, false, err.Error())
-	}
+	claims := c.Locals("claims").(*jwt.Claims)
 
-	c.Attachment(path.Base(out.Subject))
-	c.Set("X-Accel-Redirect", path.Join(AppCnf.NginxFileServePath, out.Subject))
+	c.Attachment(path.Base(claims.Subject))
+	c.Set("X-Accel-Redirect", path.Join(AppCnf.NginxFileServePath, claims.Subject))
 	return c.SendStatus(fiber.StatusOK)
 }

internal/middleware.go

@@ -0,0 +1,21 @@
+package internal
+
+import (
+	"github.com/gofiber/fiber/v2"
+)
+
+func VerifyTokenMiddleware(c *fiber.Ctx) error {
+	token := c.Params("token")
+
+	if len(token) == 0 {
+		return sendResponse(c, fiber.StatusUnauthorized, false, "token require or invalid url")
+	}
+
+	out, err := verifyToken(token)
+	if err != nil {
+		return sendResponse(c, fiber.StatusUnauthorized, false, err.Error())
+	}
+
+	c.Locals("claims", out)
+	return c.Next()
+}

internal/router.go

@@ -21,8 +21,8 @@ func Router(version string) *fiber.App {
 
 	// format: http://ip:port/download/token
 	// make sure token is urlencoded
-	app.Get("/download/:token", HandleDownloadFile)
-	app.Get("/serveFile/:token", HandleServeFile)
+	app.Get("/download/:token", VerifyTokenMiddleware, HandleDownloadFile)
+	app.Get("/serveFile/:token", VerifyTokenMiddleware, HandleServeFile)
 	app.Post("/delete", HandleDeleteFile)
 
 	return app

internal/scheduler.go

@@ -7,20 +7,14 @@ import (
 	"time"
 )
 
-var closeTicker chan bool
-
-func StartScheduler() {
-	closeTicker = make(chan bool)
+func StartScheduler(shutdown chan os.Signal) {
 	hourlyChecker := time.NewTicker(1 * time.Hour)
-
-	defer func() {
-		hourlyChecker.Stop()
-		closeTicker <- true
-	}()
+	defer hourlyChecker.Stop()
 
 	for {
 		select {
-		case <-closeTicker:
+		case <-shutdown:
+			log.Println("Stopping scheduler")
 			return
 		case <-hourlyChecker.C:
 			checkDelFileBackupPath()

main.go

@@ -29,20 +29,22 @@ func main() {
 	if err != nil {
 		log.Fatalln(err)
 	}
-	// start scheduler
-	go internal.StartScheduler()
 
 	router := internal.Router(Version)
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 
+	// start scheduler
+	go internal.StartScheduler(sigChan)
+
 	go func() {
 		sig := <-sigChan
 		log.Println("exit requested, shutting down", "signal", sig)
 		err = router.Shutdown()
 		if err != nil {
 			log.Fatalln(err)
 		}
+		log.Println("server shutdown")
 	}()
 
 	err = router.Listen(fmt.Sprintf(":%d", internal.AppCnf.Port))