From 625c538f244519700f3942b2b2969845db9a99b0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Tue, 5 Jun 2018 20:22:46 -0400
Subject: move manifest parsing into toolkit (#532)

---
 src/SMAPI/Framework/Serialisation/JsonHelper.cs | 139 ------------------------
 1 file changed, 139 deletions(-)
 delete mode 100644 src/SMAPI/Framework/Serialisation/JsonHelper.cs

(limited to 'src/SMAPI/Framework/Serialisation/JsonHelper.cs')

diff --git a/src/SMAPI/Framework/Serialisation/JsonHelper.cs b/src/SMAPI/Framework/Serialisation/JsonHelper.cs
deleted file mode 100644
index 6cba343e..00000000
--- a/src/SMAPI/Framework/Serialisation/JsonHelper.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Xna.Framework.Input;
-using Newtonsoft.Json;
-using StardewModdingAPI.Framework.Serialisation.CrossplatformConverters;
-using StardewModdingAPI.Framework.Serialisation.SmapiConverters;
-
-namespace StardewModdingAPI.Framework.Serialisation
-{
-    /// <summary>Encapsulates SMAPI's JSON file parsing.</summary>
-    internal class JsonHelper
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The JSON settings to use when serialising and deserialising files.</summary>
-        private readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings
-        {
-            Formatting = Formatting.Indented,
-            ObjectCreationHandling = ObjectCreationHandling.Replace, // avoid issue where default ICollection<T> values are duplicated each time the config is loaded
-            Converters = new List<JsonConverter>
-            {
-                // SMAPI types
-                new SemanticVersionConverter(),
-
-                // enums
-                new StringEnumConverter<Buttons>(),
-                new StringEnumConverter<Keys>(),
-                new StringEnumConverter<SButton>(),
-
-                // crossplatform compatibility
-                new ColorConverter(),
-                new PointConverter(),
-                new RectangleConverter()
-            }
-        };
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Read a JSON file.</summary>
-        /// <typeparam name="TModel">The model type.</typeparam>
-        /// <param name="fullPath">The absolete file path.</param>
-        /// <returns>Returns the deserialised model, or <c>null</c> if the file doesn't exist or is empty.</returns>
-        /// <exception cref="InvalidOperationException">The given path is empty or invalid.</exception>
-        public TModel ReadJsonFile<TModel>(string fullPath)
-            where TModel : class
-        {
-            // validate
-            if (string.IsNullOrWhiteSpace(fullPath))
-                throw new ArgumentException("The file path is empty or invalid.", nameof(fullPath));
-
-            // read file
-            string json;
-            try
-            {
-                json = File.ReadAllText(fullPath);
-            }
-            catch (Exception ex) when (ex is DirectoryNotFoundException || ex is FileNotFoundException)
-            {
-                return null;
-            }
-
-            // deserialise model
-            try
-            {
-                return this.Deserialise<TModel>(json);
-            }
-            catch (Exception ex)
-            {
-                string error = $"Can't parse JSON file at {fullPath}.";
-
-                if (ex is JsonReaderException)
-                {
-                    error += " This doesn't seem to be valid JSON.";
-                    if (json.Contains("“") || json.Contains("”"))
-                        error += " Found curly quotes in the text; note that only straight quotes are allowed in JSON.";
-                }
-                error += $"\nTechnical details: {ex.Message}";
-                throw new JsonReaderException(error);
-            }
-        }
-
-        /// <summary>Save to a JSON file.</summary>
-        /// <typeparam name="TModel">The model type.</typeparam>
-        /// <param name="fullPath">The absolete file path.</param>
-        /// <param name="model">The model to save.</param>
-        /// <exception cref="InvalidOperationException">The given path is empty or invalid.</exception>
-        public void WriteJsonFile<TModel>(string fullPath, TModel model)
-            where TModel : class
-        {
-            // validate
-            if (string.IsNullOrWhiteSpace(fullPath))
-                throw new ArgumentException("The file path is empty or invalid.", nameof(fullPath));
-
-            // create directory if needed
-            string dir = Path.GetDirectoryName(fullPath);
-            if (dir == null)
-                throw new ArgumentException("The file path is invalid.", nameof(fullPath));
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            // write file
-            string json = JsonConvert.SerializeObject(model, this.JsonSettings);
-            File.WriteAllText(fullPath, json);
-        }
-
-
-        /*********
-        ** Private methods
-        *********/
-        /// <summary>Deserialize JSON text if possible.</summary>
-        /// <typeparam name="TModel">The model type.</typeparam>
-        /// <param name="json">The raw JSON text.</param>
-        private TModel Deserialise<TModel>(string json)
-        {
-            try
-            {
-                return JsonConvert.DeserializeObject<TModel>(json, this.JsonSettings);
-            }
-            catch (JsonReaderException)
-            {
-                // try replacing curly quotes
-                if (json.Contains("“") || json.Contains("”"))
-                {
-                    try
-                    {
-                        return JsonConvert.DeserializeObject<TModel>(json.Replace('“', '"').Replace('”', '"'), this.JsonSettings);
-                    }
-                    catch { /* rethrow original error */ }
-                }
-
-                throw;
-            }
-        }
-    }
-}
-- 
cgit