| /wasDAVClient/Client.cs |
|---|
| @@ -14,11 +14,6 @@ |
|---|
| { |
| public class Client : IClient |
| { |
| private static readonly HttpMethod PropFind = new HttpMethod("PROPFIND"); |
| private static readonly HttpMethod MoveMethod = new HttpMethod("MOVE"); |
| |
| private static readonly HttpMethod MkCol = new HttpMethod(WebRequestMethods.Http.MkCol); |
| |
| private const int HttpStatusCode_MultiStatus = 207; |
| |
| // http://webdav.org/specs/rfc4918.html#METHOD_PROPFIND |
| @@ -38,17 +33,46 @@ |
|---|
| //" </prop> " + |
| "</propfind>"; |
| |
| private static readonly HttpMethod PropFind = new HttpMethod("PROPFIND"); |
| private static readonly HttpMethod MoveMethod = new HttpMethod("MOVE"); |
| |
| private static readonly HttpMethod MkCol = new HttpMethod(WebRequestMethods.Http.MkCol); |
| |
| private static readonly string AssemblyVersion = typeof(IClient).Assembly.GetName().Version.ToString(); |
| |
| private readonly HttpClient _client; |
| private readonly HttpClient _uploadClient; |
| private string _server; |
| private string _basePath = "/"; |
| |
| private string _encodedBasePath; |
| private string _server; |
| |
| |
| public Client(NetworkCredential credential = null) |
| { |
| var handler = new HttpClientHandler(); |
| |
| if (handler.SupportsProxy) |
| handler.Proxy = WebRequest.DefaultWebProxy; |
| |
| if (handler.SupportsAutomaticDecompression) |
| handler.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip; |
| |
| if (credential != null) |
| { |
| handler.Credentials = credential; |
| handler.PreAuthenticate = true; |
| } |
| |
| _client = new HttpClient(handler); |
| _client.Timeout = TimeSpan.FromSeconds(Timeout); |
| _client.DefaultRequestHeaders.ExpectContinue = false; |
| |
| _uploadClient = new HttpClient(handler); |
| _uploadClient.Timeout = TimeSpan.FromSeconds(Timeout); |
| _uploadClient.DefaultRequestHeaders.ExpectContinue = false; |
| } |
| |
| #region WebDAV connection parameters |
| |
| /// <summary> |
| @@ -56,10 +80,7 @@ |
|---|
| /// </summary> |
| public string Server |
| { |
| get |
| { |
| return _server; |
| } |
| get { return _server; } |
| set |
| { |
| value = value.TrimEnd('/'); |
| @@ -72,10 +93,7 @@ |
|---|
| /// </summary> |
| public string BasePath |
| { |
| get |
| { |
| return _basePath; |
| } |
| get { return _basePath; } |
| set |
| { |
| value = value.Trim('/'); |
| @@ -89,55 +107,25 @@ |
|---|
| /// <summary> |
| /// Specify an port (default: null = auto-detect) |
| /// </summary> |
| public int? Port |
| { |
| get; set; |
| } |
| public int? Port { get; set; } |
| |
| /// <summary> |
| /// Specify the UserAgent (and UserAgent version) string to use in requests |
| /// </summary> |
| public string UserAgent |
| { |
| get; set; |
| } |
| public string UserAgent { get; set; } |
| |
| /// <summary> |
| /// Specify the UserAgent (and UserAgent version) string to use in requests |
| /// </summary> |
| public string UserAgentVersion |
| { |
| get; set; |
| } |
| public string UserAgentVersion { get; set; } |
| |
| /// <summary> |
| /// The HTTP request timeout in seconds. |
| /// </summary> |
| public int Timeout { get; set; } = 60; |
| |
| #endregion |
| |
| |
| public Client(NetworkCredential credential = null, TimeSpan? timeout = null, IWebProxy proxy = null) |
| { |
| var handler = new HttpClientHandler(); |
| if (proxy != null && handler.SupportsProxy) |
| handler.Proxy = proxy; |
| if (handler.SupportsAutomaticDecompression) |
| handler.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip; |
| if (credential != null) |
| { |
| handler.Credentials = credential; |
| handler.PreAuthenticate = true; |
| } |
| |
| _client = new HttpClient(handler); |
| _client.DefaultRequestHeaders.ExpectContinue = false; |
| |
| if (timeout != null) |
| { |
| _uploadClient = new HttpClient(handler); |
| _uploadClient.DefaultRequestHeaders.ExpectContinue = false; |
| _uploadClient.Timeout = timeout.Value; |
| } |
| |
| } |
| |
| #region WebDAV operations |
| |
| /// <summary> |
| @@ -157,12 +145,14 @@ |
|---|
| headers.Add("Depth", depth.ToString()); |
| } |
| |
| |
| HttpResponseMessage response = null; |
| |
| try |
| { |
| response = await HttpRequest(listUri.Uri, PropFind, headers, Encoding.UTF8.GetBytes(PropFindRequestContent)).ConfigureAwait(false); |
| response = |
| await |
| HttpRequest(listUri.Uri, PropFind, headers, Encoding.UTF8.GetBytes(PropFindRequestContent)) |
| .ConfigureAwait(false); |
| |
| if (response.StatusCode != HttpStatusCode.OK && |
| (int)response.StatusCode != HttpStatusCode_MultiStatus) |
| @@ -201,7 +191,6 @@ |
|---|
| } |
| return result; |
| } |
| |
| } |
| finally |
| { |
| @@ -237,7 +226,6 @@ |
|---|
| /// <returns>A list of files (entries without a trailing slash) and directories (entries with a trailing slash)</returns> |
| private async Task<Item> Get(Uri listUri, string path) |
| { |
| |
| // Depth header: http://webdav.org/specs/rfc4918.html#rfc.section.9.1.4 |
| IDictionary<string, string> headers = new Dictionary<string, string>(); |
| headers.Add("Depth", "0"); |
| @@ -247,12 +235,16 @@ |
|---|
| |
| try |
| { |
| response = await HttpRequest(listUri, PropFind, headers, Encoding.UTF8.GetBytes(PropFindRequestContent)).ConfigureAwait(false); |
| response = |
| await |
| HttpRequest(listUri, PropFind, headers, Encoding.UTF8.GetBytes(PropFindRequestContent)) |
| .ConfigureAwait(false); |
| |
| if (response.StatusCode != HttpStatusCode.OK && |
| (int)response.StatusCode != HttpStatusCode_MultiStatus) |
| { |
| throw new wasDAVException((int)response.StatusCode, string.Format("Failed retrieving item/folder (Status Code: {0})", response.StatusCode)); |
| throw new wasDAVException((int) response.StatusCode, |
| string.Format("Failed retrieving item/folder (Status Code: {0})", response.StatusCode)); |
| } |
| |
| using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false)) |
| @@ -301,7 +293,8 @@ |
|---|
| public async Task<bool> Upload(string remoteFilePath, Stream content, string name) |
| { |
| // Should not have a trailing slash. |
| var uploadUri = await GetServerUrl(remoteFilePath.TrimEnd('/') + "/" + name.TrimStart('/'), false).ConfigureAwait(false); |
| var uploadUri = |
| await GetServerUrl(remoteFilePath.TrimEnd('/') + "/" + name.TrimStart('/'), false).ConfigureAwait(false); |
| |
| HttpResponseMessage response = null; |
| |
| @@ -323,7 +316,6 @@ |
|---|
| if (response != null) |
| response.Dispose(); |
| } |
| |
| } |
| |
| |
| @@ -335,7 +327,8 @@ |
|---|
| public async Task<bool> CreateDir(string remotePath, string name) |
| { |
| // Should not have a trailing slash. |
| var dirUri = await GetServerUrl(remotePath.TrimEnd('/') + "/" + name.TrimStart('/'), false).ConfigureAwait(false); |
| var dirUri = |
| await GetServerUrl(remotePath.TrimEnd('/') + "/" + name.TrimStart('/'), false).ConfigureAwait(false); |
| |
| HttpResponseMessage response = null; |
| |
| @@ -393,7 +386,6 @@ |
|---|
| var dstUri = await GetServerUrl(dstFolderPath, true).ConfigureAwait(false); |
| |
| return await Move(srcUri.Uri, dstUri.Uri).ConfigureAwait(false); |
| |
| } |
| |
| public async Task<bool> MoveFile(string srcFilePath, string dstFilePath) |
| @@ -413,7 +405,10 @@ |
|---|
| IDictionary<string, string> headers = new Dictionary<string, string>(); |
| headers.Add("Destination", dstUri.ToString()); |
| |
| var response = await HttpRequest(srcUri, MoveMethod, headers, Encoding.UTF8.GetBytes(requestContent)).ConfigureAwait(false); |
| var response = |
| await |
| HttpRequest(srcUri, MoveMethod, headers, Encoding.UTF8.GetBytes(requestContent)) |
| .ConfigureAwait(false); |
| |
| if (response.StatusCode != HttpStatusCode.OK && |
| response.StatusCode != HttpStatusCode.Created) |
| @@ -435,7 +430,8 @@ |
|---|
| /// <param name="method"></param> |
| /// <param name="headers"></param> |
| /// <param name="content"></param> |
| private async Task<HttpResponseMessage> HttpRequest(Uri uri, HttpMethod method, IDictionary<string, string> headers = null, byte[] content = null) |
| private async Task<HttpResponseMessage> HttpRequest(Uri uri, HttpMethod method, |
| IDictionary<string, string> headers = null, byte[] content = null) |
| { |
| using (var request = new HttpRequestMessage(method, uri)) |
| { |
| @@ -447,7 +443,7 @@ |
|---|
| |
| if (headers != null) |
| { |
| foreach (string key in headers.Keys) |
| foreach (var key in headers.Keys) |
| { |
| request.Headers.Add(key, headers[key]); |
| } |
| @@ -471,7 +467,8 @@ |
|---|
| /// <param name="headers"></param> |
| /// <param name="method"></param> |
| /// <param name="content"></param> |
| private async Task<HttpResponseMessage> HttpUploadRequest(Uri uri, HttpMethod method, Stream content, IDictionary<string, string> headers = null) |
| private async Task<HttpResponseMessage> HttpUploadRequest(Uri uri, HttpMethod method, Stream content, |
| IDictionary<string, string> headers = null) |
| { |
| using (var request = new HttpRequestMessage(method, uri)) |
| { |
| @@ -483,7 +480,7 @@ |
|---|
| |
| if (headers != null) |
| { |
| foreach (string key in headers.Keys) |
| foreach (var key in headers.Keys) |
| { |
| request.Headers.Add(key, headers[key]); |
| } |
