Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-06 03:03:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge repeated loose file archive entries

Browse Source
This commit is contained in:
Marlon 2026-07-16 22:21:19 +02:00
parent 24c3c758a8
commit b51a3cdd47
No known key found for this signature in database
GPG Key ID: 5C65CA190C38792F
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
FModel/ViewModels/GameDirectoryViewModel.cs
View File

@ -137,6 +137,8 @@ public partial class GameDirectoryViewModel : ViewModel
new(ReferenceEqualityComparer.Instance);
private readonly ConcurrentQueue<FileItem> _pendingAdditions = new();
private readonly ConcurrentQueue<FileItemUpdate> _pendingUpdates = new();
private FileItem _looseFilesContainer;
private int _pendingLooseFileCount;
private int _publishScheduled;
public GameDirectoryViewModel()
@ -169,7 +171,7 @@ public partial class GameDirectoryViewModel : ViewModel
if (fileCount < 1)
return;
_pendingAdditions.Enqueue(new FileItem("Loose Files", fileCount, 0, true));
Interlocked.Add(ref _pendingLooseFileCount, fileCount);
SchedulePublish();
}
@ -211,6 +213,20 @@ public partial class GameDirectoryViewModel : ViewModel
while (_pendingAdditions.TryDequeue(out var file))
additions.Add(file);
var looseFileCount = Interlocked.Exchange(ref _pendingLooseFileCount, 0);
if (looseFileCount > 0)
{
if (_looseFilesContainer is null)
{
_looseFilesContainer = new FileItem("Loose Files", looseFileCount, 0, true);
additions.Add(_looseFilesContainer);
}
else
{
_looseFilesContainer.FileCount += looseFileCount;
}
}
if (additions.Count > 0)
DirectoryFiles.AddRange(additions);
@ -225,7 +241,7 @@ public partial class GameDirectoryViewModel : ViewModel
}
Interlocked.Exchange(ref _publishScheduled, 0);
if (!_pendingAdditions.IsEmpty || !_pendingUpdates.IsEmpty)
if (!_pendingAdditions.IsEmpty || !_pendingUpdates.IsEmpty || Volatile.Read(ref _pendingLooseFileCount) > 0)
SchedulePublish();
}

2
FModel/Views/SearchView.xaml.cs
View File

@ -174,7 +174,7 @@ public partial class SearchView
try
{
WindowState = WindowState.Minimized;
MainWindow.YesWeCats.AssetsListName.ClearValue(ItemsControl.ItemsSourceProperty);
MainWindow.YesWeCats.AssetsListName.ClearValue(ItemsControl.ItemsSourceProperty);
var folder = await _applicationView.CustomDirectories.GoToCommand.JumpToAsync(entry.Directory);
if (folder == null)
return;