using System.IO;\r
using System.Linq;\r
using System.Net;\r
+using System.Net.Http;\r
+using System.Net.Http.Headers;\r
using System.Reflection;\r
-using System.Security.Cryptography;\r
-using System.Text;\r
using System.Threading;\r
using System.Threading.Tasks;\r
using Newtonsoft.Json;\r
using Pithos.Interfaces;\r
+using Pithos.Network;\r
using log4net;\r
\r
namespace Pithos.Network\r
{\r
+\r
[Export(typeof(ICloudClient))]\r
- public class CloudFilesClient:ICloudClient\r
+ public class CloudFilesClient:ICloudClient,IDisposable\r
{\r
+ private const string TOKEN_HEADER = "X-Auth-Token";\r
private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);\r
\r
//CloudFilesClient uses *_baseClient* internally to communicate with the server\r
//RestClient provides a REST-friendly interface over the standard WebClient.\r
private RestClient _baseClient;\r
+\r
+ private HttpClient _baseHttpClient;\r
+ private HttpClient _baseHttpClientNoTimeout;\r
\r
\r
//During authentication the client provides a UserName \r
//in the X-Auth-Token header\r
private string _token;\r
private readonly string _emptyGuid = Guid.Empty.ToString();\r
+ private readonly Uri _emptyUri = new Uri("",UriKind.Relative);\r
+\r
+ private HttpClientHandler _httpClientHandler = new HttpClientHandler\r
+ {\r
+ AllowAutoRedirect = true,\r
+ AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,\r
+ UseCookies = true, \r
+ };\r
\r
\r
public string Token\r
set\r
{\r
_token = value;\r
- _baseClient.Headers["X-Auth-Token"] = value;\r
+ _baseClient.Headers[TOKEN_HEADER] = value;\r
}\r
}\r
\r
\r
public Uri RootAddressUri { get; set; }\r
\r
- /* private WebProxy _proxy;\r
- public WebProxy Proxy\r
- {\r
- get { return _proxy; }\r
- set\r
- {\r
- _proxy = value;\r
- if (_baseClient != null)\r
- _baseClient.Proxy = value; \r
- }\r
- }\r
-*/\r
-\r
- /* private Uri _proxy;\r
- public Uri Proxy\r
- {\r
- get { return _proxy; }\r
- set\r
- {\r
- _proxy = value;\r
- if (_baseClient != null)\r
- _baseClient.Proxy = new WebProxy(value); \r
- }\r
- }*/\r
\r
public double DownloadPercentLimit { get; set; }\r
public double UploadPercentLimit { get; set; }\r
var usernameIndex = storageUrl.LastIndexOf(UserName);\r
var rootUrl = storageUrl.Substring(0, usernameIndex);\r
RootAddressUri = new Uri(rootUrl);\r
+\r
+ var httpClientHandler = new HttpClientHandler\r
+ {\r
+ AllowAutoRedirect = true,\r
+ AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,\r
+ UseCookies = true,\r
+ };\r
+\r
+\r
+ _baseHttpClient = new HttpClient(httpClientHandler)\r
+ {\r
+ BaseAddress = StorageUrl,\r
+ Timeout = TimeSpan.FromSeconds(30)\r
+ };\r
+ _baseHttpClient.DefaultRequestHeaders.Add(TOKEN_HEADER, Token);\r
+\r
+ _baseHttpClientNoTimeout = new HttpClient(httpClientHandler)\r
+ {\r
+ BaseAddress = StorageUrl,\r
+ Timeout = TimeSpan.FromMilliseconds(-1)\r
+ };\r
+ _baseHttpClientNoTimeout.DefaultRequestHeaders.Add(TOKEN_HEADER, Token);\r
+\r
+\r
}\r
\r
\r
- public AccountInfo Authenticate()\r
+ private static void AssertStatusOK(HttpResponseMessage response, string message)\r
+ {\r
+ var statusCode = response.StatusCode;\r
+ if (statusCode >= HttpStatusCode.BadRequest)\r
+ throw new WebException(String.Format("{0} with code {1} - {2}", message, statusCode, response.ReasonPhrase));\r
+ }\r
+\r
+ public async Task<AccountInfo> Authenticate()\r
{\r
if (String.IsNullOrWhiteSpace(UserName))\r
throw new InvalidOperationException("UserName is empty");\r
\r
var groups = new List<Group>();\r
\r
- using (var authClient = new RestClient{BaseAddress=AuthenticationUrl})\r
+ using (var authClient = new HttpClient(_httpClientHandler,false){ BaseAddress = new Uri(AuthenticationUrl),Timeout=TimeSpan.FromSeconds(30) })\r
{ \r
- /* if (Proxy != null)\r
- authClient.Proxy = Proxy;*/\r
\r
- Contract.Assume(authClient.Headers!=null);\r
+ authClient.DefaultRequestHeaders.Add("X-Auth-User", UserName);\r
+ authClient.DefaultRequestHeaders.Add("X-Auth-Key", ApiKey);\r
\r
- authClient.Headers.Add("X-Auth-User", UserName);\r
- authClient.Headers.Add("X-Auth-Key", ApiKey);\r
- //TODO: Remove after testing. Added to overcome server auth bug\r
- //authClient.Headers.Add("X-Auth-Token", ApiKey);\r
+ string storageUrl;\r
+ string token;\r
+ \r
+ using (var response = await authClient.GetAsyncWithRetries(new Uri(VersionPath, UriKind.Relative),3).ConfigureAwait(false)) // .DownloadStringWithRetryRelative(new Uri(VersionPath, UriKind.Relative), 3); \r
+ {\r
+ AssertStatusOK(response,"Authentication failed");\r
+ \r
+ storageUrl = response.Headers.GetFirstValue("X-Storage-Url");\r
+ if (String.IsNullOrWhiteSpace(storageUrl))\r
+ throw new InvalidOperationException("Failed to obtain storage url");\r
\r
- authClient.DownloadStringWithRetry(VersionPath, 3);\r
+ token = response.Headers.GetFirstValue(TOKEN_HEADER);\r
+ if (String.IsNullOrWhiteSpace(token))\r
+ throw new InvalidOperationException("Failed to obtain token url");\r
+\r
+ }\r
\r
- authClient.AssertStatusOK("Authentication failed");\r
\r
- var storageUrl = authClient.GetHeaderValue("X-Storage-Url");\r
- if (String.IsNullOrWhiteSpace(storageUrl))\r
- throw new InvalidOperationException("Failed to obtain storage url");\r
- \r
_baseClient = new RestClient\r
{\r
BaseAddress = storageUrl,\r
- Timeout = 10000,\r
- Retries = 3,\r
- //Proxy=Proxy\r
+ Timeout = 30000,\r
+ Retries = 3, \r
};\r
\r
StorageUrl = new Uri(storageUrl);\r
+ Token = token;\r
+\r
\r
+\r
+ \r
//Get the root address (StorageUrl without the account)\r
var usernameIndex=storageUrl.LastIndexOf(UserName);\r
var rootUrl = storageUrl.Substring(0, usernameIndex);\r
RootAddressUri = new Uri(rootUrl);\r
\r
- var token = authClient.GetHeaderValue("X-Auth-Token");\r
- if (String.IsNullOrWhiteSpace(token))\r
- throw new InvalidOperationException("Failed to obtain token url");\r
- Token = token;\r
\r
- /* var keys = authClient.ResponseHeaders.AllKeys.AsQueryable();\r
+ _baseHttpClient = new HttpClient(_httpClientHandler,false)\r
+ {\r
+ BaseAddress = StorageUrl,\r
+ Timeout = TimeSpan.FromSeconds(30)\r
+ };\r
+ _baseHttpClient.DefaultRequestHeaders.Add(TOKEN_HEADER, token);\r
+\r
+ _baseHttpClientNoTimeout = new HttpClient(_httpClientHandler,false)\r
+ {\r
+ BaseAddress = StorageUrl,\r
+ Timeout = TimeSpan.FromMilliseconds(-1)\r
+ };\r
+ _baseHttpClientNoTimeout.DefaultRequestHeaders.Add(TOKEN_HEADER, token);\r
+\r
+ /* var keys = authClient.ResponseHeaders.AllKeys.AsQueryable();\r
groups = (from key in keys\r
where key.StartsWith("X-Account-Group-")\r
let name = key.Substring(16)\r
\r
}\r
\r
+ private static void TraceStart(string method, Uri actualAddress)\r
+ {\r
+ Log.InfoFormat("[{0}] {1} {2}", method, DateTime.Now, actualAddress);\r
+ }\r
\r
-\r
- public IList<ContainerInfo> ListContainers(string account)\r
+ private async Task<string> GetStringAsync(Uri targetUri, string errorMessage,DateTimeOffset? since=null)\r
{\r
- using (var client = new RestClient(_baseClient))\r
+ TraceStart("GET",targetUri);\r
+ var request = new HttpRequestMessage(HttpMethod.Get, targetUri); \r
+ if (since.HasValue)\r
{\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
- \r
- client.Parameters.Clear();\r
- client.Parameters.Add("format", "json");\r
- var content = client.DownloadStringWithRetry("", 3);\r
- client.AssertStatusOK("List Containers failed");\r
+ request.Headers.IfModifiedSince = since.Value;\r
+ }\r
+ using (var response = await _baseHttpClient.SendAsyncWithRetries(request,3).ConfigureAwait(false))\r
+ {\r
+ AssertStatusOK(response, errorMessage);\r
\r
- if (client.StatusCode == HttpStatusCode.NoContent)\r
- return new List<ContainerInfo>();\r
- var infos = JsonConvert.DeserializeObject<IList<ContainerInfo>>(content);\r
- \r
- foreach (var info in infos)\r
- {\r
- info.Account = account;\r
- }\r
- return infos;\r
+ if (response.StatusCode == HttpStatusCode.NoContent)\r
+ return String.Empty;\r
+\r
+ var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);\r
+ return content;\r
}\r
+ }\r
\r
+ public async Task<IList<ContainerInfo>> ListContainers(string account)\r
+ {\r
+\r
+ var targetUrl = GetTargetUrl(account);\r
+ var targetUri = new Uri(String.Format("{0}?format=json", targetUrl));\r
+ var result = await GetStringAsync(targetUri, "List Containers failed").ConfigureAwait(false);\r
+ if (String.IsNullOrWhiteSpace(result))\r
+ return new List<ContainerInfo>();\r
+ var infos = JsonConvert.DeserializeObject<IList<ContainerInfo>>(result);\r
+ foreach (var info in infos)\r
+ {\r
+ info.Account = account;\r
+ }\r
+ return infos;\r
}\r
\r
+ \r
private string GetAccountUrl(string account)\r
{\r
- return new Uri(RootAddressUri, new Uri(account,UriKind.Relative)).AbsoluteUri;\r
+ return RootAddressUri.Combine(account).AbsoluteUri;\r
}\r
\r
public IList<ShareAccountInfo> ListSharingAccounts(DateTime? since=null)\r
{\r
if (Log.IsDebugEnabled) Log.DebugFormat("START");\r
\r
- using (var client = new RestClient(_baseClient))\r
- {\r
- client.Parameters.Clear();\r
- client.Parameters.Add("format", "json");\r
- client.IfModifiedSince = since;\r
-\r
- //Extract the username from the base address\r
- client.BaseAddress = RootAddressUri.AbsoluteUri; \r
-\r
- var content = client.DownloadStringWithRetry(@"", 3);\r
+ var targetUri = new Uri(String.Format("{0}?format=json", RootAddressUri), UriKind.Absolute);\r
+ var content=TaskEx.Run(async ()=>await GetStringAsync(targetUri, "ListSharingAccounts failed", since).ConfigureAwait(false)).Result;\r
\r
- client.AssertStatusOK("ListSharingAccounts failed");\r
+ //If the result is empty, return an empty list,\r
+ var infos = String.IsNullOrWhiteSpace(content)\r
+ ? new List<ShareAccountInfo>()\r
+ //Otherwise deserialize the account list into a list of ShareAccountInfos\r
+ : JsonConvert.DeserializeObject<IList<ShareAccountInfo>>(content);\r
\r
- //If the result is empty, return an empty list,\r
- var infos = String.IsNullOrWhiteSpace(content)\r
- ? new List<ShareAccountInfo>()\r
- //Otherwise deserialize the account list into a list of ShareAccountInfos\r
- : JsonConvert.DeserializeObject<IList<ShareAccountInfo>>(content);\r
-\r
- Log.DebugFormat("END");\r
- return infos;\r
- }\r
+ Log.DebugFormat("END");\r
+ return infos;\r
}\r
}\r
\r
/// </param>\r
/// <param name="since"></param>\r
/// <returns></returns>\r
- public IList<ObjectInfo> ListSharedObjects(HashSet<string> knownContainers,DateTime? since = null )\r
+ public IList<ObjectInfo> ListSharedObjects(HashSet<string> knownContainers, DateTimeOffset? since)\r
{\r
\r
using (ThreadContext.Stacks["Share"].Push("List Objects"))\r
//'since' is not used here because we need to have ListObjects return a NoChange result\r
//for all shared accounts,containers\r
\r
- Func<ContainerInfo, string> GetKey = c => String.Format("{0}\\{1}", c.Account, c.Name);\r
+ Func<ContainerInfo, string> getKey = c => String.Format("{0}\\{1}", c.Account, c.Name);\r
\r
- var accounts = ListSharingAccounts();\r
- var containers = (from account in accounts\r
- let conts = ListContainers(account.name)\r
+ var containers = (from account in ListSharingAccounts()\r
+ let conts = ListContainers(account.name).Result\r
from container in conts\r
select container).ToList(); \r
var items = from container in containers \r
- let actualSince=knownContainers.Contains(GetKey(container))?since:null\r
+ let actualSince=knownContainers.Contains(getKey(container))?since:null\r
select ListObjects(container.Account , container.Name, actualSince);\r
var objects=items.SelectMany(r=> r).ToList();\r
\r
//Store any new containers\r
foreach (var container in containers)\r
{\r
- knownContainers.Add(GetKey(container));\r
+ knownContainers.Add(getKey(container));\r
}\r
\r
\r
if (objectInfo.Name == null)\r
continue;\r
\r
- var parts = objectInfo.Name.Split(new[]{'/'},StringSplitOptions.RemoveEmptyEntries);\r
+ //No need to unescape here, the parts will be used to create new ObjectInfos\r
+ var parts = objectInfo.Name.ToString().Split(new[]{'/'},StringSplitOptions.RemoveEmptyEntries);\r
//If there is no parent, skip\r
if (parts.Length == 1)\r
continue;\r
var baseParts = new[]\r
{\r
- objectInfo.Uri.Host, objectInfo.Uri.Segments[1].TrimEnd('/'),objectInfo.Account,objectInfo.Container\r
+ objectInfo.Uri.Host, objectInfo.Uri.Segments[1].TrimEnd('/'),objectInfo.Account,objectInfo.Container.ToString()\r
};\r
for (var partIdx = 0; partIdx < parts.Length - 1; partIdx++)\r
{\r
{\r
Account = objectInfo.Account,\r
Container = objectInfo.Container,\r
- Content_Type = @"application/directory",\r
- ETag = Signature.MD5_EMPTY,\r
+ Content_Type = ObjectInfo.CONTENT_TYPE_DIRECTORY,\r
+ ETag = Signature.MERKLE_EMPTY,\r
X_Object_Hash = Signature.MERKLE_EMPTY,\r
- Name=parentName,\r
+ Name=new Uri(parentName,UriKind.Relative),\r
StorageUri=objectInfo.StorageUri,\r
Bytes = 0,\r
UUID=g.ToString(), \r
client.Headers.Add(headerTag, tag.Value);\r
}\r
\r
- client.DownloadStringWithRetry(target.Container, 3);\r
+ client.DownloadStringWithRetryRelative(target.Container, 3);\r
\r
\r
client.AssertStatusOK("SetTags failed");\r
\r
}\r
\r
- public void ShareObject(string account, string container, string objectName, string shareTo, bool read, bool write)\r
+ public void ShareObject(string account, Uri container, Uri objectName, string shareTo, bool read, bool write)\r
{\r
if (String.IsNullOrWhiteSpace(Token))\r
throw new InvalidOperationException("The Token is not set");\r
if (StorageUrl==null)\r
throw new InvalidOperationException("The StorageUrl is not set");\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container==null)\r
throw new ArgumentNullException("container");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("container");\r
+ if (objectName==null)\r
throw new ArgumentNullException("objectName");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("objectName");\r
if (String.IsNullOrWhiteSpace(account))\r
throw new ArgumentNullException("account");\r
if (String.IsNullOrWhiteSpace(shareTo))\r
permission = String.Format("read={0}", shareTo);\r
client.Headers.Add("X-Object-Sharing", permission);\r
\r
- var content = client.DownloadStringWithRetry(container, 3);\r
+ var content = client.DownloadStringWithRetryRelative(container, 3);\r
\r
client.AssertStatusOK("ShareObject failed");\r
\r
\r
}\r
\r
- public AccountInfo GetAccountPolicies(AccountInfo accountInfo)\r
+ public async Task<AccountInfo> GetAccountPolicies(AccountInfo accountInfo)\r
{\r
if (accountInfo==null)\r
throw new ArgumentNullException("accountInfo");\r
{\r
if (Log.IsDebugEnabled) Log.DebugFormat("START");\r
\r
+/*\r
if (_baseClient == null)\r
{\r
_baseClient = new RestClient\r
{\r
BaseAddress = accountInfo.StorageUri.ToString(),\r
- Timeout = 10000,\r
+ Timeout = 30000,\r
Retries = 3,\r
};\r
}\r
\r
- using (var client = new RestClient(_baseClient))\r
+*/ \r
+ var containerUri = GetTargetUri(accountInfo.UserName);\r
+ var targetUri = new Uri(String.Format("{0}?format=json", containerUri), UriKind.Absolute);\r
+ using(var response=await _baseHttpClient.HeadAsyncWithRetries(targetUri,3).ConfigureAwait(false))\r
{\r
- if (!String.IsNullOrWhiteSpace(accountInfo.UserName))\r
- client.BaseAddress = GetAccountUrl(accountInfo.UserName);\r
-\r
- client.Parameters.Clear();\r
- client.Parameters.Add("format", "json"); \r
- client.Head(String.Empty, 3);\r
-\r
- var quotaValue=client.ResponseHeaders["X-Account-Policy-Quota"];\r
- var bytesValue= client.ResponseHeaders["X-Account-Bytes-Used"];\r
-\r
+ \r
+ var quotaValue=response.Headers.GetFirstValue("X-Account-Policy-Quota");\r
+ var bytesValue = response.Headers.GetFirstValue("X-Account-Bytes-Used");\r
long quota, bytes;\r
if (long.TryParse(quotaValue, out quota))\r
accountInfo.Quota = quota;\r
if (long.TryParse(bytesValue, out bytes))\r
accountInfo.BytesUsed = bytes;\r
- \r
- return accountInfo;\r
\r
+ return accountInfo; \r
}\r
\r
+\r
+ //using (var client = new RestClient(_baseClient))\r
+ //{\r
+ // if (!String.IsNullOrWhiteSpace(accountInfo.UserName))\r
+ // client.BaseAddress = GetAccountUrl(accountInfo.UserName);\r
+\r
+ // client.Parameters.Clear();\r
+ // client.Parameters.Add("format", "json"); \r
+ // client.Head(_emptyUri, 3);\r
+\r
+ // var quotaValue=client.ResponseHeaders["X-Account-Policy-Quota"];\r
+ // var bytesValue= client.ResponseHeaders["X-Account-Bytes-Used"];\r
+\r
+ // long quota, bytes;\r
+ // if (long.TryParse(quotaValue, out quota))\r
+ // accountInfo.Quota = quota;\r
+ // if (long.TryParse(bytesValue, out bytes))\r
+ // accountInfo.BytesUsed = bytes;\r
+ \r
+ // return accountInfo;\r
+\r
+ //}\r
+\r
}\r
}\r
\r
client.Headers.Add("X-Object-Public", isPublic);\r
\r
\r
- /*var uriBuilder = client.GetAddressBuilder(objectInfo.Container, objectInfo.Name);\r
- uriBuilder.Query = "update=";\r
- var uri = uriBuilder.Uri.MakeRelativeUri(this.RootAddressUri);*/\r
var address = String.Format("{0}/{1}?update=",objectInfo.Container, objectInfo.Name);\r
- client.PostWithRetry(address,"application/xml");\r
+ client.PostWithRetry(new Uri(address,UriKind.Relative),"application/xml");\r
\r
- //client.UploadValues(uri,new NameValueCollection());\r
-\r
-\r
client.AssertStatusOK("UpdateMetadata failed");\r
//If the status is NOT ACCEPTED or OK we have a problem\r
if (!(client.StatusCode == HttpStatusCode.Accepted || client.StatusCode == HttpStatusCode.OK))\r
}\r
\r
\r
- var uriBuilder = client.GetAddressBuilder(containerInfo.Name,"");\r
+ var uriBuilder = client.GetAddressBuilder(containerInfo.Name,_emptyUri);\r
var uri = uriBuilder.Uri;\r
\r
client.UploadValues(uri,new NameValueCollection());\r
\r
}\r
\r
+ \r
+\r
\r
- public IList<ObjectInfo> ListObjects(string account, string container, DateTime? since = null)\r
+ public IList<ObjectInfo> ListObjects(string account, Uri container, DateTimeOffset? since = null)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container==null)\r
throw new ArgumentNullException("container");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("container");\r
Contract.EndContractBlock();\r
\r
using (ThreadContext.Stacks["Objects"].Push("List"))\r
{\r
- if (Log.IsDebugEnabled) Log.DebugFormat("START");\r
\r
- using (var client = new RestClient(_baseClient))\r
- {\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
-\r
- client.Parameters.Clear();\r
- client.Parameters.Add("format", "json");\r
- client.IfModifiedSince = since;\r
- var content = client.DownloadStringWithRetry(container, 3);\r
-\r
- client.AssertStatusOK("ListObjects failed");\r
-\r
- if (client.StatusCode==HttpStatusCode.NotModified)\r
- return new[]{new NoModificationInfo(account,container)};\r
- //If the result is empty, return an empty list,\r
- var infos = String.IsNullOrWhiteSpace(content)\r
- ? new List<ObjectInfo>()\r
- //Otherwise deserialize the object list into a list of ObjectInfos\r
- : JsonConvert.DeserializeObject<IList<ObjectInfo>>(content);\r
-\r
- foreach (var info in infos)\r
- {\r
- info.Container = container;\r
- info.Account = account;\r
- info.StorageUri = this.StorageUrl;\r
- }\r
- if (Log.IsDebugEnabled) Log.DebugFormat("END");\r
- return infos;\r
- }\r
+ var containerUri = GetTargetUri(account).Combine(container);\r
+ var targetUri = new Uri(String.Format("{0}?format=json", containerUri), UriKind.Absolute);\r
+\r
+ var content =TaskEx.Run(async ()=>await GetStringAsync(targetUri, "ListObjects failed", since).ConfigureAwait(false)).Result;\r
+\r
+ //304 will result in an empty string. Empty containers return an empty json array\r
+ if (String.IsNullOrWhiteSpace(content))\r
+ return new[] {new NoModificationInfo(account, container)};\r
+\r
+ //If the result is empty, return an empty list,\r
+ var infos = String.IsNullOrWhiteSpace(content)\r
+ ? new List<ObjectInfo>()\r
+ //Otherwise deserialize the object list into a list of ObjectInfos\r
+ : JsonConvert.DeserializeObject<IList<ObjectInfo>>(content);\r
+\r
+ foreach (var info in infos)\r
+ {\r
+ info.Container = container;\r
+ info.Account = account;\r
+ info.StorageUri = StorageUrl;\r
+ }\r
+ if (Log.IsDebugEnabled) Log.DebugFormat("END");\r
+ return infos;\r
}\r
}\r
\r
- public IList<ObjectInfo> ListObjects(string account, string container, string folder, DateTime? since = null)\r
+ public IList<ObjectInfo> ListObjects(string account, Uri container, Uri folder, DateTimeOffset? since = null)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container==null)\r
throw new ArgumentNullException("container");\r
-/*\r
- if (String.IsNullOrWhiteSpace(folder))\r
- throw new ArgumentNullException("folder");\r
-*/\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("container");\r
Contract.EndContractBlock();\r
\r
using (ThreadContext.Stacks["Objects"].Push("List"))\r
{\r
if (Log.IsDebugEnabled) Log.DebugFormat("START");\r
\r
+ var containerUri = GetTargetUri(account).Combine(container);\r
+ var targetUri = new Uri(String.Format("{0}?format=json&path={1}", containerUri,folder), UriKind.Absolute);\r
+ var content = TaskEx.Run(async ()=>await GetStringAsync(targetUri, "ListObjects failed", since).ConfigureAwait(false)).Result; \r
+\r
+ //304 will result in an empty string. Empty containers return an empty json array\r
+ if (String.IsNullOrWhiteSpace(content))\r
+ return new[] { new NoModificationInfo(account, container) };\r
+\r
+\r
+ var infos = JsonConvert.DeserializeObject<IList<ObjectInfo>>(content);\r
+ foreach (var info in infos)\r
+ {\r
+ info.Account = account;\r
+ if (info.Container == null)\r
+ info.Container = container;\r
+ info.StorageUri = StorageUrl;\r
+ }\r
+ if (Log.IsDebugEnabled) Log.DebugFormat("END");\r
+ return infos;\r
+/*\r
using (var client = new RestClient(_baseClient))\r
{\r
if (!String.IsNullOrWhiteSpace(account))\r
\r
client.Parameters.Clear();\r
client.Parameters.Add("format", "json");\r
- client.Parameters.Add("path", folder);\r
+ client.Parameters.Add("path", folder.ToString());\r
client.IfModifiedSince = since;\r
- var content = client.DownloadStringWithRetry(container, 3);\r
+ var content = client.DownloadStringWithRetryRelative(container, 3);\r
client.AssertStatusOK("ListObjects failed");\r
\r
if (client.StatusCode==HttpStatusCode.NotModified)\r
info.Account = account;\r
if (info.Container == null)\r
info.Container = container;\r
- info.StorageUri = this.StorageUrl;\r
+ info.StorageUri = StorageUrl;\r
}\r
if (Log.IsDebugEnabled) Log.DebugFormat("END");\r
return infos;\r
}\r
+*/\r
}\r
}\r
\r
\r
- public bool ContainerExists(string account, string container)\r
+ public bool ContainerExists(string account, Uri container)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container==null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException( "The container must be relative","container");\r
Contract.EndContractBlock();\r
\r
using (ThreadContext.Stacks["Containters"].Push("Exists"))\r
{\r
if (Log.IsDebugEnabled) Log.DebugFormat("START");\r
\r
+ var targetUri = GetTargetUri(account).Combine(container);\r
+\r
+ using (var response = _baseHttpClient.HeadAsyncWithRetries(targetUri, 3).Result)\r
+ {\r
+\r
+ bool result;\r
+ switch (response.StatusCode)\r
+ {\r
+ case HttpStatusCode.OK:\r
+ case HttpStatusCode.NoContent:\r
+ result = true;\r
+ break;\r
+ case HttpStatusCode.NotFound:\r
+ result = false;\r
+ break;\r
+ default:\r
+ throw CreateWebException("ContainerExists", response.StatusCode);\r
+ }\r
+ if (Log.IsDebugEnabled) Log.DebugFormat("END");\r
+\r
+ return result;\r
+ }\r
+/*\r
using (var client = new RestClient(_baseClient))\r
{\r
if (!String.IsNullOrWhiteSpace(account))\r
\r
return result;\r
}\r
+*/\r
\r
}\r
}\r
\r
- public bool ObjectExists(string account, string container, string objectName)\r
+ private Uri GetTargetUri(string account)\r
+ {\r
+ return new Uri(GetTargetUrl(account),UriKind.Absolute);\r
+ }\r
+\r
+ private string GetTargetUrl(string account)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ return String.IsNullOrWhiteSpace(account)\r
+ ? _baseHttpClient.BaseAddress.ToString()\r
+ : GetAccountUrl(account);\r
+ }\r
+\r
+ public bool ObjectExists(string account, Uri container, Uri objectName)\r
+ {\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ if (objectName == null)\r
throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","objectName");\r
Contract.EndContractBlock();\r
\r
+ var targetUri=GetTargetUri(account).Combine(container).Combine(objectName);\r
+\r
+ using (var response = _baseHttpClient.HeadAsyncWithRetries(targetUri, 3).Result)\r
+ {\r
+ switch (response.StatusCode)\r
+ {\r
+ case HttpStatusCode.OK:\r
+ case HttpStatusCode.NoContent:\r
+ return true;\r
+ case HttpStatusCode.NotFound:\r
+ return false;\r
+ default:\r
+ throw CreateWebException("ObjectExists", response.StatusCode);\r
+ }\r
+ }\r
+\r
+/*\r
using (var client = new RestClient(_baseClient))\r
{\r
if (!String.IsNullOrWhiteSpace(account))\r
client.BaseAddress = GetAccountUrl(account);\r
\r
client.Parameters.Clear();\r
- client.Head(container + "/" + objectName, 3);\r
+ client.Head(container.Combine(objectName), 3);\r
\r
switch (client.StatusCode)\r
{\r
throw CreateWebException("ObjectExists", client.StatusCode);\r
}\r
}\r
+*/\r
\r
}\r
\r
- public ObjectInfo GetObjectInfo(string account, string container, string objectName)\r
+ public async Task<ObjectInfo> GetObjectInfo(string account, Uri container, Uri objectName)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative", "container");\r
+ if (objectName == null)\r
throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative", "objectName");\r
Contract.EndContractBlock();\r
\r
using (ThreadContext.Stacks["Objects"].Push("GetObjectInfo"))\r
- { \r
+ {\r
\r
- using (var client = new RestClient(_baseClient))\r
+ var targetUri = GetTargetUri(account).Combine(container).Combine(objectName);\r
+ try\r
+ {\r
+ using (var response = await _baseHttpClient.HeadAsyncWithRetries(targetUri, 3,true))\r
+ {\r
+ switch (response.StatusCode)\r
+ {\r
+ case HttpStatusCode.OK:\r
+ case HttpStatusCode.NoContent:\r
+ var tags = response.Headers.GetMeta("X-Object-Meta-");\r
+ var extensions = (from header in response.Headers\r
+ where\r
+ header.Key.StartsWith("X-Object-") &&\r
+ !header.Key.StartsWith("X-Object-Meta-")\r
+ select new {Name = header.Key, Value = header.Value.FirstOrDefault()})\r
+ .ToDictionary(t => t.Name, t => t.Value);\r
+\r
+ var permissions = response.Headers.GetFirstValue("X-Object-Sharing");\r
+\r
+\r
+ var info = new ObjectInfo\r
+ {\r
+ Account = account,\r
+ Container = container,\r
+ Name = objectName,\r
+ ETag = response.Headers.ETag.NullSafe(e=>e.Tag),\r
+ UUID = response.Headers.GetFirstValue("X-Object-UUID"),\r
+ X_Object_Hash = response.Headers.GetFirstValue("X-Object-Hash"),\r
+ Content_Type = response.Headers.GetFirstValue("Content-Type"),\r
+ Bytes = Convert.ToInt64(response.Content.Headers.ContentLength),\r
+ Tags = tags,\r
+ Last_Modified = response.Content.Headers.LastModified,\r
+ Extensions = extensions,\r
+ ContentEncoding =\r
+ response.Content.Headers.ContentEncoding.FirstOrDefault(),\r
+ ContendDisposition =\r
+ response.Content.Headers.ContentDisposition.NullSafe(c=>c.ToString()),\r
+ Manifest = response.Headers.GetFirstValue("X-Object-Manifest"),\r
+ PublicUrl = response.Headers.GetFirstValue("X-Object-Public"),\r
+ StorageUri = StorageUrl,\r
+ };\r
+ info.SetPermissions(permissions);\r
+ return info;\r
+ case HttpStatusCode.NotFound:\r
+ return ObjectInfo.Empty;\r
+ default:\r
+ throw new WebException(\r
+ String.Format("[FAIL] GetObjectInfo for {0} failed with unexpected status code {1}",\r
+ objectName, response.StatusCode));\r
+ }\r
+ }\r
+ }\r
+ catch (RetryException)\r
+ {\r
+ Log.WarnFormat("[RETRY FAIL] GetObjectInfo for {0} failed.", objectName);\r
+ return ObjectInfo.Empty;\r
+ }\r
+ catch (WebException e)\r
+ {\r
+ Log.Error(\r
+ String.Format("[FAIL] GetObjectInfo for {0} failed with unexpected status {1}",\r
+ objectName, e.Status), e);\r
+ throw;\r
+ }\r
+ } /* using (var client = new RestClient(_baseClient))\r
{\r
if (!String.IsNullOrWhiteSpace(account))\r
client.BaseAddress = GetAccountUrl(account);\r
{\r
client.Parameters.Clear();\r
\r
- client.Head(container + "/" + objectName, 3);\r
+ client.Head(container.Combine(objectName), 3);\r
\r
if (client.TimedOut)\r
return ObjectInfo.Empty;\r
ContendDisposition = client.GetHeaderValue("Content-Disposition",true),\r
Manifest=client.GetHeaderValue("X-Object-Manifest",true),\r
PublicUrl=client.GetHeaderValue("X-Object-Public",true), \r
- StorageUri=this.StorageUrl,\r
+ StorageUri=StorageUrl,\r
};\r
info.SetPermissions(permissions);\r
return info;\r
objectName, client.StatusCode), e);\r
throw;\r
}\r
- } \r
- }\r
+ } */\r
+\r
\r
}\r
\r
- public void CreateFolder(string account, string container, string folder)\r
+\r
+\r
+ public void CreateFolder(string account, Uri container, Uri folder)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(folder))\r
- throw new ArgumentNullException("folder", "The folder property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ if (folder == null)\r
+ throw new ArgumentNullException("folder", "The objectName property can't be empty");\r
+ if (folder.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","folder");\r
Contract.EndContractBlock();\r
\r
- var folderUrl=String.Format("{0}/{1}",container,folder);\r
+ var folderUri=container.Combine(folder); \r
+ var targetUri = GetTargetUri(account).Combine(folderUri);\r
+ var message = new HttpRequestMessage(HttpMethod.Put, targetUri);\r
+ \r
+ message.Headers.Add("Content-Type", ObjectInfo.CONTENT_TYPE_DIRECTORY);\r
+ message.Headers.Add("Content-Length", "0");\r
+ using (var response = _baseHttpClient.SendAsyncWithRetries(message, 3).Result)\r
+ {\r
+ if (response.StatusCode != HttpStatusCode.Created && response.StatusCode != HttpStatusCode.Accepted)\r
+ throw CreateWebException("CreateFolder", response.StatusCode);\r
+ }\r
+/*\r
using (var client = new RestClient(_baseClient))\r
{\r
if (!String.IsNullOrWhiteSpace(account))\r
client.BaseAddress = GetAccountUrl(account);\r
\r
client.Parameters.Clear();\r
- client.Headers.Add("Content-Type", @"application/directory");\r
+ client.Headers.Add("Content-Type", ObjectInfo.CONTENT_TYPE_DIRECTORY);\r
client.Headers.Add("Content-Length", "0");\r
- client.PutWithRetry(folderUrl, 3);\r
+ client.PutWithRetry(folderUri, 3);\r
\r
if (client.StatusCode != HttpStatusCode.Created && client.StatusCode != HttpStatusCode.Accepted)\r
throw CreateWebException("CreateFolder", client.StatusCode);\r
}\r
+*/\r
+ }\r
+\r
+ private Dictionary<string, string> GetMeta(HttpResponseMessage response,string metaPrefix)\r
+ {\r
+ if (String.IsNullOrWhiteSpace(metaPrefix))\r
+ throw new ArgumentNullException("metaPrefix");\r
+ Contract.EndContractBlock();\r
+\r
+ var dict = (from header in response.Headers\r
+ where header.Key.StartsWith(metaPrefix)\r
+ select new { Name = header.Key, Value = String.Join(",", header.Value) })\r
+ .ToDictionary(t => t.Name, t => t.Value);\r
+\r
+ \r
+ return dict;\r
}\r
\r
- \r
\r
- public ContainerInfo GetContainerInfo(string account, string container)\r
+ public ContainerInfo GetContainerInfo(string account, Uri container)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
Contract.EndContractBlock();\r
\r
- using (var client = new RestClient(_baseClient))\r
+ var targetUri = GetTargetUri(account).Combine(container); \r
+ using (var response = _baseHttpClient.HeadAsyncWithRetries(targetUri, 3).Result)\r
{\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account); \r
-\r
- client.Head(container);\r
- switch (client.StatusCode)\r
+ if (Log.IsDebugEnabled)\r
+ Log.DebugFormat("ContainerInfo data: {0}\n{1}",response,response.Content.ReadAsStringAsync().Result);\r
+ switch (response.StatusCode)\r
{\r
case HttpStatusCode.OK:\r
case HttpStatusCode.NoContent:\r
- var tags = client.GetMeta("X-Container-Meta-");\r
- var policies = client.GetMeta("X-Container-Policy-");\r
+ var tags = GetMeta(response,"X-Container-Meta-");\r
+ var policies = GetMeta(response,"X-Container-Policy-");\r
\r
var containerInfo = new ContainerInfo\r
{\r
- Account=account,\r
+ Account = account,\r
Name = container,\r
- StorageUrl=this.StorageUrl.ToString(),\r
- Count =\r
- long.Parse(client.GetHeaderValue("X-Container-Object-Count")),\r
- Bytes = long.Parse(client.GetHeaderValue("X-Container-Bytes-Used")),\r
- BlockHash = client.GetHeaderValue("X-Container-Block-Hash"),\r
- BlockSize=int.Parse(client.GetHeaderValue("X-Container-Block-Size")),\r
- Last_Modified=client.LastModified,\r
- Tags=tags,\r
- Policies=policies\r
+ StorageUrl = StorageUrl.ToString(),\r
+ Count =long.Parse(response.Headers.GetFirstValue("X-Container-Object-Count")),\r
+ Bytes = long.Parse(response.Headers.GetFirstValue("X-Container-Bytes-Used")),\r
+ BlockHash = response.Headers.GetFirstValue("X-Container-Block-Hash"),\r
+ BlockSize =\r
+ int.Parse(response.Headers.GetFirstValue("X-Container-Block-Size")),\r
+ Last_Modified = response.Content.Headers.LastModified,\r
+ Tags = tags,\r
+ Policies = policies\r
};\r
- \r
+\r
\r
return containerInfo;\r
case HttpStatusCode.NotFound:\r
return ContainerInfo.Empty;\r
default:\r
- throw CreateWebException("GetContainerInfo", client.StatusCode);\r
+ throw CreateWebException("GetContainerInfo", response.StatusCode);\r
}\r
- }\r
+ } \r
}\r
\r
- public void CreateContainer(string account, string container)\r
+ public void CreateContainer(string account, Uri container)\r
{\r
- if (String.IsNullOrWhiteSpace(account))\r
- throw new ArgumentNullException("account");\r
- if (String.IsNullOrWhiteSpace(container))\r
- throw new ArgumentNullException("container");\r
+ if (container == null)\r
+ throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
Contract.EndContractBlock();\r
\r
+ var targetUri=GetTargetUri(account).Combine(container);\r
+ var message = new HttpRequestMessage(HttpMethod.Put, targetUri);\r
+ message.Headers.Add("Content-Length", "0");\r
+ using (var response = _baseHttpClient.SendAsyncWithRetries(message, 3).Result)\r
+ { \r
+ var expectedCodes = new[] {HttpStatusCode.Created, HttpStatusCode.Accepted, HttpStatusCode.OK};\r
+ if (!expectedCodes.Contains(response.StatusCode))\r
+ throw CreateWebException("CreateContainer", response.StatusCode);\r
+ }\r
+/*\r
using (var client = new RestClient(_baseClient))\r
{\r
if (!String.IsNullOrWhiteSpace(account))\r
if (!expectedCodes.Contains(client.StatusCode))\r
throw CreateWebException("CreateContainer", client.StatusCode);\r
}\r
+*/\r
}\r
\r
- public void DeleteContainer(string account, string container)\r
+ public async Task WipeContainer(string account, Uri container)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative", "container");\r
Contract.EndContractBlock();\r
\r
- using (var client = new RestClient(_baseClient))\r
- {\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
+ await DeleteContainer(account, new Uri(String.Format("{0}?delimiter=/", container), UriKind.Relative)).ConfigureAwait(false);\r
+ }\r
\r
- client.DeleteWithRetry(container, 3);\r
- var expectedCodes = new[] {HttpStatusCode.NotFound, HttpStatusCode.NoContent};\r
- if (!expectedCodes.Contains(client.StatusCode))\r
- throw CreateWebException("DeleteContainer", client.StatusCode);\r
+\r
+ public async Task DeleteContainer(string account, Uri container)\r
+ {\r
+ if (container == null)\r
+ throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ Contract.EndContractBlock();\r
+\r
+ var targetUri = GetTargetUri(account).Combine(container);\r
+ var message = new HttpRequestMessage(HttpMethod.Delete, targetUri);\r
+ using (var response = await _baseHttpClient.SendAsyncWithRetries(message, 3).ConfigureAwait(false))\r
+ {\r
+ var expectedCodes = new[] { HttpStatusCode.NotFound, HttpStatusCode.NoContent };\r
+ if (!expectedCodes.Contains(response.StatusCode))\r
+ throw CreateWebException("DeleteContainer", response.StatusCode);\r
}\r
\r
}\r
/// <param name="container"></param>\r
/// <param name="objectName"></param>\r
/// <param name="fileName"></param>\r
+ /// <param name="cancellationToken"> </param>\r
/// <returns></returns>\r
/// <remarks>This method should have no timeout or a very long one</remarks>\r
//Asynchronously download the object specified by *objectName* in a specific *container* to \r
// a local file\r
- public async Task GetObject(string account, string container, string objectName, string fileName,CancellationToken cancellationToken)\r
+ public async Task GetObject(string account, Uri container, Uri objectName, string fileName,CancellationToken cancellationToken)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
- throw new ArgumentNullException("objectName", "The objectName property can't be empty"); \r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ if (objectName == null)\r
+ throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","objectName");\r
Contract.EndContractBlock();\r
+ \r
\r
try\r
{\r
args.BytesReceived,\r
args.TotalBytesToReceive);\r
if (DownloadProgressChanged!=null)\r
- DownloadProgressChanged(this, args);\r
+ DownloadProgressChanged(this, new DownloadArgs(args));\r
});\r
\r
//Start downloading the object asynchronously \r
\r
}\r
\r
- public Task<IList<string>> PutHashMap(string account, string container, string objectName, TreeHash hash)\r
+ public async Task<IList<string>> PutHashMap(string account, Uri container, Uri objectName, TreeHash hash)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
- throw new ArgumentNullException("container");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
- throw new ArgumentNullException("objectName");\r
- if (hash==null)\r
+ if (container == null)\r
+ throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ if (objectName == null)\r
+ throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","objectName");\r
+ if (hash == null)\r
throw new ArgumentNullException("hash");\r
if (String.IsNullOrWhiteSpace(Token))\r
throw new InvalidOperationException("Invalid Token");\r
throw new InvalidOperationException("Invalid Storage Url");\r
Contract.EndContractBlock();\r
\r
-\r
- //Don't use a timeout because putting the hashmap may be a long process\r
- var client = new RestClient(_baseClient) { Timeout = 0 }; \r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
+ \r
\r
//The container and objectName are relative names. They are joined with the client's\r
//BaseAddress to create the object's absolute address\r
- var builder = client.GetAddressBuilder(container, objectName);\r
- builder.Query = "format=json&hashmap";\r
- var uri = builder.Uri;\r
\r
+ var targetUri = GetTargetUri(account).Combine(container).Combine(objectName);\r
+ \r
+\r
+ var uri = new Uri(String.Format("{0}?format=json&hashmap",targetUri),UriKind.Absolute);\r
\r
+ \r
//Send the tree hash as Json to the server \r
- client.Headers[HttpRequestHeader.ContentType] = "application/octet-stream";\r
var jsonHash = hash.ToJson();\r
- \r
- client.Headers.Add("ETag",hash.MD5);\r
- var uploadTask=client.UploadStringTask(uri, "PUT", jsonHash);\r
if (Log.IsDebugEnabled)\r
Log.DebugFormat("Hashes:\r\n{0}", jsonHash);\r
- return uploadTask.ContinueWith(t =>\r
+\r
+ var message = new HttpRequestMessage(HttpMethod.Put, uri)\r
{\r
+ Content = new StringContent(jsonHash)\r
+ };\r
+ message.Headers.Add("ETag",hash.TopHash.ToHashString());\r
+ \r
+ //Don't use a timeout because putting the hashmap may be a long process\r
\r
+ using (var response = await _baseHttpClientNoTimeout.SendAsyncWithRetries(message, 3).ConfigureAwait(false))\r
+ {\r
var empty = (IList<string>)new List<string>();\r
\r
-\r
- //The server will respond either with 201-created if all blocks were already on the server\r
- if (client.StatusCode == HttpStatusCode.Created) \r
- {\r
- //in which case we return an empty hash list\r
- return empty;\r
- }\r
- //or with a 409-conflict and return the list of missing parts\r
- //A 409 will cause an exception so we need to check t.IsFaulted to avoid propagating the exception \r
- if (t.IsFaulted)\r
+ switch (response.StatusCode)\r
{\r
- var ex = t.Exception.InnerException;\r
- var we = ex as WebException;\r
- var response = we.Response as HttpWebResponse;\r
- if (response!=null && response.StatusCode==HttpStatusCode.Conflict)\r
- {\r
- //In case of 409 the missing parts will be in the response content \r
- using (var stream = response.GetResponseStream())\r
+ case HttpStatusCode.Created:\r
+ //The server will respond either with 201-created if all blocks were already on the server\r
+ return empty;\r
+ case HttpStatusCode.Conflict:\r
+ //or with a 409-conflict and return the list of missing parts\r
+ using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))\r
using(var reader=stream.GetLoggedReader(Log))\r
- {\r
- //We used to have to cleanup the content before returning it because it contains\r
- //error content after the list of hashes\r
- //\r
- //As of 30/1/2012, the result is a proper Json array so we don't need to read the content\r
- //line by line\r
- \r
+ { \r
var serializer = new JsonSerializer(); \r
serializer.Error += (sender, args) => Log.ErrorFormat("Deserialization error at [{0}] [{1}]", args.ErrorContext.Error, args.ErrorContext.Member);\r
var hashes = (List<string>)serializer.Deserialize(reader, typeof(List<string>));\r
return hashes;\r
} \r
- } \r
- //Any other status code is unexpected and the exception should be rethrown\r
- Log.LogError(response);\r
- throw ex;\r
- \r
+ default:\r
+ //All other cases are unexpected\r
+ //Ensure that failure codes raise exceptions\r
+ response.EnsureSuccessStatusCode();\r
+ //And log any other codes as warngings, but continute processing\r
+ Log.WarnFormat("Unexcpected status code when putting map: {0} - {1}",response.StatusCode,response.ReasonPhrase);\r
+ return empty;\r
}\r
-\r
- //Any other status code is unexpected but there was no exception. We can probably continue processing\r
- Log.WarnFormat("Unexcpected status code when putting map: {0} - {1}",client.StatusCode,client.StatusDescription); \r
- \r
- return empty;\r
- });\r
+ }\r
\r
}\r
\r
\r
- public async Task<byte[]> GetBlock(string account, string container, Uri relativeUrl, long start, long? end, CancellationToken cancellationToken)\r
+ public async Task<byte[]> GetBlock(string account, Uri container, Uri relativeUrl, long start, long? end, CancellationToken cancellationToken)\r
{\r
if (String.IsNullOrWhiteSpace(Token))\r
throw new InvalidOperationException("Invalid Token");\r
if (StorageUrl == null)\r
throw new InvalidOperationException("Invalid Storage Url");\r
- if (String.IsNullOrWhiteSpace(container))\r
- throw new ArgumentNullException("container");\r
+ if (container == null)\r
+ throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
if (relativeUrl == null)\r
throw new ArgumentNullException("relativeUrl");\r
if (end.HasValue && end < 0)\r
throw new ArgumentOutOfRangeException("start");\r
Contract.EndContractBlock();\r
\r
- //Don't use a timeout because putting the hashmap may be a long process\r
- using (var client = new RestClient(_baseClient) {Timeout = 0, RangeFrom = start, RangeTo = end})\r
- {\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
\r
- var builder = client.GetAddressBuilder(container, relativeUrl.ToString());\r
- var uri = builder.Uri;\r
+ var targetUri = GetTargetUri(account).Combine(container).Combine(relativeUrl);\r
+ var message = new HttpRequestMessage(HttpMethod.Get, targetUri);\r
+ message.Headers.Range=new RangeHeaderValue(start,end);\r
\r
-/* client.DownloadProgressChanged += (sender, args) =>\r
- {\r
- Log.DebugFormat("[GET PROGRESS] {0} {1}% {2} of {3}",\r
- uri.Segments.Last(), args.ProgressPercentage,\r
- args.BytesReceived,\r
- args.TotalBytesToReceive);\r
- DownloadProgressChanged(sender, args);\r
- };*/\r
- var progress = new Progress<DownloadProgressChangedEventArgs>(args =>\r
+ //Don't use a timeout because putting the hashmap may be a long process\r
+\r
+ IProgress<DownloadArgs> progress = new Progress<DownloadArgs>(args =>\r
{\r
Log.DebugFormat("[GET PROGRESS] {0} {1}% {2} of {3}",\r
- uri.Segments.Last(), args.ProgressPercentage,\r
+ targetUri.Segments.Last(), args.ProgressPercentage,\r
args.BytesReceived,\r
args.TotalBytesToReceive);\r
+\r
if (DownloadProgressChanged!=null)\r
- DownloadProgressChanged(this, args);\r
+ DownloadProgressChanged(this, args);\r
});\r
\r
\r
- var result = await client.DownloadDataTaskAsync(uri, cancellationToken,progress).ConfigureAwait(false);\r
+ using (var response = await _baseHttpClientNoTimeout.SendAsyncWithRetries(message, 3, false,HttpCompletionOption.ResponseHeadersRead,\r
+ cancellationToken).ConfigureAwait(false))\r
+ using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))\r
+ using(var targetStream=new MemoryStream())\r
+ {\r
+ \r
+ long totalSize = response.Content.Headers.ContentLength ?? 0;\r
+ long total = 0;\r
+ var buffer = new byte[65536];\r
+ int read;\r
+ while ((read = await stream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) != 0)\r
+ {\r
+ total += read;\r
+ progress.Report(new DownloadArgs(total, totalSize));\r
+ await targetStream.WriteAsync(buffer, 0, read).ConfigureAwait(false);\r
+ }\r
+\r
+ var result = targetStream.ToArray();\r
return result;\r
}\r
+ \r
}\r
\r
- public event UploadProgressChangedEventHandler UploadProgressChanged;\r
- public event DownloadProgressChangedEventHandler DownloadProgressChanged;\r
+ public event EventHandler<UploadArgs> UploadProgressChanged;\r
+ public event EventHandler<DownloadArgs> DownloadProgressChanged;\r
+ \r
\r
- public async Task PostBlock(string account, string container, byte[] block, int offset, int count,CancellationToken token)\r
+ public async Task PostBlock(string account, Uri container, byte[] block, int offset, int count,string blockHash,CancellationToken token)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
- throw new ArgumentNullException("container");\r
+ if (container == null)\r
+ throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
if (block == null)\r
throw new ArgumentNullException("block");\r
if (offset < 0 || offset >= block.Length)\r
\r
try\r
{\r
+ var containerUri = GetTargetUri(account).Combine(container);\r
+ var targetUri = new Uri(String.Format("{0}?update", containerUri));\r
+\r
\r
//Don't use a timeout because putting the hashmap may be a long process\r
- using (var client = new RestClient(_baseClient) { Timeout = 0 })\r
- {\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
\r
- var builder = client.GetAddressBuilder(container, "");\r
- //We are doing an update\r
- builder.Query = "update";\r
- var uri = builder.Uri;\r
\r
- client.Headers[HttpRequestHeader.ContentType] = "application/octet-stream";\r
+ Log.InfoFormat("[BLOCK POST] START");\r
\r
- Log.InfoFormat("[BLOCK POST] START");\r
\r
-/*\r
- client.UploadProgressChanged += (sender, args) =>\r
- {\r
- Log.InfoFormat("[BLOCK POST PROGRESS] {0}% {1} of {2}",\r
- args.ProgressPercentage, args.BytesSent,\r
- args.TotalBytesToSend);\r
- UploadProgressChanged(sender, args);\r
- };\r
-*/\r
- client.UploadFileCompleted += (sender, args) =>\r
- Log.InfoFormat("[BLOCK POST PROGRESS] Completed ");\r
+ var progress = new Progress<UploadArgs>(args =>\r
+ {\r
+ Log.InfoFormat("[BLOCK POST PROGRESS] {0}% {1} of {2}",\r
+ args.ProgressPercentage,\r
+ args.BytesSent,\r
+ args.TotalBytesToSend);\r
+ if (UploadProgressChanged != null)\r
+ UploadProgressChanged(this,args);\r
+ });\r
\r
- var progress=new Progress<UploadProgressChangedEventArgs>(args=>\r
- {\r
- Log.InfoFormat("[BLOCK POST PROGRESS] {0}% {1} of {2}",\r
- args.ProgressPercentage, args.BytesSent,\r
- args.TotalBytesToSend);\r
- if (UploadProgressChanged!=null)\r
- UploadProgressChanged(this, args); \r
- });\r
- var buffer = new byte[count];\r
- Buffer.BlockCopy(block, offset, buffer, 0, count);\r
- //Send the block\r
- await client.UploadDataTaskAsync(uri, "POST", buffer,token,progress).ConfigureAwait(false);\r
- Log.InfoFormat("[BLOCK POST] END");\r
+ var message = new HttpRequestMessage(HttpMethod.Post, targetUri)\r
+ {\r
+ Content = new ByteArrayContentWithProgress(block, offset, count,progress)\r
+ };\r
+ message.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(@"application/octet-stream");\r
+\r
+ //Send the block\r
+ using (var response = await _baseHttpClientNoTimeout.SendAsyncWithRetries(message, 3,false,HttpCompletionOption.ResponseContentRead,token).ConfigureAwait(false))\r
+ { \r
+ Log.InfoFormat("[BLOCK POST PROGRESS] Completed ");\r
+ response.EnsureSuccessStatusCode();\r
+ var responseHash = await response.Content.ReadAsStringAsync().ConfigureAwait(false);\r
+ var cleanHash = responseHash.TrimEnd();\r
+ Debug.Assert(blockHash==cleanHash);\r
+ if (responseHash.Equals(cleanHash,StringComparison.OrdinalIgnoreCase))\r
+ Log.ErrorFormat("Block hash mismatch posting to [{0}]:[{1}], expected [{2}] but was [{3}]",account,container,blockHash,responseHash);\r
}\r
+ Log.InfoFormat("[BLOCK POST] END"); \r
}\r
catch (TaskCanceledException )\r
{\r
}\r
\r
\r
- public async Task<TreeHash> GetHashMap(string account, string container, string objectName)\r
+ public async Task<TreeHash> GetHashMap(string account, Uri container, Uri objectName)\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
- throw new ArgumentNullException("container");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
- throw new ArgumentNullException("objectName");\r
+ if (container == null)\r
+ throw new ArgumentNullException("container", "The container property can't be empty");\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ if (objectName == null)\r
+ throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","objectName");\r
if (String.IsNullOrWhiteSpace(Token))\r
throw new InvalidOperationException("Invalid Token");\r
if (StorageUrl == null)\r
\r
try\r
{\r
- //WebClient, and by extension RestClient, are not thread-safe. Create a new RestClient\r
- //object to avoid concurrency errors.\r
- //\r
- //Download operations take a long time therefore they have no timeout.\r
- //TODO: Do they really? this is a hashmap operation, not a download\r
- \r
- //Start downloading the object asynchronously\r
- using (var client = new RestClient(_baseClient) { Timeout = 0 })\r
- {\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
\r
- //The container and objectName are relative names. They are joined with the client's\r
- //BaseAddress to create the object's absolute address\r
- var builder = client.GetAddressBuilder(container, objectName);\r
- builder.Query = "format=json&hashmap";\r
- var uri = builder.Uri;\r
+ var objectUri = GetTargetUri(account).Combine(container).Combine(objectName);\r
+ var targetUri = new Uri(String.Format("{0}?format=json&hashmap", objectUri));\r
\r
+ //Start downloading the object asynchronously\r
+ var json = await GetStringAsync(targetUri, "").ConfigureAwait(false);\r
+ var treeHash = TreeHash.Parse(json);\r
+ Log.InfoFormat("[GET HASH] END {0}", objectName);\r
+ return treeHash;\r
\r
- var json = await client.DownloadStringTaskAsync(uri).ConfigureAwait(false);\r
- var treeHash = TreeHash.Parse(json);\r
- Log.InfoFormat("[GET HASH] END {0}", objectName);\r
- return treeHash;\r
- }\r
}\r
catch (Exception exc)\r
{\r
/// <param name="objectName"></param>\r
/// <param name="fileName"></param>\r
/// <param name="hash">Optional hash value for the file. If no hash is provided, the method calculates a new hash</param>\r
+ /// <param name="contentType"> </param>\r
/// <remarks>>This method should have no timeout or a very long one</remarks>\r
- public async Task PutObject(string account, string container, string objectName, string fileName, string hash = null, string contentType = "application/octet-stream")\r
+ public async Task PutObject(string account, Uri container, Uri objectName, string fileName, string hash = Signature.MERKLE_EMPTY, string contentType = "application/octet-stream")\r
{\r
- if (String.IsNullOrWhiteSpace(container))\r
+ if (container == null)\r
throw new ArgumentNullException("container", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
+ if (container.IsAbsoluteUri)\r
+ throw new ArgumentException("The container must be relative","container");\r
+ if (objectName == null)\r
throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","objectName");\r
if (String.IsNullOrWhiteSpace(fileName))\r
throw new ArgumentNullException("fileName", "The fileName property can't be empty");\r
-/*\r
- if (!File.Exists(fileName) && !Directory.Exists(fileName))\r
- throw new FileNotFoundException("The file or directory does not exist",fileName);\r
-*/\r
- \r
try\r
{\r
\r
var builder = client.GetAddressBuilder(container, objectName);\r
var uri = builder.Uri;\r
\r
- string etag = hash ?? CalculateHash(fileName);\r
+ string etag = hash ;\r
\r
client.Headers.Add("Content-Type", contentType);\r
- client.Headers.Add("ETag", etag);\r
+ if (contentType!=ObjectInfo.CONTENT_TYPE_DIRECTORY)\r
+ client.Headers.Add("ETag", etag);\r
\r
\r
Log.InfoFormat("[PUT] START {0}", objectName);\r
{\r
Log.InfoFormat("Completed {0}", fileName);\r
}\r
- }; \r
- if (contentType=="application/directory")\r
+ }; \r
+ \r
+ if (contentType==ObjectInfo.CONTENT_TYPE_DIRECTORY)\r
await client.UploadDataTaskAsync(uri, "PUT", new byte[0]).ConfigureAwait(false);\r
else\r
await client.UploadFileTaskAsync(uri, "PUT", fileName).ConfigureAwait(false);\r
} \r
\r
}\r
- \r
\r
- private static string CalculateHash(string fileName)\r
+ public void MoveObject(string account, Uri sourceContainer, Uri oldObjectName, Uri targetContainer, Uri newObjectName)\r
{\r
- Contract.Requires(!String.IsNullOrWhiteSpace(fileName));\r
+ if (sourceContainer == null)\r
+ throw new ArgumentNullException("sourceContainer", "The sourceContainer property can't be empty");\r
+ if (sourceContainer.IsAbsoluteUri)\r
+ throw new ArgumentException("The sourceContainer must be relative","sourceContainer");\r
+ if (oldObjectName == null)\r
+ throw new ArgumentNullException("oldObjectName", "The oldObjectName property can't be empty");\r
+ if (oldObjectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The oldObjectName must be relative","oldObjectName");\r
+ if (targetContainer == null)\r
+ throw new ArgumentNullException("targetContainer", "The targetContainer property can't be empty");\r
+ if (targetContainer.IsAbsoluteUri)\r
+ throw new ArgumentException("The targetContainer must be relative","targetContainer");\r
+ if (newObjectName == null)\r
+ throw new ArgumentNullException("newObjectName", "The newObjectName property can't be empty");\r
+ if (newObjectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The newObjectName must be relative","newObjectName");\r
Contract.EndContractBlock();\r
\r
- string hash;\r
- using (var hasher = MD5.Create())\r
- using(var stream=File.OpenRead(fileName))\r
+ var baseUri = GetTargetUri(account);\r
+ var targetUri = baseUri.Combine(targetContainer).Combine(newObjectName);\r
+ var sourceUri = new Uri(String.Format("/{0}/{1}", sourceContainer, oldObjectName),UriKind.Relative);\r
+\r
+ var message = new HttpRequestMessage(HttpMethod.Put, targetUri);\r
+ message.Headers.Add("X-Move-From", sourceUri.ToString());\r
+ using (var response = _baseHttpClient.SendAsyncWithRetries(message, 3).Result)\r
{\r
- var hashBuilder=new StringBuilder();\r
- foreach (byte b in hasher.ComputeHash(stream))\r
- hashBuilder.Append(b.ToString("x2").ToLower());\r
- hash = hashBuilder.ToString(); \r
+ var expectedCodes = new[] {HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created};\r
+ if (!expectedCodes.Contains(response.StatusCode))\r
+ throw CreateWebException("MoveObject", response.StatusCode);\r
}\r
- return hash;\r
}\r
- \r
- public void MoveObject(string account, string sourceContainer, string oldObjectName, string targetContainer, string newObjectName)\r
+\r
+ public async Task DeleteObject(string account, Uri sourceContainer, Uri objectName, bool isDirectory)\r
{\r
- if (String.IsNullOrWhiteSpace(sourceContainer))\r
- throw new ArgumentNullException("sourceContainer", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(oldObjectName))\r
- throw new ArgumentNullException("oldObjectName", "The oldObjectName property can't be empty");\r
- if (String.IsNullOrWhiteSpace(targetContainer))\r
- throw new ArgumentNullException("targetContainer", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(newObjectName))\r
- throw new ArgumentNullException("newObjectName", "The newObjectName property can't be empty");\r
+ if (sourceContainer == null)\r
+ throw new ArgumentNullException("sourceContainer", "The sourceContainer property can't be empty");\r
+ if (sourceContainer.IsAbsoluteUri)\r
+ throw new ArgumentException("The sourceContainer must be relative","sourceContainer");\r
+ if (objectName == null)\r
+ throw new ArgumentNullException("objectName", "The objectName property can't be empty");\r
+ if (objectName.IsAbsoluteUri)\r
+ throw new ArgumentException("The objectName must be relative","objectName");\r
Contract.EndContractBlock();\r
\r
- var targetUrl = targetContainer + "/" + newObjectName;\r
- var sourceUrl = String.Format("/{0}/{1}", sourceContainer, oldObjectName);\r
\r
- using (var client = new RestClient(_baseClient))\r
+\r
+ var sourceUri = new Uri(String.Format("/{0}/{1}", sourceContainer, objectName),UriKind.Relative);\r
+\r
+ \r
+ if (objectName.OriginalString.EndsWith(".ignore"))\r
+ using(var response = await _baseHttpClient.DeleteAsync(sourceUri)){}\r
+ else\r
{\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
+ var relativeUri = new Uri(String.Format("{0}/{1}", FolderConstants.TrashContainer, objectName),\r
+ UriKind.Relative);\r
\r
- client.Headers.Add("X-Move-From", Uri.EscapeUriString(sourceUrl));\r
- client.PutWithRetry(targetUrl, 3);\r
+/*\r
+ var relativeUri = isDirectory\r
+ ? new Uri(\r
+ String.Format("{0}/{1}?delimiter=/", FolderConstants.TrashContainer,\r
+ objectName), UriKind.Relative)\r
+ : new Uri(String.Format("{0}/{1}", FolderConstants.TrashContainer, objectName),\r
+ UriKind.Relative);\r
\r
- var expectedCodes = new[] {HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created};\r
- if (!expectedCodes.Contains(client.StatusCode))\r
- throw CreateWebException("MoveObject", client.StatusCode);\r
- }\r
- }\r
+*/\r
+ var targetUri = GetTargetUri(account).Combine(relativeUri);\r
\r
- public void DeleteObject(string account, string sourceContainer, string objectName, bool isDirectory)\r
- { \r
- if (String.IsNullOrWhiteSpace(sourceContainer))\r
- throw new ArgumentNullException("sourceContainer", "The container property can't be empty");\r
- if (String.IsNullOrWhiteSpace(objectName))\r
- throw new ArgumentNullException("objectName", "The oldObjectName property can't be empty");\r
- Contract.EndContractBlock();\r
+\r
+ var message = new HttpRequestMessage(HttpMethod.Put, targetUri);\r
+ message.Headers.Add("X-Move-From", sourceUri.ToString());\r
+\r
+ Log.InfoFormat("[TRASH] [{0}] to [{1}]", sourceUri, targetUri);\r
+ using (var response = await _baseHttpClient.SendAsyncWithRetries(message, 3))\r
+ {\r
+ var expectedCodes = new[]\r
+ {\r
+ HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created,\r
+ HttpStatusCode.NotFound\r
+ };\r
+ if (!expectedCodes.Contains(response.StatusCode))\r
+ throw CreateWebException("DeleteObject", response.StatusCode);\r
+ }\r
+ }\r
+/*\r
+ \r
\r
var targetUrl = FolderConstants.TrashContainer + "/" + objectName;\r
/*\r
if (isDirectory)\r
targetUrl = targetUrl + "?delimiter=/";\r
-*/\r
+#1#\r
\r
var sourceUrl = String.Format("/{0}/{1}", sourceContainer, objectName);\r
\r
if (!String.IsNullOrWhiteSpace(account))\r
client.BaseAddress = GetAccountUrl(account);\r
\r
- client.Headers.Add("X-Move-From", Uri.EscapeUriString(sourceUrl));\r
+ client.Headers.Add("X-Move-From", sourceUrl);\r
client.AllowedStatusCodes.Add(HttpStatusCode.NotFound);\r
Log.InfoFormat("[TRASH] [{0}] to [{1}]",sourceUrl,targetUrl);\r
- client.PutWithRetry(targetUrl, 3);\r
+ client.PutWithRetry(new Uri(targetUrl,UriKind.Relative), 3);\r
\r
var expectedCodes = new[] {HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created,HttpStatusCode.NotFound};\r
if (!expectedCodes.Contains(client.StatusCode))\r
throw CreateWebException("DeleteObject", client.StatusCode);\r
}\r
+*/\r
}\r
\r
\r
}\r
\r
\r
-/*\r
- public IEnumerable<ObjectInfo> ListDirectories(ContainerInfo container)\r
- {\r
- var directories=this.ListObjects(container.Account, container.Name, "/");\r
- }\r
-*/\r
-\r
- public bool CanUpload(string account, ObjectInfo cloudFile)\r
+ public async Task<bool> CanUpload(string account, ObjectInfo cloudFile)\r
{\r
Contract.Requires(!String.IsNullOrWhiteSpace(account));\r
Contract.Requires(cloudFile!=null);\r
\r
- using (var client = new RestClient(_baseClient))\r
- {\r
- if (!String.IsNullOrWhiteSpace(account))\r
- client.BaseAddress = GetAccountUrl(account);\r
-\r
-\r
- var parts = cloudFile.Name.Split('/');\r
+ var parts = cloudFile.Name.ToString().Split('/');\r
var folder = String.Join("/", parts,0,parts.Length-1);\r
\r
- var fileUrl=String.Format("{0}/{1}/{2}.pithos.ignore",cloudFile.Container,folder,Guid.NewGuid());\r
+ var fileName = String.Format("{0}/{1}.pithos.ignore", folder, Guid.NewGuid());\r
+ var fileUri=fileName.ToEscapedUri(); \r
\r
- client.Parameters.Clear();\r
try\r
{\r
- client.PutWithRetry(fileUrl, 3, @"application/octet-stream");\r
-\r
+ var relativeUri = cloudFile.Container.Combine(fileUri);\r
+ var targetUri = GetTargetUri(account).Combine(relativeUri);\r
+ var message = new HttpRequestMessage(HttpMethod.Put, targetUri);\r
+ message.Content.Headers.ContentType =new MediaTypeHeaderValue("application/octet-stream");\r
+ var response=await _baseHttpClient.SendAsyncWithRetries(message, 3); \r
var expectedCodes = new[] { HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created};\r
- var result=(expectedCodes.Contains(client.StatusCode));\r
- DeleteObject(account, cloudFile.Container, fileUrl, cloudFile.IsDirectory);\r
+ var result=(expectedCodes.Contains(response.StatusCode));\r
+ await DeleteObject(account, cloudFile.Container, fileUri, cloudFile.IsDirectory);\r
return result;\r
}\r
catch\r
{\r
return false;\r
}\r
+ \r
+ }\r
+\r
+ ~CloudFilesClient()\r
+ {\r
+ Dispose(false);\r
+ }\r
+\r
+ public void Dispose()\r
+ {\r
+ Dispose(true);\r
+ GC.SuppressFinalize(this);\r
+ }\r
+\r
+ protected virtual void Dispose(bool disposing)\r
+ {\r
+ if (disposing)\r
+ {\r
+ if (_httpClientHandler!=null)\r
+ _httpClientHandler.Dispose();\r
+ if (_baseClient!=null)\r
+ _baseClient.Dispose();\r
+ if(_baseHttpClient!=null)\r
+ _baseHttpClient.Dispose();\r
+ if (_baseHttpClientNoTimeout!=null)\r
+ _baseHttpClientNoTimeout.Dispose();\r
}\r
+ _httpClientHandler = null;\r
+ _baseClient = null;\r
+ _baseHttpClient = null;\r
+ _baseHttpClientNoTimeout = null;\r
}\r
}\r
\r
projects / pithos-ms-client / blobdiff