jkl1337/duplicacy
1
0
Fork 0
mirror of https://github.com/jkl1337/duplicacy.git synced 2026-01-02 11:44:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes to fetching file info via b2_download_file_by_name

Browse Source
This commit is contained in:
Arno Hautala
2017-09-21 03:18:08 -04:00
parent 0fee771a74
commit 2c2884abfb
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/duplicacy_b2client.go
View File

@@ -103,7 +103,7 @@ func (client *B2Client) call(url string, requestHeaders map[string]string, input
case int: case int:
method = "GET" method = "GET"
inputReader = bytes.NewReader([]byte("")) inputReader = bytes.NewReader([]byte(""))
case nil: case bool:
method = "HEAD" method = "HEAD"
inputReader = bytes.NewReader([]byte("")) inputReader = bytes.NewReader([]byte(""))
} }
@@ -295,20 +295,28 @@ func (client *B2Client) ListFileNames(startFileName string, singleFile bool, inc
input["bucketId"] = client.BucketID input["bucketId"] = client.BucketID
input["startFileName"] = startFileName input["startFileName"] = startFileName
input["maxFileCount"] = maxFileCount input["maxFileCount"] = maxFileCount
inputMapBool := true
url := client.APIURL + "/b2api/v1/b2_list_file_names"
requestHeaders := map[string]string{}
if includeVersions {
url = client.APIURL + "/b2api/v1/b2_list_file_versions"
} else if singleFile {
// handle a single file with no versions as a special case to download the first byte of the file
url = client.APIURL + "/b2api/v1/b2_download_file_by_name"
requestHeaders["Range"] = "bytes=0-0"
// HEAD request
input = nil
}
for { for {
readCloser, responseHeader, _, err := client.call(url, requestHeaders, input) url := client.APIURL + "/b2api/v1/b2_list_file_names"
requestHeaders := map[string]string{}
if includeVersions {
url = client.APIURL + "/b2api/v1/b2_list_file_versions"
} else if singleFile {
// handle a single file with no versions as a special case to download the first byte of the file
url = client.DownloadURL + "/file/" + client.BucketName + "/" + startFileName
requestHeaders["Range"] = "bytes=0-0"
// HEAD request
inputMapBool = false
}
var readCloser io.ReadCloser
var responseHeader http.Header
var err error
if inputMapBool {
readCloser, responseHeader, _, err = client.call(url, requestHeaders, input)
} else {
readCloser, responseHeader, _, err = client.call(url, requestHeaders, false)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -318,12 +326,13 @@ func (client *B2Client) ListFileNames(startFileName string, singleFile bool, inc
output := B2ListFileNamesOutput { output := B2ListFileNamesOutput {
} }
if singleFile && !includeVersions { if !inputMapBool && singleFile && !includeVersions {
// construct the B2Entry from the response headers of the download request // construct the B2Entry from the response headers of the download request
fileID := responseHeader.Get("X-Bz-File-Id") fileID := responseHeader.Get("x-bz-file-id")
fileName := responseHeader.Get("X-Bz-File-Name") fileName := responseHeader.Get("x-bz-file-name")
fileAction := responseHeader.Get("X-Bz-Action") fileAction := "upload"
fileSize, _ := strconv.ParseInt(responseHeader.Get("Content-Length"), 0, 64) rangeString := responseHeader.Get("Content-Range")
fileSize, _ := strconv.ParseInt(rangeString[strings.Index(rangeString, "/")+1:], 0, 64)
fileUploadTimestamp, _ := strconv.ParseInt(responseHeader.Get("X-Bz-Upload-Timestamp"), 0, 64) fileUploadTimestamp, _ := strconv.ParseInt(responseHeader.Get("X-Bz-Upload-Timestamp"), 0, 64)
return []*B2Entry {&B2Entry { fileID, fileName, fileAction, fileSize, fileUploadTimestamp }}, nil return []*B2Entry {&B2Entry { fileID, fileName, fileAction, fileSize, fileUploadTimestamp }}, nil