ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 6cee8ebe1a into e100ec2abd

Browse source
This commit is contained in:
Eauldane 2025-12-12 11:11:31 +08:00 • committed by GitHub
commit cf170b1927
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 101 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
View file

@ -175,17 +175,19 @@ internal sealed class SettingsWindow : Window
{
if (buttonChild)
{
using var disabled = ImRaii.Disabled(this.tabs.Any(x => x.Entries.Any(y => !y.IsValid)));
using (ImRaii.PushStyle(ImGuiStyleVar.FrameRounding, 100f))
{
using var font = ImRaii.PushFont(InterfaceManager.IconFont);
var hasInvalidEntries = this.tabs.Any(x => x.Entries.Any(y => !y.IsValid));
using var disabled = ImRaii.Disabled(hasInvalidEntries);
if (ImGui.Button(FontAwesomeIcon.Save.ToIconString(), new Vector2(40)))
{
this.Save();
if (!ImGui.IsKeyDown(ImGuiKey.ModShift))
if (!hasInvalidEntries && !ImGui.IsKeyDown(ImGuiKey.ModShift))
this.IsOpen = false;
}
}

130
Dalamud/Interface/Internal/Windows/Settings/Widgets/ThirdRepoSettingsEntry.cs
View file

@ -42,10 +42,21 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
this.thirdRepoList =
[.. Service<DalamudConfiguration>.Get().ThirdRepoList.Select(x => x.Clone())];
this.thirdRepoListChanged = false;
this.IsValid = true;
}
public override void Save()
{
var hasPendingRepo = !string.IsNullOrWhiteSpace(this.thirdRepoTempUrl);
var addedPendingRepo = this.TryAddTempRepo();
if (!addedPendingRepo && hasPendingRepo)
{
this.IsValid = false;
return;
}
this.IsValid = true;
Service<DalamudConfiguration>.Get().ThirdRepoList =
[.. this.thirdRepoList.Select(x => x.Clone())];
@ -170,27 +181,34 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
ImGui.SetNextItemWidth(-1);
var url = thirdRepoSetting.Url;
if (ImGui.InputText($"##thirdRepoInput", ref url, 65535, ImGuiInputTextFlags.EnterReturnsTrue))
if (ImGui.InputText($"##thirdRepoInput", ref url, 65535))
{
var contains = this.thirdRepoList.Select(repo => repo.Url).Contains(url);
if (thirdRepoSetting.Url == url)
var trimmedUrl = url.Trim();
if (string.Equals(thirdRepoSetting.Url, trimmedUrl, StringComparison.InvariantCultureIgnoreCase))
{
// no change.
this.thirdRepoAddError = string.Empty;
this.IsValid = true;
}
else if (contains && thirdRepoSetting.Url != url)
else if (this.thirdRepoList
.Where(repo => !string.Equals(repo.Url, thirdRepoSetting.Url, StringComparison.InvariantCultureIgnoreCase))
.Select(repo => repo.Url)
.Contains(trimmedUrl))
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
this.IsValid = false;
}
else if (!ValidThirdPartyRepoUrl(url))
else if (!ValidThirdPartyRepoUrl(trimmedUrl))
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoNotUrl", "The entered address is not a valid URL.\nDid you mean to enter it as a DevPlugin in the fields above instead?");
Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
this.IsValid = false;
}
else
{
thirdRepoSetting.Url = url;
this.thirdRepoListChanged = url != thirdRepoSetting.Url;
this.thirdRepoAddError = string.Empty;
this.thirdRepoListChanged = !string.Equals(thirdRepoSetting.Url, trimmedUrl, StringComparison.InvariantCultureIgnoreCase);
thirdRepoSetting.Url = trimmedUrl;
this.IsValid = true;
}
}
@ -229,33 +247,17 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
ImGui.Text(repoNumber.ToString());
ImGui.NextColumn();
ImGui.SetNextItemWidth(-1);
ImGui.InputText("##thirdRepoUrlInput"u8, ref this.thirdRepoTempUrl, 300);
if (ImGui.InputText("##thirdRepoUrlInput"u8, ref this.thirdRepoTempUrl, 300))
{
this.ValidateTempRepoInput();
}
ImGui.NextColumn();
// Enabled button
ImGui.NextColumn();
if (!string.IsNullOrEmpty(this.thirdRepoTempUrl) && ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
{
this.thirdRepoTempUrl = this.thirdRepoTempUrl.TrimEnd();
if (this.thirdRepoList.Any(r => string.Equals(r.Url, this.thirdRepoTempUrl, StringComparison.InvariantCultureIgnoreCase)))
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
}
else if (!ValidThirdPartyRepoUrl(this.thirdRepoTempUrl))
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoNotUrl", "The entered address is not a valid URL.\nDid you mean to enter it as a DevPlugin in the fields above instead?");
Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
}
else
{
this.thirdRepoList.Add(new ThirdPartyRepoSettings
{
Url = this.thirdRepoTempUrl,
IsEnabled = true,
});
this.thirdRepoListChanged = true;
this.thirdRepoTempUrl = string.Empty;
}
this.TryAddTempRepo();
}
ImGui.Columns(1);
@ -267,6 +269,66 @@ internal class ThirdRepoSettingsEntry : SettingsEntry
}
private static bool ValidThirdPartyRepoUrl(string url)
=> Uri.TryCreate(url, UriKind.Absolute, out var uriResult)
&& (uriResult.Scheme == Uri.UriSchemeHttps || uriResult.Scheme == Uri.UriSchemeHttp);
{
if (!Uri.TryCreate(url, UriKind.Absolute, out var uriResult))
return false;
if (uriResult.Scheme != Uri.UriSchemeHttps && uriResult.Scheme != Uri.UriSchemeHttp)
return false;
if (string.IsNullOrWhiteSpace(uriResult.Host))
return false;
var hostNameType = Uri.CheckHostName(uriResult.Host);
return hostNameType != UriHostNameType.Unknown
&& Uri.IsWellFormedUriString(url, UriKind.Absolute);
}
private bool ValidateTempRepoInput()
{
this.thirdRepoTempUrl = this.thirdRepoTempUrl.Trim();
if (string.IsNullOrEmpty(this.thirdRepoTempUrl))
{
this.thirdRepoAddError = string.Empty;
this.IsValid = true;
return false;
}
if (this.thirdRepoList.Any(r => string.Equals(r.Url, this.thirdRepoTempUrl, StringComparison.InvariantCultureIgnoreCase)))
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
this.IsValid = false;
return false;
}
if (!ValidThirdPartyRepoUrl(this.thirdRepoTempUrl))
{
this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoNotUrl", "The entered address is not a valid URL.\nDid you mean to enter it as a DevPlugin in the fields above instead?");
this.IsValid = false;
return false;
}
this.thirdRepoAddError = string.Empty;
this.IsValid = true;
return true;
}
private bool TryAddTempRepo()
{
if (!this.ValidateTempRepoInput())
return false;
this.thirdRepoList.Add(new ThirdPartyRepoSettings
{
Url = this.thirdRepoTempUrl,
IsEnabled = true,
});
this.thirdRepoListChanged = true;
this.thirdRepoTempUrl = string.Empty;
this.IsValid = true;
return true;
}
}