chore: Merge pull request #884 from Xhofe/dev

fix: some issues of webdav due to virtual path
AlistGo · Apr 1, 2022 · 3427291 · 3427291
2 parents 876579e + 0537449
commit 3427291
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/server/common/common.go b/server/common/common.go
@@ -38,10 +38,10 @@ func ParsePath(rawPath string) (*model.Account, string, base.Driver, error) {
 	if bIndex != -1 {
 		name = name[:bIndex]
 	}
-	if name == "/" {
-		name = ""
-	}
-	return &account, strings.TrimPrefix(rawPath, name), driver, nil
+	//if name == "/" {
+	//	name = ""
+	//}
+	return &account, utils.ParsePath(strings.TrimPrefix(rawPath, name)), driver, nil
 }
 
 func ErrorResp(c *gin.Context, err error, code int) {

diff --git a/server/webdav/file.go b/server/webdav/file.go
@@ -31,18 +31,21 @@ func (fs *FileSystem) File(rawPath string) (*model.File, error) {
 	if f, ok := upFileMap[rawPath]; ok {
 		return f, nil
 	}
-	if model.AccountsCount() > 1 && rawPath == "/" {
-		now := time.Now()
-		return &model.File{
-			Name:      "root",
-			Size:      0,
-			Type:      conf.FOLDER,
-			Driver:    "root",
-			UpdatedAt: &now,
-		}, nil
-	}
 	account, path_, driver, err := common.ParsePath(rawPath)
+	log.Debugln(account, path_, driver, err)
 	if err != nil {
+		if err.Error() == "path not found" {
+			accountFiles := model.GetAccountFilesByPath(rawPath)
+			if len(accountFiles) != 0 {
+				now := time.Now()
+				return &model.File{
+					Name:      "root",
+					Size:      0,
+					Type:      conf.FOLDER,
+					UpdatedAt: &now,
+				}, nil
+			}
+		}
 		return nil, err
 	}
 	return operate.File(driver, account, path_)