Merge 1e69a5838c into 065ae50868

Parse the storage URL first, then use a regex to ensure the server name is
correctly identified starting after the final '@'.

README.md

@@ -83,13 +83,13 @@ The following table compares the feature lists of all these backup tools:
 |:------------------:|:---------:|:---:|:-----------------:|:---------------:|:-----------------:|:-------------:|
 | Incremental Backup | Yes       | Yes | Yes               | Yes             | Yes               | **Yes**       |
 | Full Snapshot      | No        | Yes | Yes               | Yes             | Yes               | **Yes**       |
-| Compression        | Yes       | Yes | Yes               | Yes             | No                | **Yes**       |
+| Compression        | Yes       | Yes | Yes               | Yes             | Yes               | **Yes**       |
 | Deduplication      | Weak      | Yes | Weak              | Yes             | Yes               | **Yes**       |
 | Encryption         | Yes       | Yes | Yes               | Yes             | Yes               | **Yes**       |
-| Deletion           | No        | No  | Yes               | Yes             | No                | **Yes**       |
+| Deletion           | No        | No  | Yes               | Yes             | Yes               | **Yes**       |
 | Concurrent Access  | No        | No  | No                | Not recommended | Exclusive locking | **Lock-free** |
 | Cloud Support      | Extensive | No  | Extensive         | No              | Limited           | **Extensive** |
-| Snapshot Migration | No        | No  | No                | No              | No                | **Yes**       |
+| Snapshot Migration | No        | No  | No                | No              | Yes               | **Yes**       |
 
 ## License
 

src/duplicacy_swiftstorage.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"regexp"
 
 	"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
 	versions := []string{"/v1/", "/v1.0/", "/v2/", "/v2.0/", "/v3/", "/v3.0/", "/v4/", "/v4.0/"}
 	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 storageDir == "" {
 		storageDir = arguments["storage_dir"]