b0esche/b0esche_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ensureParent method to simplify MKCOL URL construction

Browse Source
This commit is contained in:
Leon Bösche
2026-01-31 23:37:16 +01:00
parent 367afab430
commit 048356dddf
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
go_cloud/internal/storage/webdav.go
View File

@@ -59,16 +59,9 @@ func (c *WebDAVClient) ensureParent(ctx context.Context, remotePath string) erro
for _, p := range parts { for _, p := range parts {
cur = path.Join(cur, p) cur = path.Join(cur, p)
var mkurl string var mkurl string
if cur == "" || cur == "/" { // Always ensure a single '/' between BaseURL and the current path
mkurl = fmt.Sprintf("%s/%s", c.BaseURL, url.PathEscape(p)) // e.g. http://nextcloud/remote.php/dav/files/testuser/orgs/<id>
} else { mkurl = fmt.Sprintf("%s/%s", strings.TrimRight(c.BaseURL, "/"), strings.TrimLeft(cur, "/"))
// Ensure there's a "/" between baseURL and cur
sep := ""
if !strings.HasSuffix(c.BaseURL, "/") && !strings.HasPrefix(cur, "/") {
sep = "/"
}
mkurl = fmt.Sprintf("%s%s%s", c.BaseURL, sep, strings.TrimPrefix(cur, "/"))
}
req, _ := http.NewRequestWithContext(ctx, "MKCOL", mkurl, nil) req, _ := http.NewRequestWithContext(ctx, "MKCOL", mkurl, nil)
if c.user != "" { if c.user != "" {
req.SetBasicAuth(c.user, c.pass) req.SetBasicAuth(c.user, c.pass)