diff --git a/MareSynchronos/FileCache/TransientResourceManager.cs b/MareSynchronos/FileCache/TransientResourceManager.cs index 96dfde5..d02da42 100644 --- a/MareSynchronos/FileCache/TransientResourceManager.cs +++ b/MareSynchronos/FileCache/TransientResourceManager.cs @@ -16,7 +16,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase private readonly HashSet _cachedHandledPaths = new(StringComparer.Ordinal); private readonly TransientConfigService _configurationService; private readonly DalamudUtilService _dalamudUtil; - private readonly string[] _fileTypesToHandle = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk", "mdl", "mtrl", "tex"]; + private readonly string[] _fileTypesToHandle = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk"]; private readonly HashSet _playerRelatedPointers = []; private ConcurrentDictionary _cachedFrameAddresses = []; private ConcurrentDictionary>? _semiTransientResources = null; diff --git a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs index 57e6fe7..239d180 100644 --- a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs +++ b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs @@ -6,11 +6,16 @@ using Newtonsoft.Json; namespace MareSynchronos.MareConfiguration; -public class ConfigurationMigrator(ILogger logger, IDalamudPluginInterface pi) : IHostedService +public class ConfigurationMigrator(ILogger logger, TransientConfigService transientConfigService) : IHostedService { public void Migrate() { - // currently nothing to migrate + if (transientConfigService.Current.Version == 0) + { + transientConfigService.Current.TransientConfigs.Clear(); + transientConfigService.Current.Version = 1; + transientConfigService.Save(); + } } public Task StartAsync(CancellationToken cancellationToken) @@ -23,11 +28,4 @@ public class ConfigurationMigrator(ILogger logger, IDalam { return Task.CompletedTask; } - - private static void SaveConfig(IMareConfiguration config, string path) - { - File.WriteAllText(path, JsonConvert.SerializeObject(config, Formatting.Indented)); - } - - private string ConfigurationPath(string configName) => Path.Combine(pi.ConfigDirectory.FullName, configName); } diff --git a/MareSynchronos/MareConfiguration/Configurations/TransientConfig.cs b/MareSynchronos/MareConfiguration/Configurations/TransientConfig.cs index d04c54c..ca2e40b 100644 --- a/MareSynchronos/MareConfiguration/Configurations/TransientConfig.cs +++ b/MareSynchronos/MareConfiguration/Configurations/TransientConfig.cs @@ -3,7 +3,7 @@ public class TransientConfig : IMareConfiguration { public Dictionary TransientConfigs { get; set; } = []; - public int Version { get; set; } = 0; + public int Version { get; set; } = 1; public class TransientPlayerConfig { diff --git a/MareSynchronos/Plugin.cs b/MareSynchronos/Plugin.cs index da19603..782b6b2 100644 --- a/MareSynchronos/Plugin.cs +++ b/MareSynchronos/Plugin.cs @@ -182,7 +182,7 @@ public sealed class Plugin : IDalamudPlugin collection.AddSingleton>(s => s.GetRequiredService()); collection.AddSingleton>(s => s.GetRequiredService()); collection.AddSingleton>(s => s.GetRequiredService()); - collection.AddSingleton((s) => new ConfigurationMigrator(s.GetRequiredService>(), pluginInterface)); + collection.AddSingleton(); collection.AddSingleton(); collection.AddSingleton();