t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mare 0.9 (#65)

Browse Source 
* add jwt expiry

* start of 0.9 api impl

* some stuff idk

* some more impl

* some cleanup

* remove grouppair, add configuration, rework some pair drawing stuff

* do some stuff

* rework some ui

* I don't even know anymore

* add cancellationtoken

* token bla

* ui fixes etc

* probably individual adding/removing now working fully as expected

* add working report popup

* I guess it's more syncshell shit or so

* popup shit idk

* work out most of the syncshell bullshit I guess

* delete some old crap

* are we actually getting closer to the end

* update pair info stuff

* more fixes/adjustments, idk

* refactor some things

* some rework

* some more cleanup

* cleanup

* make menu buttons w i d e

* better icon text buttons

* add all syncshell folder and ordering fixes

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2023-10-17 21:36:44 +02:00
committed by GitHub
parent f15b8f6bbd
commit 14575a4a6b
111 changed files with 3456 additions and 3174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MareSynchronos/MareConfiguration/Configurations/MareConfig.cs
View File

@@ -9,8 +9,8 @@ public class MareConfig : IMareConfiguration
public bool AcceptedAgreement { get; set; } = false;
public string CacheFolder { get; set; } = string.Empty;
public bool DisableOptionalPluginWarnings { get; set; } = false;
public bool EnableRightClickMenus { get; set; } = true;
public bool EnableDtrEntry { get; set; } = false;
public bool EnableRightClickMenus { get; set; } = true;
public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
public string ExportFolder { get; set; } = string.Empty;
public bool FileScanPaused { get; set; } = false;
@@ -22,15 +22,14 @@ public class MareConfig : IMareConfiguration
public bool OpenGposeImportOnGposeStart { get; set; } = false;
public bool OpenPopupOnAdd { get; set; } = true;
public int ParallelDownloads { get; set; } = 10;
public bool UseCompactor { get; set; } = false;
public bool PreferNotesOverNamesForVisible { get; set; } = false;
public float ProfileDelay { get; set; } = 1.5f;
public bool ProfilePopoutRight { get; set; } = false;
public bool ProfilesAllowNsfw { get; set; } = false;
public bool ProfilesShow { get; set; } = true;
public bool ReverseUserSort { get; set; } = false;
public bool ShowCharacterNameInsteadOfNotesForVisible { get; set; } = false;
public bool PreferNotesOverNamesForVisible { get; set; } = false;
public bool ShowOfflineUsersSeparately { get; set; } = true;
public bool GroupUpSyncshells { get; set; } = true;
public bool ShowOnlineNotifications { get; set; } = false;
public bool ShowOnlineNotificationsOnlyForIndividualPairs { get; set; } = true;
public bool ShowOnlineNotificationsOnlyForNamedPairs { get; set; } = false;
@@ -44,6 +43,7 @@ public class MareConfig : IMareConfiguration
public bool TransferBarsShowText { get; set; } = true;
public int TransferBarsWidth { get; set; } = 250;
public bool UseAlternativeFileUpload { get; set; } = false;
public bool UseCompactor { get; set; } = false;
public int Version { get; set; } = 1;
public NotificationLocation WarningNotification { get; set; } = NotificationLocation.Both;
}

124
MareSynchronos/MareConfiguration/Configurations/Obsolete/Configuration.cs
View File

