Merge pull request #48 from yar229/develop

fixed renaming within Total Commander WebDAV plugin; cloud.mail.ru client updated;
yar229 · Jan 9, 2017 · 19d086a · 19d086a
2 parents c1eebd7 + 974d323
commit 19d086a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/MailRuNetCloudClient b/MailRuNetCloudClient
diff --git a/WebDavMailRuCloudStore/Mailru/MoveHandler.cs b/WebDavMailRuCloudStore/Mailru/MoveHandler.cs
@@ -45,7 +45,8 @@ public async Task<bool> HandleRequestAsync(IHttpContext httpContext, IStore stor
             }
 
             // Obtain the destination
-            var destinationUri = request.GetDestinationUri();
+            //var destinationUri = request.GetDestinationUri();
+            var destinationUri = GetDestinationUri(request);
             if (destinationUri == null)
             {
                 // Bad request
@@ -100,6 +101,24 @@ public async Task<bool> HandleRequestAsync(IHttpContext httpContext, IStore stor
             return true;
         }
 
+        private static Uri GetDestinationUri(IHttpRequest request)
+        {
+            // Obtain the destination
+            string destinationHeader = request.GetHeaderValue("Destination");
+
+            if (destinationHeader == null)
+                return null;
+
+            // Create the destination URI
+            var uri = destinationHeader.StartsWith("/")
+                ? new Uri(request.Url, destinationHeader)
+                : new Uri(destinationHeader);
+
+            return uri;
+        }
+
+
+
         private async Task MoveAsync(IStoreCollection sourceCollection, string sourceName, IStoreCollection destinationCollection, string destinationName, bool overwrite, IHttpContext httpContext, Uri baseUri, UriResultCollection errors)
         {
             // Determine the new base URI

diff --git a/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs b/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs
@@ -35,13 +35,13 @@ public MailruStoreCollection(ILockingManager lockingManager, Folder directoryInf
 
             new DavQuotaAvailableBytes<MailruStoreCollection>
             {
-                Getter = (context, collection) => collection.FullPath == "/" ? Cloud.Instance.GetQuota().Result.Free : long.MaxValue,
+                Getter = (context, collection) => collection.FullPath == "/" ? Cloud.Instance.Account.GetDiskUsage().Result.Free.DefaultValue : long.MaxValue,
                 IsExpensive = true  //folder listing performance
             },
 
             new DavQuotaUsedBytes<MailruStoreCollection>
             {
-                Getter = (context, collection) => collection.FullPath == "/" ? Cloud.Instance.GetQuota().Result.Used : long.MaxValue,
+                Getter = (context, collection) => collection.FullPath == "/" ? Cloud.Instance.Account.GetDiskUsage().Result.Used.DefaultValue : long.MaxValue,
                 IsExpensive = true  //folder listing performance
             },
+104 −21		MailRuCloudApi/Account.cs
+35 −0		MailRuCloudApi/DiskUsage.cs
+7 −0		MailRuCloudApi/File.cs
+6 −1		MailRuCloudApi/FileSize.cs
+27 −12		MailRuCloudApi/JsonParser.cs
+57 −75		MailRuCloudApi/MailRuCloudApi.cs
+1 −1		MailRuCloudApi/MailRuCloudApi.csproj
+0 −11		MailRuCloudApi/Quota.cs
+6 −1		MailRuCloudApi/StorageUnit.cs
+2 −0		README.md
+32 −14		Tests/UnitTest1.cs