changed lightless references from you know what
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class CharaDataConfigService : ConfigurationServiceBase<CharaDataConfig>
|
||||
{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public static class ConfigurationExtensions
|
||||
{
|
||||
public static bool HasValidSetup(this MareConfig configuration)
|
||||
public static bool HasValidSetup(this LightlessConfig configuration)
|
||||
{
|
||||
return configuration.AcceptedAgreement && configuration.InitialScanComplete
|
||||
&& !string.IsNullOrEmpty(configuration.CacheFolder)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, TransientConfigService transientConfigService,
|
||||
ServerConfigService serverConfigService) : IHostedService
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System.Reflection;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class ConfigurationSaveService : IHostedService
|
||||
{
|
||||
@@ -15,7 +16,7 @@ public class ConfigurationSaveService : IHostedService
|
||||
public const string BackupFolder = "config_backup";
|
||||
private readonly MethodInfo _saveMethod;
|
||||
|
||||
public ConfigurationSaveService(ILogger<ConfigurationSaveService> logger, IEnumerable<IConfigService<IMareConfiguration>> configs)
|
||||
public ConfigurationSaveService(ILogger<ConfigurationSaveService> logger, IEnumerable<IConfigService<ILightlessConfiguration>> configs)
|
||||
{
|
||||
foreach (var config in configs)
|
||||
{
|
||||
@@ -68,7 +69,7 @@ public class ConfigurationSaveService : IHostedService
|
||||
}
|
||||
}
|
||||
|
||||
private async Task SaveConfig<T>(IConfigService<T> config) where T : IMareConfiguration
|
||||
private async Task SaveConfig<T>(IConfigService<T> config) where T : ILightlessConfiguration
|
||||
{
|
||||
_logger.LogTrace("Saving {configName}", config.ConfigurationName);
|
||||
var configDir = config.ConfigurationPath.Replace(config.ConfigurationName, string.Empty);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public abstract class ConfigurationServiceBase<T> : IConfigService<T> where T : IMareConfiguration
|
||||
public abstract class ConfigurationServiceBase<T> : IConfigService<T> where T : ILightlessConfiguration
|
||||
{
|
||||
private readonly CancellationTokenSource _periodicCheckCts = new();
|
||||
private DateTime _configLastWriteTime;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using LightlessSync.MareConfiguration.Models;
|
||||
using LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public class CharaDataConfig : IMareConfiguration
|
||||
public class CharaDataConfig : ILightlessConfiguration
|
||||
{
|
||||
public bool OpenMareHubOnGposeStart { get; set; } = false;
|
||||
public bool OpenLightlessHubOnGposeStart { get; set; } = false;
|
||||
public string LastSavedCharaDataLocation { get; set; } = string.Empty;
|
||||
public Dictionary<string, CharaDataFavorite> FavoriteCodes { get; set; } = [];
|
||||
public bool DownloadMcdDataOnConnection { get; set; } = true;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public interface IMareConfiguration
|
||||
public interface ILightlessConfiguration
|
||||
{
|
||||
int Version { get; set; }
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
using LightlessSync.MareConfiguration.Models;
|
||||
using LightlessSync.LightlessConfiguration.Models;
|
||||
using LightlessSync.UI;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
[Serializable]
|
||||
public class MareConfig : IMareConfiguration
|
||||
public class LightlessConfig : ILightlessConfiguration
|
||||
{
|
||||
public bool AcceptedAgreement { get; set; } = false;
|
||||
public string CacheFolder { get; set; } = string.Empty;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public class PlayerPerformanceConfig : IMareConfiguration
|
||||
public class PlayerPerformanceConfig : ILightlessConfiguration
|
||||
{
|
||||
public int Version { get; set; } = 1;
|
||||
public bool ShowPerformanceIndicator { get; set; } = true;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using LightlessSync.MareConfiguration.Models;
|
||||
using LightlessSync.LightlessConfiguration.Models;
|
||||
using LightlessSync.WebAPI;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
[Serializable]
|
||||
public class ServerConfig : IMareConfiguration
|
||||
public class ServerConfig : ILightlessConfiguration
|
||||
{
|
||||
public int CurrentServer { get; set; } = 0;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using LightlessSync.MareConfiguration.Models;
|
||||
using LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public class ServerTagConfig : IMareConfiguration
|
||||
public class ServerTagConfig : ILightlessConfiguration
|
||||
{
|
||||
public Dictionary<string, ServerTagStorage> ServerTagStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
|
||||
public int Version { get; set; } = 0;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
using LightlessSync.API.Data.Enum;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public class TransientConfig : IMareConfiguration
|
||||
public class TransientConfig : ILightlessConfiguration
|
||||
{
|
||||
public Dictionary<string, TransientPlayerConfig> TransientConfigs { get; set; } = [];
|
||||
public int Version { get; set; } = 1;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using LightlessSync.MareConfiguration.Models;
|
||||
using LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public class UidNotesConfig : IMareConfiguration
|
||||
public class UidNotesConfig : ILightlessConfiguration
|
||||
{
|
||||
public Dictionary<string, ServerNotesStorage> ServerNotes { get; set; } = new(StringComparer.Ordinal);
|
||||
public int Version { get; set; } = 0;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System.Collections.Concurrent;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Configurations;
|
||||
namespace LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
public class XivDataStorageConfig : IMareConfiguration
|
||||
public class XivDataStorageConfig : ILightlessConfiguration
|
||||
{
|
||||
public ConcurrentDictionary<string, long> TriangleDictionary { get; set; } = new(StringComparer.OrdinalIgnoreCase);
|
||||
public ConcurrentDictionary<string, Dictionary<string, List<ushort>>> BonesDictionary { get; set; } = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public interface IConfigService<out T> : IDisposable where T : IMareConfiguration
|
||||
public interface IConfigService<out T> : IDisposable where T : ILightlessConfiguration
|
||||
{
|
||||
T Current { get; }
|
||||
string ConfigurationName { get; }
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class MareConfigService : ConfigurationServiceBase<MareConfig>
|
||||
public class LightlessConfigService : ConfigurationServiceBase<LightlessConfig>
|
||||
{
|
||||
public const string ConfigName = "config.json";
|
||||
|
||||
public MareConfigService(string configDir) : base(configDir)
|
||||
public LightlessConfigService(string configDir) : base(configDir)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
[Serializable]
|
||||
public record Authentication
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
[Serializable]
|
||||
public class CharaDataFavorite
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
public enum DownloadSpeeds
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
public enum NotificationLocation
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models.Obsolete;
|
||||
namespace LightlessSync.LightlessConfiguration.Models.Obsolete;
|
||||
|
||||
[Serializable]
|
||||
[Obsolete("Deprecated, use ServerStorage")]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
[Serializable]
|
||||
public class SecretKey
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
public class ServerNotesStorage
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Http.Connections;
|
||||
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
[Serializable]
|
||||
public class ServerStorage
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LightlessSync.MareConfiguration.Models;
|
||||
namespace LightlessSync.LightlessConfiguration.Models;
|
||||
|
||||
[Serializable]
|
||||
public class ServerTagStorage
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class NotesConfigService : ConfigurationServiceBase<UidNotesConfig>
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class PlayerPerformanceConfigService : ConfigurationServiceBase<PlayerPerformanceConfig>
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class ServerConfigService : ConfigurationServiceBase<ServerConfig>
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class ServerTagConfigService : ConfigurationServiceBase<ServerTagConfig>
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class TransientConfigService : ConfigurationServiceBase<TransientConfig>
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using LightlessSync.MareConfiguration.Configurations;
|
||||
using LightlessSync.LightlessConfiguration.Configurations;
|
||||
|
||||
namespace LightlessSync.MareConfiguration;
|
||||
namespace LightlessSync.LightlessConfiguration;
|
||||
|
||||
public class XivDataStorageService : ConfigurationServiceBase<XivDataStorageConfig>
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user