Merge branch 'develop' into stable

1 files changed, 34 insertions, 5 deletions

diff --git a/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs b/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs
index 30676c88..bbbcf2a9 100644
--- a/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs
+++ b/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs
@@ -1,23 +1,52 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Web.Framework.Storage
 {
     /// <summary>The response for a get-file request.</summary>
     internal class StoredFileInfo
     {
+        /*********
+        ** Accessors
+        *********/
         /// <summary>Whether the file was successfully fetched.</summary>
-        public bool Success { get; set; }
+        [MemberNotNullWhen(true, nameof(StoredFileInfo.Content))]
+        public bool Success => this.Content != null && this.Error == null;
 
         /// <summary>The fetched file content (if <see cref="Success"/> is <c>true</c>).</summary>
-        public string Content { get; set; }
+        public string? Content { get; }
 
         /// <summary>When the file will no longer be available.</summary>
-        public DateTime? Expiry { get; set; }
+        public DateTimeOffset? Expiry { get; }
 
         /// <summary>The error message if saving succeeded, but a non-blocking issue was encountered.</summary>
-        public string Warning { get; set; }
+        public string? Warning { get; }
 
         /// <summary>The error message if saving failed.</summary>
-        public string Error { get; set; }
+        public string? Error { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="content">The fetched file content (if <see cref="Success"/> is <c>true</c>).</param>
+        /// <param name="expiry">When the file will no longer be available.</param>
+        /// <param name="warning">The error message if saving succeeded, but a non-blocking issue was encountered.</param>
+        /// <param name="error">The error message if saving failed.</param>
+        public StoredFileInfo(string? content, DateTimeOffset? expiry, string? warning = null, string? error = null)
+        {
+            this.Content = content;
+            this.Expiry = expiry;
+            this.Warning = warning;
+            this.Error = error;
+        }
+
+        /// <summary>Construct an instance.</summary>
+        /// <param name="error">The error message if saving failed.</param>
+        public StoredFileInfo(string error)
+        {
+            this.Error = error;
+        }
     }
 }