Start of the new settings implementation

AlexanderDotH · Apr 24, 2023 · fb6a230 · fb6a230
1 parent d76ef5a
commit fb6a230
Show file tree

Hide file tree

Showing 12 changed files with 150 additions and 10 deletions.
diff --git a/OpenLyricsClient/Backend/Cache/CacheManager.cs b/OpenLyricsClient/Backend/Cache/CacheManager.cs
@@ -60,7 +60,7 @@ private void ReadCache()
                 string id = ifo.FileInfo.Name.Replace(CACHE_EXTENSION, string.Empty);
 
                 JsonCacheData jsonLyricData =
-                    new JsonDeserializer<JsonCacheData>().Deserialize(FileUtils.ReadFileString(ifo.FileInfo));
+                    new JsonDeserializer().Deserialize<JsonCacheData>(FileUtils.ReadFileString(ifo.FileInfo));
 
                 if (this._cache.Length + 1 > this._maxCapacity)
                     continue;
@@ -224,7 +224,7 @@ private CacheData TryGetDataFromDisk(SongRequestObject songRequestObject)
                     return null;
 
                 JsonCacheData jsonLyricData =
-                    new JsonDeserializer<JsonCacheData>().Deserialize(data);
+                    new JsonDeserializer().Deserialize<JsonCacheData>(data);
 
                 GCHandle.Alloc(data).Free();
 

diff --git a/OpenLyricsClient/Backend/Collector/Lyrics/Providers/NetEase/NetEaseCollector.cs b/OpenLyricsClient/Backend/Collector/Lyrics/Providers/NetEase/NetEaseCollector.cs
@@ -193,7 +193,7 @@ private async Task<NetEaseLyricResponse> GetLyricsFromEndpoint(int songId)
 
             if (responseData.StatusCode == HttpStatusCode.OK)
             {
-                return new JsonDeserializer<NetEaseLyricResponse>().Deserialize(responseData.GetContentAsString());
+                return new JsonDeserializer().Deserialize<NetEaseLyricResponse>(responseData.GetContentAsString());
             }
 
             return null;

diff --git a/OpenLyricsClient/Backend/Collector/Lyrics/Providers/NetEaseV2/NetEaseV2Collector.cs b/OpenLyricsClient/Backend/Collector/Lyrics/Providers/NetEaseV2/NetEaseV2Collector.cs
@@ -145,7 +145,7 @@ private async Task<NetEaseV2LyricResponse> GetLyricsFromEndpoint(int songId)
 
             if (responseData.StatusCode == HttpStatusCode.OK)
             {
-                return new JsonDeserializer<NetEaseV2LyricResponse>().Deserialize(responseData.GetContentAsString());
+                return new JsonDeserializer().Deserialize<NetEaseV2LyricResponse>(responseData.GetContentAsString());
             }
 
             return null;

