Merge branch 'develop'

yar229 · Mar 2, 2017 · fc3c621 · fc3c621
2 parents dd3aeeb + 62960cc
commit fc3c621
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,7 +49,6 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
 *.scc
 
 # Visual C++ cache files
@@ -160,3 +159,4 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+/_gsdata_/
diff --git a/MailRuNetCloudClient b/MailRuNetCloudClient
diff --git a/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs b/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs
@@ -344,20 +344,17 @@ public async Task<StoreItemResult> MoveItemAsync(string sourceName, IStoreCollec
                     }
                     else
                     {
-                        await Cloud.Instance(httpContext).Rename(item, destinationName);
-                        string path = WebDavPath.Combine(WebDavPath.Parent(item.GetFullPath()), destinationName);
                         var fi = ((MailruStoreItem)item).FileInfo;
 
+                        string tmpName = Guid.NewGuid().ToString();
+                        await Cloud.Instance(httpContext).Rename(item, tmpName);
+                        fi.SetName(tmpName);
 
-
-                        fi.FullPath = path;
-                        if (fi.Files.Count > 1)
-                            foreach (var fiFile in fi.Files)
-                            {
-                                fiFile.FullPath = WebDavPath.Combine(fiFile.Path, fi.Name + ".wdmrc" + fiFile.Extension); //TODO: refact
-                            }
-                        //await Cloud.Instance(httpContext).MoveOrCopy(path, destinationStoreCollection.FullPath, true);
                         await Cloud.Instance(httpContext).Move(fi, destinationStoreCollection.FullPath);
+
+                        fi.SetPath(destinationStoreCollection.FullPath);
+
+                        await Cloud.Instance(httpContext).Rename(fi, destinationName);
                     }
                 }