mirror of
https://github.com/gilbertchen/duplicacy
synced 2025-12-06 00:03:38 +00:00
Improve parsing logic for swift storage URLs that contain multiple '@'
Parse the storage URL first, then use a regex to ensure the server name is correctly identified starting after the final '@'.
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
"regexp"
|
||||||
|
|
||||||
"github.com/ncw/swift/v2"
|
"github.com/ncw/swift/v2"
|
||||||
)
|
)
|
||||||
@@ -42,13 +43,6 @@ func CreateSwiftStorage(storageURL string, key string, threads int) (storage *Sw
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Take out the user name if there is one
|
|
||||||
if strings.Contains(storageURL, "@") {
|
|
||||||
userAndURL := strings.Split(storageURL, "@")
|
|
||||||
arguments["user"] = userAndURL[0]
|
|
||||||
storageURL = userAndURL[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
// The version is used to split authURL and container/path
|
// The version is used to split authURL and container/path
|
||||||
versions := []string{"/v1/", "/v1.0/", "/v2/", "/v2.0/", "/v3/", "/v3.0/", "/v4/", "/v4.0/"}
|
versions := []string{"/v1/", "/v1.0/", "/v2/", "/v2.0/", "/v3/", "/v3.0/", "/v4/", "/v4.0/"}
|
||||||
storageDir := ""
|
storageDir := ""
|
||||||
@@ -60,6 +54,17 @@ func CreateSwiftStorage(storageURL string, key string, threads int) (storage *Sw
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Take out the user name if there is one
|
||||||
|
if strings.Contains(storageURL, "@") {
|
||||||
|
// Use regex to split the username and the rest of the URL
|
||||||
|
lineRegex := regexp.MustCompile(`^(.+)@([^@]+)$`)
|
||||||
|
match := lineRegex.FindStringSubmatch(storageURL)
|
||||||
|
if match != nil {
|
||||||
|
arguments["user"] = match[1]
|
||||||
|
storageURL = match[2]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If no container/path is specified, find them from the arguments
|
// If no container/path is specified, find them from the arguments
|
||||||
if storageDir == "" {
|
if storageDir == "" {
|
||||||
storageDir = arguments["storage_dir"]
|
storageDir = arguments["storage_dir"]
|
||||||
|
|||||||
Reference in New Issue
Block a user