ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 05:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: also use reliable storage for plugin configs

Browse source
This commit is contained in:
goat 2023-09-27 22:33:58 +02:00
parent 125034155b
commit 1d8b579b04
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
5 changed files with 94 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Configuration/Internal/DalamudConfiguration.cs
View file

@ -436,6 +436,10 @@ internal sealed class DalamudConfiguration : IServiceType, IDisposable
{
deserialized =
JsonConvert.DeserializeObject<DalamudConfiguration>(text, SerializerSettings);
// If this reads as null, the file was empty, that's no good
if (deserialized == null)
throw new Exception("Read config was null.");
});
}
catch (FileNotFoundException)

26
Dalamud/Configuration/PluginConfigurations.cs
View file

@ -1,6 +1,6 @@
using System.IO;
using Dalamud.Utility;
using Dalamud.Storage;
using Newtonsoft.Json;
namespace Dalamud.Configuration;
@ -33,22 +33,36 @@ public sealed class PluginConfigurations
/// <param name="pluginName">Plugin name.</param>
public void Save(IPluginConfiguration config, string pluginName)
{
Util.WriteAllTextSafe(this.GetConfigFile(pluginName).FullName, SerializeConfig(config));
Service<ReliableFileStorage>.Get()
.WriteAllText(this.GetConfigFile(pluginName).FullName, SerializeConfig(config));
}
/// <summary>
/// Load plugin configuration.
/// </summary>
/// <param name="pluginName">Plugin name.</param>
/// <param name="workingPluginId">WorkingPluginID of the plugin.</param>
/// <returns>Plugin configuration.</returns>
public IPluginConfiguration? Load(string pluginName)
public IPluginConfiguration? Load(string pluginName, Guid workingPluginId)
{
var path = this.GetConfigFile(pluginName);
if (!path.Exists)
return null;
IPluginConfiguration? config = null;
try
{
Service<ReliableFileStorage>.Get().ReadAllText(path.FullName, text =>
{
config = DeserializeConfig(text);
if (config == null)
throw new Exception("Read config was null.");
}, workingPluginId);
}
catch (FileNotFoundException)
{
// ignored
}
return DeserializeConfig(File.ReadAllText(path.FullName));
return config;
}
/// <summary>