PATCH /api/resource reconstruction

Author: lovehunter9

pkg/fileutils/patch.go pkg/common/patch.go

@@ -1,10 +1,10 @@
-package fileutils
+package common
 
 import (
 	"context"
-	"files/pkg/common"
 	"files/pkg/errors"
 	"files/pkg/files"
+	"files/pkg/fileutils"
 	"files/pkg/preview"
 	"fmt"
 	"github.com/spf13/afero"
@@ -49,10 +49,10 @@ func AddVersionSuffix(source string, fs afero.Fs, isDir bool) string {
 	return source
 }
 
-func PatchAction(ctx context.Context, action, src, dst string, d *common.Data, fileCache FileCache) error {
+func PatchAction(ctx context.Context, action, src, dst string, d *Data, fileCache fileutils.FileCache) error {
 	switch action {
 	case "copy":
-		return Copy(files.DefaultFs, src, dst)
+		return fileutils.Copy(files.DefaultFs, src, dst)
 	case "rename":
 		src = path.Clean("/" + src)
 		dst = path.Clean("/" + dst)
@@ -74,7 +74,7 @@ func PatchAction(ctx context.Context, action, src, dst string, d *common.Data, f
 			return err
 		}
 
-		return MoveFile(files.DefaultFs, src, dst)
+		return fileutils.MoveFile(files.DefaultFs, src, dst)
 	default:
 		return fmt.Errorf("unsupported action %s: %w", action, errors.ErrInvalidRequestParams)
 	}

pkg/drives/base.go

@@ -339,7 +339,7 @@ func (rs *BaseResourceService) PatchHandler(fileCache fileutils.FileCache) handl
 			return http.StatusForbidden, nil
 		}
 
-		err = fileutils.CheckParent(src, dst)
+		err = common.CheckParent(src, dst)
 		if err != nil {
 			return http.StatusBadRequest, err
 		}
@@ -351,11 +351,11 @@ func (rs *BaseResourceService) PatchHandler(fileCache fileutils.FileCache) handl
 			}
 		}
 		if rename {
-			dst = fileutils.AddVersionSuffix(dst, files.DefaultFs, strings.HasSuffix(src, "/"))
+			dst = common.AddVersionSuffix(dst, files.DefaultFs, strings.HasSuffix(src, "/"))
 		}
 
 		klog.Infoln("Before patch action:", src, dst, action, rename)
-		err = fileutils.PatchAction(r.Context(), action, src, dst, d, fileCache)
+		err = common.PatchAction(r.Context(), action, src, dst, d, fileCache)
 
 		return common.ErrToStatus(err), err
 	}

pkg/drives/sync.go

@@ -157,23 +157,25 @@ func (rc *SyncResourceService) PutHandler(w http.ResponseWriter, r *http.Request
 	return http.StatusNotImplemented, fmt.Errorf("sync drive does not supoort editing files for the time being")
 }
 
-func (rc *SyncResourceService) PatchHandler(w http.ResponseWriter, r *http.Request, d *common.Data) (int, error) {
-	src := r.URL.Path
-	dst := r.URL.Query().Get("destination")
+func (rc *SyncResourceService) PatchHandler(fileCache fileutils.FileCache) handleFunc {
+	return func(w http.ResponseWriter, r *http.Request, d *common.Data) (int, error) {
+		src := r.URL.Path
+		dst := r.URL.Query().Get("destination")
 
-	action := r.URL.Query().Get("action")
-	var err error
-	src, err = common.UnescapeURLIfEscaped(src)
-	if err != nil {
-		return common.ErrToStatus(err), err
-	}
-	dst, err = common.UnescapeURLIfEscaped(dst)
-	if err != nil {
+		action := r.URL.Query().Get("action")
+		var err error
+		src, err = common.UnescapeURLIfEscaped(src)
+		if err != nil {
+			return common.ErrToStatus(err), err
+		}
+		dst, err = common.UnescapeURLIfEscaped(dst)
+		if err != nil {
+			return common.ErrToStatus(err), err
+		}
+
+		err = ResourceSyncPatch(action, src, dst, r)
 		return common.ErrToStatus(err), err
 	}
-
-	err = ResourceSyncPatch(action, src, dst, r)
-	return common.ErrToStatus(err), err
 }
 
 type Dirent struct {

pkg/files/file.go

@@ -8,7 +8,6 @@ import (
 	"crypto/sha512"
 	"encoding/hex"
 	"encoding/json"
-	"files/pkg/common"
 	"fmt"
 	"hash"
 	"io"
@@ -27,7 +26,7 @@ import (
 	"files/pkg/errors"
 )
 
-var DefaultFs = afero.NewBasePathFs(afero.NewOsFs(), common.RootPrefix)
+var DefaultFs = afero.NewBasePathFs(afero.NewOsFs(), os.Getenv("ROOT_PREFIX"))
 var DefaultSorting = Sorting{
 	By:  "name",
 	Asc: true,