uploader to os-system cache

beclab · Aug 16, 2024 · 013e7ac · 013e7ac
1 parent 37712b5
commit 013e7ac
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/cmd/upload/app/handler4.go b/cmd/upload/app/handler4.go
@@ -14,6 +14,10 @@ import (
 	"time"
 )
 
+const (
+	CachePathPrefix = "/appdata"
+)
+
 func getPVC(c *fiber.Ctx) (string, string, string, string, error) {
 	bflName := c.Get("X-Bfl-User")
 	klog.Info("BFL_NAME: ", bflName)
@@ -47,7 +51,7 @@ func getPVC(c *fiber.Ctx) (string, string, string, string, error) {
 
 // UploadLink 处理上传链接的 GET 请求
 func (a *appController) UploadLink(c *fiber.Ctx) error {
-	_, userPvc, _, uploadsDir, err := getPVC(c)
+	_, userPvc, cachePvc, uploadsDir, err := getPVC(c)
 	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(
 			models.NewResponse(1, "bfl header missing or invalid", nil))
@@ -60,7 +64,11 @@ func (a *appController) UploadLink(c *fiber.Ctx) error {
 			models.NewResponse(1, "missing path query parameter", nil))
 	}
 
-	path = rewriteUrl(path, userPvc, "")
+	if strings.HasPrefix(path, CachePathPrefix) {
+		path = rewriteUrl(path, cachePvc, CachePathPrefix)
+	} else {
+		path = rewriteUrl(path, userPvc, "")
+	}
 
 	// 检查上传目录是否存在，如果不存在则创建
 	if !utils.PathExists(uploadsDir) {
@@ -94,7 +102,7 @@ func (a *appController) UploadLink(c *fiber.Ctx) error {
 }
 
 func (a *appController) UploadedBytes(c *fiber.Ctx) error {
-	_, userPvc, _, uploadsDir, err := getPVC(c)
+	_, userPvc, cachePvc, uploadsDir, err := getPVC(c)
 	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(
 			models.NewResponse(1, "bfl header missing or invalid", nil))
@@ -106,7 +114,11 @@ func (a *appController) UploadedBytes(c *fiber.Ctx) error {
 			models.NewResponse(1, "missing parent_dir query parameter", nil))
 	}
 
-	parentDir = rewriteUrl(parentDir, userPvc, "")
+	if strings.HasPrefix(parentDir, CachePathPrefix) {
+		parentDir = rewriteUrl(parentDir, cachePvc, CachePathPrefix)
+	} else {
+		parentDir = rewriteUrl(parentDir, userPvc, "")
+	}
 
 	if !utils.CheckDirExist(parentDir) {
 		klog.Warningf("Storage path %s is not exist or is not a dir", parentDir)
@@ -165,7 +177,7 @@ func (a *appController) UploadedBytes(c *fiber.Ctx) error {
 }
 
 func (a *appController) UploadChunks(c *fiber.Ctx) error {
-	_, userPvc, _, uploadsDir, err := getPVC(c)
+	_, userPvc, cachePvc, uploadsDir, err := getPVC(c)
 	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(
 			models.NewResponse(1, "bfl header missing or invalid", nil))
@@ -194,7 +206,12 @@ func (a *appController) UploadChunks(c *fiber.Ctx) error {
 			models.NewResponse(1, "param invalid", nil))
 	}
 
-	parentDir := rewriteUrl(resumableInfo.ParentDir, userPvc, "")
+	parentDir := resumableInfo.ParentDir
+	if strings.HasPrefix(parentDir, CachePathPrefix) {
+		parentDir = rewriteUrl(parentDir, cachePvc, CachePathPrefix)
+	} else {
+		parentDir = rewriteUrl(parentDir, userPvc, "")
+	}
 	if uploadID != uid.MakeUid(parentDir) {
 		return c.Status(fiber.StatusBadRequest).JSON(
 			models.NewResponse(1, "invalid upload link", nil))