Merge pull request #846 from PlayEveryWare/fix/file-transfer-data

Better data handling in file transfers

Author: paulhazen

Assets/Scripts/EOSPlayerDataStorageManager.cs

@@ -188,16 +188,16 @@ public bool StartFileDataUpload(string fileName, Action fileCreatedCallback = nu
             CancelCurrentTransfer();
             CurrentTransferHandle = req;
 
-            EOSTransferInProgress newTransfer = new EOSTransferInProgress();
-            newTransfer.Download = false;
-
-            newTransfer.TotalSize = (uint)fileData.Length;
-            if (newTransfer.TotalSize > 0)
+            EOSTransferInProgress newTransfer = new()
             {
-                byte[] utf8ByteArray = System.Text.Encoding.UTF8.GetBytes(fileData);
+                Download = false
+            };
 
-                newTransfer.Data = utf8ByteArray;
+            if (null != fileData)
+            {
+                newTransfer.Data = System.Text.Encoding.UTF8.GetBytes(fileData);
             }
+
             newTransfer.CurrentIndex = 0;
 
             TransfersInProgress[fileName] = newTransfer;
@@ -376,14 +376,9 @@ private ReadResult ReceiveData(string fileName, ArraySegment<byte> data, uint to
                 }
 
                 // First update
-                if (transfer.CurrentIndex == 0 && transfer.TotalSize == 0)
+                if (transfer.CurrentIndex == 0)
                 {
-                    transfer.TotalSize = totalSize;
-
-                    if (transfer.TotalSize == 0)
-                    {
-                        return ReadResult.ContinueReading;
-                    }
+                    transfer.Data = new byte[totalSize];
                 }
 
                 // If more data has been received than was anticipated, fail the request

Assets/Scripts/EOSTitleStorageManager.cs

@@ -370,14 +370,9 @@ private ReadResult ReceiveData(string fileName, ArraySegment<byte> data, uint to
                 }
 
                 // First update
-                if (transfer.CurrentIndex == 0 && transfer.TotalSize == 0)
+                if (transfer.CurrentIndex == 0)
                 {
-                    transfer.TotalSize = totalSize;
-
-                    if (transfer.TotalSize == 0)
-                    {
-                        return ReadResult.RrContinuereading;
-                    }
+                    transfer.Data = new byte[totalSize];
                 }
 
                 // Make sure we have enough space

Assets/Scripts/EOSTransferInProgress.cs

@@ -26,6 +26,8 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Samples
 {
+    using Editor.Utility;
+
     /// <summary>
     /// Class <c>EOSTransferInProgress</c> is used in <c>EOSTitleStorageManager</c> and <c>EOSPlayerDataStorageManager</c> to keep track of downloaded cached file data.
     /// </summary>
@@ -37,24 +39,40 @@ public class EOSTransferInProgress
 
         public bool Download = true;
         public uint CurrentIndex = 0;
-        public byte[] Data;
-        private uint transferSize = 0;
+        private byte[] _data;
 
-        public uint TotalSize
+        public byte[] Data
         {
             get
             {
-                return transferSize;
+                return _data;
             }
             set
             {
-                transferSize = value;
-
-                if (transferSize > FileMaxSizeBytes)
+                // If the file sizer is larger than the maximum allowable size,
+                // then log an error, but do not throw an exception, since
+                // throwing an exception from a property setter is a little
+                // confusing, and there will be an opportunity to catch the 
+                // mistake when EOS returns an error code.
+                if (null != value && value.Length > FileMaxSizeBytes)
                 {
-                    Debug.LogError("[EOS SDK] Player data storage: data transfer size exceeds max file size.");
-                    transferSize = FileMaxSizeBytes;
+                    Debug.LogError($"Maximum file size is 200MB.");
                 }
+
+                _data = value;
+            }
+        }
+
+        public uint TotalSize
+        {
+            get
+            {
+                if (null == _data)
+                    return 0;
+
+                _ = SafeTranslatorUtility.TryConvert(_data.Length, out uint totalSize);
+
+                return totalSize;
             }
         }