mirror of
https://github.com/gilbertchen/duplicacy
synced 2025-12-10 13:23:17 +00:00
moving download url config from a key to the storage url pattern
This commit is contained in:
@@ -329,6 +329,7 @@ func (client *B2Client) AuthorizeAccount(threadIndex int) (err error, allowed bo
|
|||||||
if client.DownloadURL == "" {
|
if client.DownloadURL == "" {
|
||||||
client.DownloadURL = output.DownloadURL
|
client.DownloadURL = output.DownloadURL
|
||||||
}
|
}
|
||||||
|
LOG_INFO("BACKBLAZE_URL", "download URL is: %s", client.DownloadURL)
|
||||||
client.IsAuthorized = true
|
client.IsAuthorized = true
|
||||||
|
|
||||||
client.LastAuthorizationTime = time.Now().Unix()
|
client.LastAuthorizationTime = time.Now().Unix()
|
||||||
|
|||||||
@@ -530,7 +530,24 @@ func CreateStorage(preference Preference, resetPassword bool, threads int) (stor
|
|||||||
|
|
||||||
accountID := GetPassword(preference, "b2_id", "Enter Backblaze account or application id:", true, resetPassword)
|
accountID := GetPassword(preference, "b2_id", "Enter Backblaze account or application id:", true, resetPassword)
|
||||||
applicationKey := GetPassword(preference, "b2_key", "Enter corresponding Backblaze application key:", true, resetPassword)
|
applicationKey := GetPassword(preference, "b2_key", "Enter corresponding Backblaze application key:", true, resetPassword)
|
||||||
downloadURL := preference.Keys["b2_download_url"]
|
|
||||||
|
b2Storage, err := CreateB2Storage(accountID, applicationKey, "", bucket, storageDir, threads)
|
||||||
|
if err != nil {
|
||||||
|
LOG_ERROR("STORAGE_CREATE", "Failed to load the Backblaze B2 storage at %s: %v", storageURL, err)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
SavePassword(preference, "b2_id", accountID)
|
||||||
|
SavePassword(preference, "b2_key", applicationKey)
|
||||||
|
return b2Storage
|
||||||
|
} else if matched[1] == "b2-custom" {
|
||||||
|
b2customUrlRegex := regexp.MustCompile(`^b2-custom://([^/]+)/([^/]+)(/(.+))?`)
|
||||||
|
matched := b2customUrlRegex.FindStringSubmatch(storageURL)
|
||||||
|
downloadURL := "https://" + matched[1]
|
||||||
|
bucket := matched[2]
|
||||||
|
storageDir := matched[4]
|
||||||
|
|
||||||
|
accountID := GetPassword(preference, "b2_id", "Enter Backblaze account or application id:", true, resetPassword)
|
||||||
|
applicationKey := GetPassword(preference, "b2_key", "Enter corresponding Backblaze application key:", true, resetPassword)
|
||||||
|
|
||||||
b2Storage, err := CreateB2Storage(accountID, applicationKey, downloadURL, bucket, storageDir, threads)
|
b2Storage, err := CreateB2Storage(accountID, applicationKey, downloadURL, bucket, storageDir, threads)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user