 b2276a1883
			
		
	
	b2276a1883
	
	
	
		
			
			* most of the groups refactoring on client * register OnMethods for group stuff * start implementing client (still pretty broken) * finish implementing new api first iteration * idk rework everything for pair shit (still WIP); goal is to remove PairedClients and GroupPairClients from ApiController * move everything to PairManager, remove dictionaries from APiController * remove admin stuff from client, cleanup * adjust reconnection handling, add new settings, todo still to remove access from old stuff that's marked obsolete from config * add back adding servers, fix intro ui * fix obsolete calls * adjust config namespace * add UI for setting animation/sound permissions to syncshells * add ConfigurationService to hot reload config on change from external * move transient data cache to configuration * add deleting service to ui * fix saving of transient resources * fix group pair user assignments * halt scanner when penumbra inactive, add visible/online/offline split to individual pairs and tags * add presence to syncshell ui * move fullpause from config to server config * fixes in code style * more codestyle * show info icon on player in shells, don't show icon when no changes from default state are made, add online notifs * fixes to intro UI --------- Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
		
			
				
	
	
		
			150 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
| using Dalamud.Configuration;
 | |
| using Dalamud.Plugin;
 | |
| using MareSynchronos.Utils;
 | |
| using MareSynchronos.WebAPI;
 | |
| 
 | |
| namespace MareSynchronos.MareConfiguration;
 | |
| 
 | |
| [Serializable]
 | |
| [Obsolete("Migrated to MareConfig")]
 | |
| public class Configuration : IPluginConfiguration
 | |
| {
 | |
|     public int Version { get; set; } = 6;
 | |
|     [NonSerialized]
 | |
|     private DalamudPluginInterface? _pluginInterface;
 | |
|     public Dictionary<string, ServerStorage> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase)
 | |
|     {
 | |
|         { ApiController.MainServiceUri, new ServerStorage() { ServerName = ApiController.MainServer, ServerUri = ApiController.MainServiceUri } },
 | |
|     };
 | |
|     public bool AcceptedAgreement { get; set; } = false;
 | |
|     public string CacheFolder { get; set; } = string.Empty;
 | |
|     public double MaxLocalCacheInGiB { get; set; } = 20;
 | |
|     public bool ReverseUserSort { get; set; } = false;
 | |
|     public int TimeSpanBetweenScansInSeconds { get; set; } = 30;
 | |
|     public bool FileScanPaused { get; set; } = false;
 | |
|     public bool InitialScanComplete { get; set; } = false;
 | |
|     public bool FullPause { get; set; } = false;
 | |
|     public bool HideInfoMessages { get; set; } = false;
 | |
|     public bool DisableOptionalPluginWarnings { get; set; } = false;
 | |
|     public bool OpenGposeImportOnGposeStart { get; set; } = false;
 | |
|     public bool ShowTransferWindow { get; set; } = true;
 | |
|     public bool OpenPopupOnAdd { get; set; } = true;
 | |
|     public string CurrentServer { get; set; } = string.Empty;
 | |
| 
 | |
|     private string _apiUri = string.Empty;
 | |
|     public string ApiUri
 | |
|     {
 | |
|         get => string.IsNullOrEmpty(_apiUri) ? ApiController.MainServiceUri : _apiUri;
 | |
|         set => _apiUri = value;
 | |
|     }
 | |
|     public Dictionary<string, string> ClientSecret { get; set; } = new(StringComparer.Ordinal);
 | |
|     public Dictionary<string, string> CustomServerList { get; set; } = new(StringComparer.Ordinal);
 | |
|     public Dictionary<string, Dictionary<string, string>> UidServerComments { get; set; } = new(StringComparer.Ordinal);
 | |
|     public Dictionary<string, Dictionary<string, string>> GidServerComments { get; set; } = new(StringComparer.Ordinal);
 | |
|     /// <summary>
 | |
|     /// Each paired user can have multiple tags. Each tag will create a category, and the user will
 | |
|     /// be displayed into that category.
 | |
|     /// The dictionary first maps a server URL to a dictionary, and that
 | |
|     /// dictionary maps the OtherUID of the <see cref="ClientPairDto"/> to a list of tags.
 | |
|     /// </summary>
 | |
|     public Dictionary<string, Dictionary<string, List<string>>> UidServerPairedUserTags = new(StringComparer.Ordinal);
 | |
|     /// <summary>
 | |
|     /// A dictionary that maps a server URL to the tags the user has added for that server.
 | |
|     /// </summary>
 | |
|     public Dictionary<string, HashSet<string>> ServerAvailablePairTags = new(StringComparer.Ordinal);
 | |
