Jayden/sharpemu
1
0
Fork 0
mirror of https://github.com/par274/sharpemu.git synced 2026-07-22 19:06:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(gui): respect case-sensitive Linux paths (#218)

Browse Source
This commit is contained in:
999sian
2026-07-15 22:17:31 +01:00
committed by GitHub
parent 5f97d2edc4
commit ad92ab30fd
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SharpEmu.GUI/MainWindow.axaml.cs
+14 -8
View File
@@ -34,6 +34,12 @@ public partial class MainWindow : Window
private static readonly IBrush WarningLineBrush = new SolidColorBrush(Color.Parse("#E8B341")); private static readonly IBrush WarningLineBrush = new SolidColorBrush(Color.Parse("#E8B341"));
private static readonly IBrush ErrorLineBrush = new SolidColorBrush(Color.Parse("#F2777C")); private static readonly IBrush ErrorLineBrush = new SolidColorBrush(Color.Parse("#F2777C"));
private static readonly IBrush SuccessLineBrush = new SolidColorBrush(Color.Parse("#63D489")); private static readonly IBrush SuccessLineBrush = new SolidColorBrush(Color.Parse("#63D489"));
private static readonly StringComparer FilePathComparer = OperatingSystem.IsWindows()
? StringComparer.OrdinalIgnoreCase
: StringComparer.Ordinal;
private static readonly StringComparison FilePathComparison = OperatingSystem.IsWindows()
? StringComparison.OrdinalIgnoreCase
: StringComparison.Ordinal;
private readonly List<GameEntry> _allGames = new(); private readonly List<GameEntry> _allGames = new();
private readonly ObservableCollection<GameEntry> _visibleGames = new(); private readonly ObservableCollection<GameEntry> _visibleGames = new();
@@ -727,7 +733,7 @@ public partial class MainWindow : Window
} }
var changed = false; var changed = false;
if (!_settings.GameFolders.Contains(path, StringComparer.OrdinalIgnoreCase)) if (!_settings.GameFolders.Contains(path, FilePathComparer))
{ {
_settings.GameFolders.Add(path); _settings.GameFolders.Add(path);
changed = true; changed = true;
@@ -737,7 +743,7 @@ public partial class MainWindow : Window
// games beneath it that were removed from the library earlier. // games beneath it that were removed from the library earlier.
var prefix = Path.TrimEndingDirectorySeparator(path) + Path.DirectorySeparatorChar; var prefix = Path.TrimEndingDirectorySeparator(path) + Path.DirectorySeparatorChar;
changed |= _settings.ExcludedGames.RemoveAll(excluded => changed |= _settings.ExcludedGames.RemoveAll(excluded =>
excluded.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) > 0; excluded.StartsWith(prefix, FilePathComparison)) > 0;
if (changed) if (changed)
{ {
@@ -750,7 +756,7 @@ public partial class MainWindow : Window
private async Task RescanLibraryAsync() private async Task RescanLibraryAsync()
{ {
var folders = _settings.GameFolders.ToArray(); var folders = _settings.GameFolders.ToArray();
var excluded = new HashSet<string>(_settings.ExcludedGames, StringComparer.OrdinalIgnoreCase); var excluded = new HashSet<string>(_settings.ExcludedGames, FilePathComparer);
StatusBarRight.Text = Localization.Instance.Get("Status.ScanningLibrary"); StatusBarRight.Text = Localization.Instance.Get("Status.ScanningLibrary");
EmptyState.IsVisible = false; EmptyState.IsVisible = false;
LoadingState.IsVisible = true; LoadingState.IsVisible = true;
@@ -868,7 +874,7 @@ public partial class MainWindow : Window
private static List<GameEntry> ScanFolders(IReadOnlyList<string> folders, IReadOnlySet<string> excludedPaths) private static List<GameEntry> ScanFolders(IReadOnlyList<string> folders, IReadOnlySet<string> excludedPaths)
{ {
var games = new List<GameEntry>(); var games = new List<GameEntry>();
var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase); var seen = new HashSet<string>(FilePathComparer);
var enumeration = new EnumerationOptions var enumeration = new EnumerationOptions
{ {
IgnoreInaccessible = true, IgnoreInaccessible = true,
@@ -1132,13 +1138,13 @@ public partial class MainWindow : Window
return; return;
} }
if (!_settings.ExcludedGames.Contains(game.Path, StringComparer.OrdinalIgnoreCase)) if (!_settings.ExcludedGames.Contains(game.Path, FilePathComparer))
{ {
_settings.ExcludedGames.Add(game.Path); _settings.ExcludedGames.Add(game.Path);
_settings.Save(); _settings.Save();
} }
_allGames.RemoveAll(g => string.Equals(g.Path, game.Path, StringComparison.OrdinalIgnoreCase)); _allGames.RemoveAll(g => string.Equals(g.Path, game.Path, FilePathComparison));
GameList.SelectedItem = null; GameList.SelectedItem = null;
RefreshVisibleGames(); RefreshVisibleGames();
StatusBarRight.Text = Localization.Instance.Format("Status.RemovedFromLibrary", game.Name); StatusBarRight.Text = Localization.Instance.Format("Status.RemovedFromLibrary", game.Name);
@@ -1162,7 +1168,7 @@ public partial class MainWindow : Window
} }
if (selectedPath is not null && if (selectedPath is not null &&
_visibleGames.FirstOrDefault(g => g.Path.Equals(selectedPath, StringComparison.OrdinalIgnoreCase)) _visibleGames.FirstOrDefault(g => g.Path.Equals(selectedPath, FilePathComparison))
is { } reselected) is { } reselected)
{ {
GameList.SelectedItem = reselected; GameList.SelectedItem = reselected;
@@ -1487,7 +1493,7 @@ public partial class MainWindow : Window
_isRunning = true; _isRunning = true;
_runningGameName = displayName; _runningGameName = displayName;
_runningGameTitleId = _allGames _runningGameTitleId = _allGames
.FirstOrDefault(game => game.Path.Equals(ebootPath, StringComparison.OrdinalIgnoreCase))? .FirstOrDefault(game => game.Path.Equals(ebootPath, FilePathComparison))?
.TitleId; .TitleId;
_runningSinceUnixSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); _runningSinceUnixSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
StatusDot.Fill = SuccessLineBrush; StatusDot.Fill = SuccessLineBrush;