@@ -1,124 +0,0 @@
using Dalamud.Configuration;
using MareSynchronos.MareConfiguration.Models;
using MareSynchronos.MareConfiguration.Models.Obsolete;
using MareSynchronos.WebAPI;
using Microsoft.Extensions.Logging;
namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
[Serializable]
[Obsolete("Deprecated, use MareConfig")]
public class Configuration : IPluginConfiguration
{
public int Version { get; set; } = 6;
public Dictionary<string, ServerStorageV0> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase)
{
{ ApiController.MainServiceUri, new ServerStorageV0() { 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 { get; set; } = 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 { get; set; } = new(StringComparer.Ordinal);
public HashSet<string> OpenPairTags { get; set; } = new(StringComparer.Ordinal);
public MareConfigV0 ToMareConfig(ILogger logger)
{
MareConfigV0 newConfig = new();
logger.LogInformation("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.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.LogDebug("Migrating {key}", secret.Key);
var apiuri = secret.Key;
var secretkey = secret.Value;
ServerStorageV0 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;
}
}

57
MareSynchronos/MareConfiguration/Configurations/Obsolete/MareConfigV0.cs
View File

@@ -1,57 +0,0 @@
using MareSynchronos.MareConfiguration.Models;
using MareSynchronos.MareConfiguration.Models.Obsolete;
namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
[Serializable]
[Obsolete("Deprecated, use MareConfig")]
public class MareConfigV0 : IMareConfiguration
{
public int Version { get; set; } = 0;
public Dictionary<string, ServerStorageV0> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
public Dictionary<string, HashSet<string>> PlayerPersistentTransientCache { get; set; } = new(StringComparer.Ordinal);
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 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;
public bool ShowOnlineNotifications { get; set; } = false;
public bool ShowOnlineNotificationsOnlyForIndividualPairs { get; set; } = true;
public bool ShowOnlineNotificationsOnlyForNamedPairs { get; set; } = false;
public bool ShowCharacterNameInsteadOfNotesForVisible { get; set; } = false;
public NotificationLocation InfoNotification { get; set; } = NotificationLocation.Toast;
public NotificationLocation WarningNotification { get; set; } = NotificationLocation.Both;
public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
public MareConfig ToV1()
{
return new MareConfig()
{
AcceptedAgreement = this.AcceptedAgreement,
CacheFolder = this.CacheFolder,
MaxLocalCacheInGiB = this.MaxLocalCacheInGiB,
ReverseUserSort = this.ReverseUserSort,
TimeSpanBetweenScansInSeconds = this.TimeSpanBetweenScansInSeconds,
FileScanPaused = this.FileScanPaused,
InitialScanComplete = this.InitialScanComplete,
DisableOptionalPluginWarnings = this.DisableOptionalPluginWarnings,
OpenGposeImportOnGposeStart = this.OpenGposeImportOnGposeStart,
ShowTransferWindow = this.ShowTransferWindow,
OpenPopupOnAdd = this.OpenPopupOnAdd,
ShowOnlineNotifications = this.ShowOnlineNotifications,
ShowOnlineNotificationsOnlyForIndividualPairs = this.ShowOnlineNotificationsOnlyForIndividualPairs,
ShowCharacterNameInsteadOfNotesForVisible = this.ShowCharacterNameInsteadOfNotesForVisible,
ShowOnlineNotificationsOnlyForNamedPairs = this.ShowOnlineNotificationsOnlyForNamedPairs,
ErrorNotification = this.ErrorNotification,
InfoNotification = this.InfoNotification,
WarningNotification = this.WarningNotification,
};
}
}

18
MareSynchronos/MareConfiguration/Configurations/Obsolete/ServerConfigV0.cs
View File

@@ -1,18 +0,0 @@
using MareSynchronos.MareConfiguration.Models;
using MareSynchronos.WebAPI;
namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
[Serializable]
[Obsolete("Replaced with ServerConfig")]
public class ServerConfigV0 : IMareConfiguration
{
public string CurrentServer { get; set; } = string.Empty;
public Dictionary<string, ServerStorage> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase)
{
{ ApiController.MainServiceUri, new ServerStorage() { ServerName = ApiController.MainServer, ServerUri = ApiController.MainServiceUri } },
};
public int Version { get; set; } = 0;
}

4
MareSynchronos/MareConfiguration/Configurations/ServerTagConfig.cs
View File

@@ -4,6 +4,6 @@ namespace MareSynchronos.MareConfiguration.Configurations;
public class ServerTagConfig : IMareConfiguration
{
public int Version { get; set; } = 0;
public Dictionary<string, ServerTagStorage> ServerTagStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
}
public int Version { get; set; } = 0;
}

4
MareSynchronos/MareConfiguration/Configurations/TransientConfig.cs
View File

@@ -2,8 +2,6 @@
public class TransientConfig : IMareConfiguration
{
public int Version { get; set; } = 0;
public Dictionary<string, HashSet<string>> PlayerPersistentTransientCache { get; set; } = new(StringComparer.Ordinal);
public int Version { get; set; } = 0;
}

4
MareSynchronos/MareConfiguration/Configurations/UidNotesConfig.cs
View File

@@ -4,6 +4,6 @@ namespace MareSynchronos.MareConfiguration.Configurations;
public class UidNotesConfig : IMareConfiguration
{
public int Version { get; set; } = 0;
public Dictionary<string, ServerNotesStorage> ServerNotes { get; set; } = new(StringComparer.Ordinal);
}
public int Version { get; set; } = 0;
}