|     public HashSet<string> OpenPairTags = new(StringComparer.Ordinal);
 | |
| 
 | |
| 
 | |
|     // the below exist just to make saving less cumbersome
 | |
|     public void Initialize(DalamudPluginInterface pluginInterface)
 | |
|     {
 | |
|         _pluginInterface = pluginInterface;
 | |
| 
 | |
|         if (!Directory.Exists(CacheFolder))
 | |
|         {
 | |
|             InitialScanComplete = false;
 | |
|         }
 | |
| 
 | |
|         Save();
 | |
|     }
 | |
| 
 | |
|     public void Save()
 | |
|     {
 | |
|         _pluginInterface!.SavePluginConfig(this);
 | |
|     }
 | |
| 
 | |
|     public MareConfig ToMareConfig()
 | |
|     {
 | |
|         MareConfig newConfig = new();
 | |
|         Logger.Info("Migrating Config to MareConfig");
 | |
| 
 | |
|         newConfig.AcceptedAgreement = AcceptedAgreement;
 | |
|         newConfig.CacheFolder = CacheFolder;
 | |
|         newConfig.MaxLocalCacheInGiB = MaxLocalCacheInGiB;
 | |
|         newConfig.ReverseUserSort = ReverseUserSort;
 | |
|         newConfig.TimeSpanBetweenScansInSeconds = TimeSpanBetweenScansInSeconds;
 | |
|         newConfig.FileScanPaused = FileScanPaused;
 | |
|         newConfig.InitialScanComplete = InitialScanComplete;
 | |
|         newConfig.HideInfoMessages = HideInfoMessages;
 | |
|         newConfig.DisableOptionalPluginWarnings = DisableOptionalPluginWarnings;
 | |
|         newConfig.OpenGposeImportOnGposeStart = OpenGposeImportOnGposeStart;
 | |
|         newConfig.ShowTransferWindow = ShowTransferWindow;
 | |
|         newConfig.OpenPopupOnAdd = OpenPopupOnAdd;
 | |
|         newConfig.CurrentServer = ApiUri;
 | |
| 
 | |
|         // create all server storage based on current clientsecret
 | |
|         foreach (var secret in ClientSecret)
 | |
|         {
 | |
|             Logger.Debug("Migrating " + secret.Key);
 | |
|             var apiuri = secret.Key;
 | |
|             var secretkey = secret.Value;
 | |
|             ServerStorage toAdd = new();
 | |
|             if (string.Equals(apiuri, ApiController.MainServiceUri, StringComparison.OrdinalIgnoreCase))
 | |
|             {
 | |
|                 toAdd.ServerUri = ApiController.MainServiceUri;
 | |
|                 toAdd.ServerName = ApiController.MainServer;
 | |
|             }
 | |
|             else
 | |
|             {
 | |
|                 toAdd.ServerUri = apiuri;
 | |
|                 if (!CustomServerList.TryGetValue(apiuri, out var serverName)) serverName = apiuri;
 | |
|                 toAdd.ServerName = serverName;
 | |
|             }
 | |
| 
 | |
|             toAdd.SecretKeys[0] = new SecretKey()
 | |
|             {
 | |
|                 FriendlyName = "Auto Migrated Secret Key (" + DateTime.Now.ToString("yyyy-MM-dd") + ")",
 | |
|                 Key = secretkey,
 | |
|             };
 | |
| 
 | |
|             if (GidServerComments.TryGetValue(apiuri, out var gids))
 | |
|             {
 | |
|                 toAdd.GidServerComments = gids;
 | |
|             }
 | |
|             if (UidServerComments.TryGetValue(apiuri, out var uids))
 | |
|             {
 | |
|                 toAdd.UidServerComments = uids;
 | |
|             }
 | |
|             if (UidServerPairedUserTags.TryGetValue(apiuri, out var uidtag))
 | |
|             {
 | |
|                 toAdd.UidServerPairedUserTags = uidtag;
 | |
|             }
 | |
|             if (ServerAvailablePairTags.TryGetValue(apiuri, out var servertag))
 | |
|             {
 | |
|                 toAdd.ServerAvailablePairTags = servertag;
 | |
|             }
 | |
|             toAdd.OpenPairTags = OpenPairTags;
 | |
|             toAdd.FullPause = FullPause;
 | |
| 
 | |
|             newConfig.ServerStorage[apiuri] = toAdd;
 | |
|         }
 | |
| 
 | |
|         return newConfig;
 | |
|     }
 | |
| 
 | |
|     public void Migrate()
 | |
|     {
 | |
| 
 | |
|     }
 | |
| }
 |