simplify delete option

web/delete.go

@@ -2,59 +2,20 @@ package web
 
 import (
 	"fmt"
-	"github.com/Cloudbox/crs/util"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
 )
 
-func (c *Client) Delete(g *gin.Context) {
-	// parse query
-	b := new(fileRequest)
-	if err := g.ShouldBindUri(b); err != nil {
-		g.AbortWithError(http.StatusBadRequest, fmt.Errorf("bind uri: %w", err))
-		return
-	}
-
-	b.Hash = filepath.Base(b.Hash)
-	b.Filename = filepath.Base(strings.ToLower(b.Filename))
-	b.Directory = filepath.Join(c.uploadDirectory, b.Hash)
-	b.Filepath = filepath.Join(b.Directory, b.Filename)
-
-	// validate request
-	if !util.StringListContains(c.allowedFiles, b.Filename) {
-		g.AbortWithError(http.StatusBadRequest, fmt.Errorf("file unsupported: %v", b.Filename))
-		return
-	}
-
-	// validate file
-	if _, err := os.Stat(b.Filepath); err != nil {
-		if os.IsNotExist(err) {
-			g.AbortWithError(http.StatusNotFound, fmt.Errorf("file not found: %v", b.Filename))
-			return
-		}
-
-		g.AbortWithError(http.StatusInternalServerError, fmt.Errorf("file stat: %w", err))
-		return
-	}
-
-	// delete file
-	if err := os.Remove(b.Filepath); err != nil {
-		g.AbortWithError(http.StatusInternalServerError, fmt.Errorf("file delete: %w", err))
-		return
-	}
-
-	g.JSON(http.StatusOK, &fileResponse{
-		Message: fmt.Sprintf("Deleted %v", b.Filename),
-		Error:   false,
-	})
+type deleteRequest struct {
+	Hash      string `uri:"hash" binding:"required"`
+	Directory string
 }
 
-func (c *Client) Purge(g *gin.Context) {
+func (c *Client) Delete(g *gin.Context) {
 	// parse query
-	b := new(purgeRequest)
+	b := new(deleteRequest)
 	if err := g.ShouldBindUri(b); err != nil {
 		g.AbortWithError(http.StatusBadRequest, fmt.Errorf("bind uri: %w", err))
 		return
@@ -81,7 +42,7 @@ func (c *Client) Purge(g *gin.Context) {
 	}
 
 	g.JSON(http.StatusOK, &fileResponse{
-		Message: fmt.Sprintf("Purged directory with hash %v", b.Hash),
+		Message: fmt.Sprintf("Deleted directory with hash %v", b.Hash),
 		Error:   false,
 	})
 }

web/web.go

@@ -27,11 +27,6 @@ type fileRequest struct {
 	Filepath  string
 }
 
-type purgeRequest struct {
-	Hash      string `uri:"hash" binding:"required"`
-	Directory string
-}
-
 type fileResponse struct {
 	Message string `json:"msg,omitempty"`
 	Error   bool   `json:"error"`
@@ -51,6 +46,5 @@ func (c *Client) SetHandlers(r *gin.Engine) {
 	r.GET("/load/:hash/:filename", c.WithErrorResponse(c.Load))
 	r.HEAD("/load/:hash/:filename", c.WithErrorResponse(c.Load))
 	r.POST("/save/:hash/:filename", c.WithErrorResponse(c.Save))
-	r.POST("/delete/:hash/:filename", c.WithErrorResponse(c.Delete))
-	r.POST("/delete/:hash/purge", c.WithErrorResponse(c.Purge))
+	r.POST("/delete/:hash", c.WithErrorResponse(c.Delete))
 }