fix(webdav): Normalize WebDAV error

drivers/webdav/driver.go

@@ -52,7 +52,7 @@ func (d *WebDav) Drop(ctx context.Context) error {
 func (d *WebDav) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
 	files, err := d.client.ReadDir(dir.GetPath())
 	if err != nil {
-		return nil, err
+		return nil, normalizeError(err)
 	}
 	return utils.SliceConvert(files, func(src os.FileInfo) (model.Obj, error) {
 		return &model.Object{
@@ -68,7 +68,7 @@ func (d *WebDav) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 func (d *WebDav) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	url, header, err := d.client.Link(file.GetPath())
 	if err != nil {
-		return nil, err
+		return nil, normalizeError(err)
 	}
 	if args.Redirect {
 		// get the url after redirect
@@ -93,23 +93,23 @@ func (d *WebDav) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 }
 
 func (d *WebDav) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	return d.client.MkdirAll(path.Join(parentDir.GetPath(), dirName), 0644)
+	return normalizeError(d.client.MkdirAll(path.Join(parentDir.GetPath(), dirName), 0644))
 }
 
 func (d *WebDav) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return d.client.Rename(getPath(srcObj), path.Join(dstDir.GetPath(), srcObj.GetName()), true)
+	return normalizeError(d.client.Rename(getPath(srcObj), path.Join(dstDir.GetPath(), srcObj.GetName()), true))
 }
 
 func (d *WebDav) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	return d.client.Rename(getPath(srcObj), path.Join(path.Dir(srcObj.GetPath()), newName), true)
+	return normalizeError(d.client.Rename(getPath(srcObj), path.Join(path.Dir(srcObj.GetPath()), newName), true))
 }
 
 func (d *WebDav) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	return d.client.Copy(getPath(srcObj), path.Join(dstDir.GetPath(), srcObj.GetName()), true)
+	return normalizeError(d.client.Copy(getPath(srcObj), path.Join(dstDir.GetPath(), srcObj.GetName()), true))
 }
 
 func (d *WebDav) Remove(ctx context.Context, obj model.Obj) error {
-	return d.client.RemoveAll(getPath(obj))
+	return normalizeError(d.client.RemoveAll(getPath(obj)))
 }
 
 func (d *WebDav) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer, up driver.UpdateProgress) error {
@@ -122,15 +122,15 @@ func (d *WebDav) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer
 		UpdateProgress: up,
 	})
 	err := d.client.WriteStream(path.Join(dstDir.GetPath(), s.GetName()), reader, 0644, callback)
-	return err
+	return normalizeError(err)
 }
 
 // implements driver.Getter interface
 func (d *WebDav) Get(ctx context.Context, _path string) (model.Obj, error) {
 	_path = path.Join(d.GetRootPath(), _path)
 	info, err := d.client.Stat(_path)
 	if err != nil {
-		return nil, err
+		return nil, normalizeError(err)
 	}
 
 	return &model.Object{

drivers/webdav/driver_test.go

@@ -0,0 +1,50 @@
+package webdav
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/OpenListTeam/OpenList/v4/internal/errs"
+	"github.com/OpenListTeam/OpenList/v4/internal/op"
+	"github.com/OpenListTeam/OpenList/v4/pkg/gowebdav"
+)
+
+func TestGetMapsPropfindNotFound(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "PROPFIND" {
+			t.Fatalf("expected PROPFIND request, got %s", r.Method)
+		}
+		w.WriteHeader(http.StatusNotFound)
+	}))
+	defer server.Close()
+
+	d := &WebDav{
+		client: gowebdav.NewClient(server.URL, "", ""),
+	}
+
+	_, err := d.Get(context.Background(), "/missing")
+	if !errs.IsObjectNotFound(err) {
+		t.Fatalf("expected object not found, got %v", err)
+	}
+}
+
+func TestOpGetRecognizesPropfindNotFound(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "PROPFIND" {
+			t.Fatalf("expected PROPFIND request, got %s", r.Method)
+		}
+		w.WriteHeader(http.StatusNotFound)
+	}))
+	defer server.Close()
+
+	d := &WebDav{
+		client: gowebdav.NewClient(server.URL, "", ""),
+	}
+
+	_, err := op.Get(context.Background(), d, "/missing")
+	if !errs.IsObjectNotFound(err) {
+		t.Fatalf("expected object not found, got %v", err)
+	}
+}

drivers/webdav/util.go

@@ -6,6 +6,7 @@ import (
 	"net/http/cookiejar"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/webdav/odrvcookie"
+	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/gowebdav"
 )
@@ -50,3 +51,13 @@ func getPath(obj model.Obj) string {
 	}
 	return obj.GetPath()
 }
+
+func normalizeError(err error) error {
+	if err == nil {
+		return nil
+	}
+	if gowebdav.IsErrNotFound(err) {
+		return errs.ObjectNotFound
+	}
+	return err
+}