Handle null fileattributes (#193)

* Return an empty collection if SerializedFileAttributes is null
* Fix related UT because of the addition of SampleZipFile

Author: gpailler

MegaApiClient.Tests/Context/AuthenticatedTestContext.cs

@@ -47,6 +47,7 @@ protected override IEnumerable<string> GetProtectedNodes()
         Inputs.SharedSubFolder.Id,
         Inputs.SharedFile.Id,
         Inputs.SharedFileUpSideDown.Id,
+        Inputs.SampleZipFile.Id,
         Inputs.SharedRemoteFolder.Id,
         Inputs.SharedRemoteSubFolder.Id,
         Inputs.SharedRemoteSubSubFolder.Id,
@@ -57,7 +58,7 @@ protected override IEnumerable<string> GetProtectedNodes()
 
     protected override IEnumerable<string> GetPermanentNodes()
     {
-      return new string[] { Inputs.SharedFolder.Id };
+      return new string[] { Inputs.SharedFolder.Id, Inputs.SampleZipFile.Id };
     }
   }
 }

MegaApiClient.Tests/Data/inputs.json

@@ -11,17 +11,19 @@
     "|       |-SharedFile.jpg",
     "|       +-SharedSubFolder                   (Outgoing Share)",
     "|           |-SharedFileUpSideDown.jpg",
-    ",+-Trash",
-    ",+-Inbox",
-    ",+-Contacts",
-    ",  +-SharedRemoteFolder                     (Incoming Share)",
-    ",    |-SharedRemoteFile.jpg",
-    ",    +-SharedRemoteSubFolder                (Incoming Share / Subfolder of SharedRemoteFolder)",
-    ",      |-SharedRemoteSubFile.jpg",
-    ",      +-SharedRemoteSubSubFolder"
+    "+-SampleFile.zip",
+    "+-Trash",
+    "+-Inbox",
+    "+-Contacts",
+    "  +-SharedRemoteFolder                     (Incoming Share)",
+    "    |-SharedRemoteFile.jpg",
+    "    +-SharedRemoteSubFolder                (Incoming Share / Subfolder of SharedRemoteFolder)",
+    "      |-SharedRemoteSubFile.jpg",
+    "      +-SharedRemoteSubSubFolder"
   ],
 
   "FileLink": "https://mega.nz/file/W0UAgJaK#XOYyTETrIy8daz3_dw3fdh6Hh8EFEdrnbyoop1r9R6g",
+  "ZipFileLink": "https://mega.nz/file/WkNUzRzK#4aKRNvHSlkPPW3zHMYuRQANh1CNueAd6dmw5rOlwurY",
   "FolderLink": "https://mega.nz/folder/e4diDZ7T#iJnegBO_m6OXBQp27lHCrg",
 
   "Root": {
@@ -73,6 +75,14 @@
     "Fingerprint": "hDL3WKxHmI6lMM92r43BWQTMmE1h"
   },
 
