fix: go-ipfs 0.4.14 adding multiple files

Author: richardschneider

src/CoreApi/FileSystemApi.cs

@@ -91,9 +91,9 @@ internal FileSystemApi(IpfsClient ipfs)
         {
             if (options == null)
                 options = new AddFileOptions();
-            options.Wrap = false;
-
-            // Add the files and sub-directories.
+            options.Wrap = false;
+
+            // Add the files and sub-directories.
             path = Path.GetFullPath(path);
             var files = Directory
                 .EnumerateFiles(path)
@@ -104,11 +104,22 @@ internal FileSystemApi(IpfsClient ipfs)
                     .EnumerateDirectories(path)
                     .Select(dir => AddDirectoryAsync(dir, recursive, options, cancel));
                 files = files.Union(folders);
+            }
+
+            // go-ipfs v0.4.14 sometimes fails when sending lots of 'add file'
+            // requests.  It's happy with adding one file at a time.
+#if true
+            var links = new List<IFileSystemLink>();
+            foreach (var file in files)
+            {
+                var node = await file;
+                links.Add(node.ToLink());
             }
-            var nodes = await Task.WhenAll(files);
-
-            // Create the directory with links to the created files and sub-directories
+#else
+            var nodes = await Task.WhenAll(files);
             var links = nodes.Select(node => node.ToLink());
+#endif
+            // Create the directory with links to the created files and sub-directories
             var folder = emptyFolder.Value.AddLinks(links);
             var directory = await ipfs.Object.PutAsync(folder, cancel);
 

test/CoreApi/FileSystemApiTest.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Ipfs.Api
@@ -184,7 +185,7 @@ public void AddDirectory()
             }
             finally
             {
-                Directory.Delete(temp, true);
+                DeleteTemp(temp);
             }
         }
 
@@ -227,7 +228,24 @@ public void AddDirectoryRecursive()
             }
             finally
             {
-                Directory.Delete(temp, true);
+                DeleteTemp(temp);
+            }
+        }
+
+        void DeleteTemp(string temp)
+        {
+            while (true)
+            {
+                try
+                {
+                    Directory.Delete(temp, true);
+                    break;
+                }
+                catch (Exception)
+                {
+                    Thread.Sleep(1);
+                    continue;  // most likely anti-virus is reading a file
+                }
             }
         }