haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Put and Createfolder using WebApi.

Browse Source
This commit is contained in:
verhoek
2018-05-19 23:06:02 +02:00
parent d6a85ae497
commit 18de687530
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs
+14 -4
View File
@@ -196,7 +196,11 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
storageClass = m_storage_class
}));
var url = string.Format("{0}/b?" + WebApi.GoogleCloudServices.QueryParam.Project + "={1}", WebApi.GoogleCloudServices.Url.API, m_project);
var queryParams = new NameValueCollection
{
{ WebApi.GoogleCloudServices.QueryParam.Project, m_project }
};
var url = Utility.Uri.UriBuilder(WebApi.GoogleCloudServices.Url.API, WebApi.GoogleCloudServices.Path.Bucket, queryParams);
var req = m_oauth.CreateRequest(url);
req.Method = "POST";
@@ -256,20 +260,26 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
public void Put(string remotename, System.IO.Stream stream)
{
var url = string.Format("{0}/b/{1}/o?uploadType=resumable", WebApi.GoogleCloudServices.Url.UPLOAD, m_bucket);
var item = new BucketResourceItem() { name = m_prefix + remotename };
var queryParams = new NameValueCollection
{
{ WebApi.Google.QueryParam.UploadType, WebApi.Google.QueryValue.Resumable }
};
var path = UrlPath.Create(WebApi.GoogleCloudServices.Path.Bucket).Append(m_bucket).ToString();
var url = Utility.Uri.UriBuilder(WebApi.GoogleCloudServices.Url.UPLOAD, path, queryParams);
var item = new BucketResourceItem() { name = m_prefix + remotename };
var res = GoogleCommon.ChunckedUploadWithResume<BucketResourceItem, BucketResourceItem>(m_oauth, item, url, stream);
if (res == null)
throw new Exception("Upload succeeded, but no data was returned");
}
public void Get(string remotename, System.IO.Stream stream)
{
try
{
var url = string.Format("{0}/b/{1}/o/{2}?alt=media", WebApi.GoogleCloudServices.Url.API, m_bucket, Library.Utility.Uri.UrlPathEncode(m_prefix + remotename));
var req = m_oauth.CreateRequest(url);
var areq = new AsyncHttpRequest(req);