+  "SampleZipFile": {
+    "Id": "e5U0XbgQ",
+    "Size": 513604,
+    "CreationDate": "2021-11-22T08:12:43.0000000+08:00",
+    "ModificationDate": "2021-11-22T08:09:59.0000000+08:00",
+    "Fingerprint": "sKBj43s_QyradRQ1YlmxhATX35ph"
+  },
+
   "SharedRemoteFolder": {
     "ParentId": "zoUwhLYR",
     "Id": "20d2XLIS",

MegaApiClient.Tests/Login.cs

@@ -261,7 +261,7 @@ public void GetAccountInformation_AuthenticatedUser_Succeeds(string email, strin
 
       Assert.NotNull(accountInformation);
       Assert.Equal(AuthenticatedTestContext.Inputs.TotalQuota, accountInformation.TotalQuota);
-      Assert.Equal(AuthenticatedTestContext.Inputs.SharedFile.Size + AuthenticatedTestContext.Inputs.SharedFileUpSideDown.Size, accountInformation.UsedQuota);
+      Assert.Equal(AuthenticatedTestContext.Inputs.SharedFile.Size + AuthenticatedTestContext.Inputs.SharedFileUpSideDown.Size + AuthenticatedTestContext.Inputs.SampleZipFile.Size, accountInformation.UsedQuota);
     }
 
     [Theory, MemberData(nameof(GetCredentials), false)]

MegaApiClient.Tests/NodeOperations.cs

@@ -289,7 +289,7 @@ public void Rename_Succeeds(NodeType nodeType)
 
     [Theory]
     [JsonInputsDataAttribute("FileLink")]
-    public void GetNodeFromLink_Browse_Succeeds(string fileLink)
+    public void GetNodeFromLink_WithFileAttributes_Succeeds(string fileLink)
     {
       var node = Context.Client.GetNodeFromLink(new Uri(fileLink));
 
@@ -302,6 +302,21 @@ public void GetNodeFromLink_Browse_Succeeds(string fileLink)
       Assert.Equal(2, node.FileAttributes.Length);
     }
 
+    [Theory]
+    [JsonInputsDataAttribute("ZipFileLink")]
+    public void GetNodeFromLink_WithoutFileAttributes_Succeeds(string fileLink)
+    {
+      var node = Context.Client.GetNodeFromLink(new Uri(fileLink));
+
+      Assert.NotNull(node);
+      Assert.Equal("SampleFile.zip", node.Name);
+      Assert.Equal(AuthenticatedTestContext.Inputs.SampleZipFile.Size, node.Size);
+      Assert.Equal(AuthenticatedTestContext.Inputs.SampleZipFile.ModificationDate, node.ModificationDate);
+      Assert.Null(node.CreationDate);
+      Assert.Equal(AuthenticatedTestContext.Inputs.SampleZipFile.Fingerprint, node.Fingerprint);
+      Assert.Empty(node.FileAttributes);
+    }
+
     [Theory]
     [JsonInputsDataAttribute(new object[] { null }, new string[] { "FolderLink" })]
     [JsonInputsDataAttribute(new object[] { "/file/SELECTED_FILE_NODE_ID" }, new string[] { "FolderLink" })]
@@ -330,7 +345,7 @@ public void GetNodesFromLink_Succeeds(string suffix, string folderLink)
       Assert.Equal(AuthenticatedTestContext.Inputs.SharedFolder.CreationDate, node.CreationDate);
       Assert.Null(node.ModificationDate);
       Assert.Null(node.Fingerprint);
-      Assert.Null(node.FileAttributes);
+      Assert.Empty(node.FileAttributes);
 
       node = Assert.Single(nodes, x => x.Name == "SharedSubFolder");
       Assert.Equal(NodeType.Directory, node.Type);
@@ -340,7 +355,7 @@ public void GetNodesFromLink_Succeeds(string suffix, string folderLink)
       Assert.Equal(AuthenticatedTestContext.Inputs.SharedSubFolder.CreationDate, node.CreationDate);
       Assert.Null(node.ModificationDate);
       Assert.Null(node.Fingerprint);
-      Assert.Null(node.FileAttributes);
+      Assert.Empty(node.FileAttributes);
 
       node = Assert.Single(nodes, x => x.Name == "SharedFileUpSideDown.jpg");
       Assert.Equal(NodeType.File, node.Type);

MegaApiClient.Tests/NodeOperationsAuthenticated.cs

@@ -50,13 +50,13 @@ string expectedFingerprint
     }
 
     [Theory]
-    [JsonInputsData(new object[] { NodeType.Root }, new string[] { "SharedFile.Size", "SharedFileUpSideDown.Size" })]
-    [InlineData(NodeType.Inbox, 0, 0)]
-    [InlineData(NodeType.Trash, 0, 0)]
-    public void GetFoldersize_FromNodeType_Succeeds(NodeType nodeType, long sharedFileSize, long sharedFileUpSideDownSize)
+    [JsonInputsData(new object[] { NodeType.Root }, new string[] { "SharedFile.Size", "SharedFileUpSideDown.Size", "SampleZipFile.Size" })]
+    [InlineData(NodeType.Inbox, 0, 0, 0)]
+    [InlineData(NodeType.Trash, 0, 0, 0)]
+    public void GetFoldersize_FromNodeType_Succeeds(NodeType nodeType, long sharedFileSize, long sharedFileUpSideDownSize, long sampleZipFile)
     {
       var node = GetNode(nodeType);
-      var expectedSize = sharedFileSize + sharedFileUpSideDownSize;
+      var expectedSize = sharedFileSize + sharedFileUpSideDownSize + sampleZipFile;
       Assert.Equal(expectedSize, node.GetFolderSize(Context.Client));
       Assert.Equal(expectedSize, node.GetFolderSizeAsync(Context.Client).Result);
       Assert.Equal(expectedSize, node.GetFolderSize(Context.Client.GetNodes()));

MegaApiClient/Node.cs

@@ -30,11 +30,7 @@ internal Node(string id, DownloadUrlResponse downloadResponse, byte[] key)
       Attributes = Crypto.DecryptAttributes(downloadResponse.SerializedAttributes.FromBase64(), key);
       Size = downloadResponse.Size;
       Type = NodeType.File;
-
-      if (downloadResponse.SerializedAttributes != null)
-      {
-        FileAttributes = DeserializeFileAttributes(downloadResponse.SerializedFileAttributes);
-      }
+      FileAttributes = DeserializeFileAttributes(downloadResponse.SerializedFileAttributes);
     }
 
     #region Public properties
@@ -185,11 +181,7 @@ public void OnDeserialized(StreamingContext ctx)
         }
 
         Attributes = Crypto.DecryptAttributes(SerializedAttributes.FromBase64(), Key);
-
-        if (SerializedFileAttributes != null)
-        {
-          FileAttributes = DeserializeFileAttributes(SerializedFileAttributes);
-        }
+        FileAttributes = DeserializeFileAttributes(SerializedFileAttributes);
       }
     }
 
@@ -216,6 +208,11 @@ public override bool Equals(object obj)
 
     private static IFileAttribute[] DeserializeFileAttributes(string serializedFileAttributes)
     {
+      if (serializedFileAttributes == null)
+      {
+        return new IFileAttribute[0];
+      }
+
       var attributes = serializedFileAttributes.Split('/');
 
       return attributes