fix(FileSystemNode): can now be serialized

Author: richardschneider

src/FileSystemNode.cs

@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Ipfs.Api
 {
     /// <inheritdoc />
+    [DataContract]
     public class FileSystemNode : IFileSystemNode
     {
         IpfsClient ipfsClient;
@@ -20,11 +22,16 @@ public byte[] DataBytes
         {
             get
             {
-                using (var stream = DataStream)
-                using (var data = new MemoryStream())
-                {
-                    stream.CopyTo(data);
-                    return data.ToArray();
+                using (var stream = DataStream)
+                {
+                    if (DataStream == null)
+                        return null;
+
+                    using (var data = new MemoryStream())
+                    {
+                        stream.CopyTo(data);
+                        return data.ToArray();
+                    }
                 }
             }
         }
@@ -34,14 +41,16 @@ public Stream DataStream
         {
             get
             {
-                return IpfsClient.FileSystem.ReadFileAsync(Id).Result;
+                return IpfsClient?.FileSystem.ReadFileAsync(Id).Result;
             }
         }
 
         /// <inheritdoc />
+        [DataMember]
         public Cid Id { get; set; }
 
         /// <inheritdoc />
+        [DataMember]
         public IEnumerable<IFileSystemLink> Links {
             get
             {
@@ -61,6 +70,7 @@ public IEnumerable<IFileSystemLink> Links {
         ///   This is the size of the file not the raw encoded contents
         ///   of the block.
         /// </value>
+        [DataMember]
         public long Size
         {
             get
@@ -81,6 +91,7 @@ public long Size
         ///   <b>true</b> if the link is a directory; Otherwise <b>false</b>,
         ///   the link is some type of a file.
         /// </value>
+        [DataMember]
         public bool IsDirectory
         {
             get
@@ -97,6 +108,7 @@ public bool IsDirectory
         /// <summary>
         ///   The file name of the IPFS node.
         /// </summary>
+        [DataMember]
         public string Name { get; set; }
 
         /// <inheritdoc />

src/IpfsApi.csproj

@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ipfs.Core" Version="0.30.0" />
+    <PackageReference Include="Ipfs.Core" Version="0.33.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
 	  <PackageReference Include="System.Net.Http" Version="4.3.3" Condition="'$(TargetFramework)' == 'netstandard14'" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" Condition="'$(TargetFramework)' == 'net45'" />

test/FileSystemNodeTest.cs

@@ -0,0 +1,31 @@
+using Ipfs.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
+using System.IO;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace Ipfs.Api
+{
+    
+    [TestClass]
+    public class FileSystemNodeTest
+    {
+        [TestMethod]
+        public async Task Serialization()
+        {
+            var ipfs = TestFixture.Ipfs;
+            var a = await ipfs.FileSystem.AddTextAsync("hello world");
+            Assert.AreEqual("Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD", (string)a.Id);
+
+            var b = await ipfs.FileSystem.ListFileAsync(a.Id);
+            var json = JsonConvert.SerializeObject(b);
+            var c = JsonConvert.DeserializeObject<FileSystemNode>(json);
+            Assert.AreEqual(b.Id, c.Id);
+            Assert.AreEqual(b.IsDirectory, c.IsDirectory);
+            Assert.AreEqual(b.Size, c.Size);
+            CollectionAssert.AreEqual(b.Links.ToArray(), c.Links.ToArray());
+        }
+    }
+}