fix: tar node with raw and cms files

richardschneider · Jun 1, 2019 · f3c5591 · f3c5591
1 parent aca8cc9
commit f3c5591
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/src/CoreApi/FileSystemApi.cs b/src/CoreApi/FileSystemApi.cs
@@ -273,9 +273,14 @@ async Task<FileSystemNode> CreateDirectoryAsync (IEnumerable<IFileSystemLink> li
         async Task AddTarNodeAsync(Cid cid, string name, TarOutputStream tar, CancellationToken cancel)
         {
             var block = await ipfs.Block.GetAsync(cid, cancel).ConfigureAwait(false);
-            var dag = new DagNode(block.DataStream);
-            var dm = Serializer.Deserialize<DataMessage>(dag.DataStream);
+            var dm = new DataMessage { Type = DataType.Raw };
+            DagNode dag = null;
 
+            if (cid.ContentType == "dag-pb")
+            {
+                dag = new DagNode(block.DataStream);
+                dm = Serializer.Deserialize<DataMessage>(dag.DataStream);
+            }
             var entry = new TarEntry(new TarHeader());
             var header = entry.TarHeader;
             header.Mode = 0x1ff; // 777 in octal
@@ -307,7 +312,7 @@ async Task AddTarNodeAsync(Cid cid, string name, TarOutputStream tar, Cancellati
                 tar.CloseEntry();
             }
 
-            // TODO: recurse over files and subdirectories
+            // Recurse over files and subdirectories
             if (dm.Type == DataType.Directory)
             {
                 foreach (var link in dag.Links)

diff --git a/test/CoreApi/FileSystemApiTest.cs b/test/CoreApi/FileSystemApiTest.cs
@@ -771,6 +771,43 @@ public async Task GetTar()
             }
         }
 
+        [TestMethod]
+        public async Task GetTar_RawLeaves()
+        {
+            var ipfs = TestFixture.Ipfs;
+            var temp = MakeTemp();
+            try
+            {
+                var options = new AddFileOptions
+                {
+                    RawLeaves = true
+                };
+                var dir = ipfs.FileSystem.AddDirectoryAsync(temp, true, options).Result;
+                var dirid = dir.Id.Encode();
+
+                var tar = await ipfs.FileSystem.GetAsync(dir.Id);
+                var archive = TarArchive.CreateInputTarArchive(tar);
+                var files = new List<string>();
+                archive.ProgressMessageEvent += (a, e, m) =>
+                {
+                    files.Add(e.Name);
+                };
+                archive.ListContents();
+
+                Assert.AreEqual($"{dirid}", files[0]);
+                Assert.AreEqual($"{dirid}/alpha.txt", files[1]);
+                Assert.AreEqual($"{dirid}/beta.txt", files[2]);
+                Assert.AreEqual($"{dirid}/x", files[3]);
+                Assert.AreEqual($"{dirid}/x/x.txt", files[4]);
+                Assert.AreEqual($"{dirid}/x/y", files[5]);
+                Assert.AreEqual($"{dirid}/x/y/y.txt", files[6]);
+            }
+            finally
+            {
+                Directory.Delete(temp, true);
+            }
+        }
+
         [TestMethod]
         public async Task GetTar_EmptyDirectory()
         {