diff --git a/OpenLyricsClient/Backend/Collector/Lyrics/Providers/Textyl/TextylCollector.cs b/OpenLyricsClient/Backend/Collector/Lyrics/Providers/Textyl/TextylCollector.cs
@@ -71,7 +71,7 @@ public async Task<TextylLyricReponse[]> FetchLyrics(SongRequestObject songReques
                     return null;
 
                 TextylLyricReponse[] reponse =
-                    new JsonDeserializer<TextylLyricReponse[]>().Deserialize(content);
+                    new JsonDeserializer().Deserialize<TextylLyricReponse[]>(content);
 
                 if (reponse != null)
                     return reponse;

diff --git a/OpenLyricsClient/Backend/Collector/Song/Providers/NetEase/NetEaseCollector.cs b/OpenLyricsClient/Backend/Collector/Song/Providers/NetEase/NetEaseCollector.cs
@@ -172,7 +172,7 @@ private async Task<NetEaseSearchResponse> SearchTrack(SongRequestObject songRequ
 
             if (responseData.StatusCode == HttpStatusCode.OK)
             {
-                return new JsonDeserializer<NetEaseSearchResponse>().Deserialize(responseData.GetContentAsString());
+                return new JsonDeserializer().Deserialize<NetEaseSearchResponse>(responseData.GetContentAsString());
             }
 
             return null;

diff --git a/OpenLyricsClient/Backend/Collector/Song/Providers/NetEaseV2/NetEaseV2Collector.cs b/OpenLyricsClient/Backend/Collector/Song/Providers/NetEaseV2/NetEaseV2Collector.cs
@@ -129,7 +129,7 @@ private async Task<NetEaseV2SearchResponse> SearchTrack(SongRequestObject songRe
 
             if (responseData.StatusCode == HttpStatusCode.OK)
             { 
-                return new JsonDeserializer<NetEaseV2SearchResponse>().Deserialize(responseData.GetContentAsString());
+                return new JsonDeserializer().Deserialize<NetEaseV2SearchResponse>(responseData.GetContentAsString());
             }
 
             return null;

diff --git a/OpenLyricsClient/Backend/Core.cs b/OpenLyricsClient/Backend/Core.cs
@@ -14,6 +14,7 @@
 using OpenLyricsClient.Backend.Handler.Song;
 using OpenLyricsClient.Backend.Helper;
 using OpenLyricsClient.Backend.Settings;
+using OpenLyricsClient.Backend.Settings.Sections.Lyrics;
 using OpenLyricsClient.Backend.Structure.Enum;
 using TaskRegister = OpenLyricsClient.Backend.Overwrite.TaskRegister;
 
@@ -33,6 +34,7 @@ class Core
         private Debugger<Core> _debugger;
 
         private SettingManager _settingManager;
+        private SettingsHandler _settingsHandler;
 
         private ServiceHandler _serviceHandler;
         private SongHandler _songHandler;
@@ -83,7 +85,11 @@ public Core()
 
             this._settingManager = new SettingManager(System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + 
                                                       string.Format("{0}OpenLyricsClient{0}", System.IO.Path.DirectorySeparatorChar));
-
+
+            this._settingsHandler = new SettingsHandler(
+                System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) +
+                string.Format("{0}OpenLyricsClient{0}", System.IO.Path.DirectorySeparatorChar));
+
             this._cacheManager = new CacheManager(10, TimeSpan.FromMinutes(5).Milliseconds);
 
             this._tokenCollector = new TokenCollector();

diff --git a/OpenLyricsClient/Backend/Settings/ISettingSection.cs b/OpenLyricsClient/Backend/Settings/ISettingSection.cs
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace OpenLyricsClient.Backend.Settings;
+
+public interface ISettingSection
+{
+    Task WriteToDisk();
+    Task ReadFromDisk();
+    T GetValue<T>(string field);
+    Task SetValue<T>(string field, T value);
+    JObject Defaults();
+}
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Lyrics/LyricsSection.cs b/OpenLyricsClient/Backend/Settings/Sections/Lyrics/LyricsSection.cs
@@ -0,0 +1,70 @@
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using DevBase.Api.Serializer;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using OpenLyricsClient.Backend.Structure.Enum;
+using OpenLyricsClient.Backend.Utils;
+
+namespace OpenLyricsClient.Backend.Settings.Sections.Lyrics;
+
+public class LyricsSection : ISettingSection
+{
+    private FileInfo _file;
+    private JObject _data;
+
+    public LyricsSection(string filePath)
+    {
+        this._file = new FileInfo(filePath);
+    }
+
+    public async Task WriteToDisk()
+    {
+        await using FileStream stream = this._file.OpenWrite();
+        await using StreamWriter writer = new StreamWriter(stream);
+
+        await writer.WriteAsync(this._data?.ToString());
+    }
+
+    public async Task ReadFromDisk()
+    {
+        if (!this._file.Exists)
+        {
+            this._data = Defaults();
+            await WriteToDisk();
+            return;
+        }
+
+        await using FileStream stream = this._file.OpenRead();
+        using StreamReader reader = new StreamReader(stream);
+
+        this._data = JObject.Parse(reader.ReadToEnd());
+
+        await stream.FlushAsync();
+
+        stream.Close();
+        reader.Close();
+    }
+
+    public T GetValue<T>(string field)
+    {
+        return this._data[field].Value<T>();
+    }
+
+    public async Task SetValue<T>(string field, T value)
+    {
+        this._data[field] = JToken.FromObject(value);
+        await WriteToDisk();
+    }
+
+    public JObject Defaults()
+    {
+        Structure structure = new Structure
+        {
+            Selection = EnumLyricsDisplayMode.KARAOKE
+        };
+
+        return new JsonDeserializer().Serialize(structure);
+    }
+}
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Lyrics/Structure.cs b/OpenLyricsClient/Backend/Settings/Sections/Lyrics/Structure.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+using OpenLyricsClient.Backend.Structure.Enum;
+
+namespace OpenLyricsClient.Backend.Settings.Sections.Lyrics;
+
+public class Structure
+{
+    [JsonProperty("Selection")]
+    public EnumLyricsDisplayMode Selection { get; set; }
+}
diff --git a/OpenLyricsClient/Backend/Settings/SettingsHandler.cs b/OpenLyricsClient/Backend/Settings/SettingsHandler.cs
@@ -0,0 +1,32 @@
+using System.Threading.Tasks;
+using DevBase.Generics;
+using OpenLyricsClient.Backend.Settings.Sections;
+using OpenLyricsClient.Backend.Settings.Sections.Lyrics;
+using OpenLyricsClient.Backend.Structure.Enum;
+
+namespace OpenLyricsClient.Backend.Settings;
+
+public class SettingsHandler
+{
+    private AList<ISettingSection> _sections;
+
+    public SettingsHandler(string workingDirectory)
+    {
+        this._sections = new AList<ISettingSection>();
+
+        this._sections.Add(new LyricsSection(string.Format("{0}{1}", 
+            workingDirectory, "lyrics-preferences.json")));
+
+        Task.Factory.StartNew(Initialize).GetAwaiter().GetResult();
+    }
+
+    public async Task Initialize()
+    {
+        this._sections.ForEach(async t=> await t.ReadFromDisk());
+    }
+
+    public T? Settings<T>() where T : ISettingSection
+    {
+        return (T)this._sections.GetAsList().Find(s => s is T);
+    }
+}
diff --git a/OpenLyricsClient/Backend/Utils/JsonDeserializer.cs b/OpenLyricsClient/Backend/Utils/JsonDeserializer.cs
@@ -1,9 +1,10 @@
 using DevBase.Generics;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace OpenLyricsClient.Backend.Utils
 {
-    public class JsonDeserializer<T>
+    public class JsonDeserializer
     {
         private JsonSerializerSettings _serializerSettings;
         private AList<string> _errorList;
@@ -23,11 +24,19 @@ public JsonDeserializer()
             };
         }
 
-        public T Deserialize(string input)
+        public T Deserialize<T>(string input)
         {
             return JsonConvert.DeserializeObject<T>(input, this._serializerSettings);
         }
 
+        public JObject Serialize(object structure)
+        {
+            string serialized = JsonConvert.SerializeObject(structure, this._serializerSettings);
+            return JObject.Parse(serialized);
+        }
+
+        public JObject ToJObject<T>(T data) => JObject.FromObject(data);
+
         public AList<string> ErrorList
         {
             get => _errorList;