ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Order by file name

Browse Source
This commit is contained in:
Ádám Kovács
2023-02-15 20:47:03 +01:00
parent a11cde83ff
commit 97f5108ba8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/AppCommon/FileTime.App.Core/ViewModels/TabViewModel.cs
View File

@@ -1,5 +1,6 @@
using System.Reactive.Linq; using System.Reactive.Linq;
using DynamicData; using DynamicData;
using DynamicData.Binding;
using FileTime.App.Core.Extensions; using FileTime.App.Core.Extensions;
using FileTime.App.Core.Models; using FileTime.App.Core.Models;
using FileTime.App.Core.Models.Enums; using FileTime.App.Core.Models.Enums;
@@ -80,6 +81,7 @@ public partial class TabViewModel : ITabViewModel
CurrentItems = tab.CurrentItems CurrentItems = tab.CurrentItems
.Select(items => items?.Transform(i => MapItemToViewModel(i, ItemViewModelType.Main))) .Select(items => items?.Transform(i => MapItemToViewModel(i, ItemViewModelType.Main)))
.Select(items => items?.Sort(SortItems()))
.Publish(null) .Publish(null)
.RefCount(); .RefCount();
@@ -134,8 +136,11 @@ public partial class TabViewModel : ITabViewModel
.Select(c => c.Container!.Items) .Select(c => c.Container!.Items)
.Switch() .Switch()
.Select(i => .Select(i =>
i?.TransformAsync(MapItem) i
.Transform(i => MapItemToViewModel(i, ItemViewModelType.SelectedChild))), ?.TransformAsync(MapItem)
.Transform(i => MapItemToViewModel(i, ItemViewModelType.SelectedChild))
.Sort(SortItems())
),
currentSelectedItemThrottled currentSelectedItemThrottled
.Where(c => c is null or not IContainerViewModel) .Where(c => c is null or not IContainerViewModel)
.Select(_ => (IObservable<IChangeSet<IItemViewModel, string>>?)null) .Select(_ => (IObservable<IChangeSet<IItemViewModel, string>>?)null)
@@ -162,8 +167,11 @@ public partial class TabViewModel : ITabViewModel
.Select(p => p.Items) .Select(p => p.Items)
.Switch() .Switch()
.Select(items => .Select(items =>
items?.TransformAsync(MapItem) items
.Transform(i => MapItemToViewModel(i, ItemViewModelType.Parent))), ?.TransformAsync(MapItem)
.Transform(i => MapItemToViewModel(i, ItemViewModelType.Parent))
.Sort(SortItems())
),
parentThrottled parentThrottled
.Where(p => p is null) .Where(p => p is null)
.Select(_ => (IObservable<IChangeSet<IItemViewModel, string>>?)null) .Select(_ => (IObservable<IChangeSet<IItemViewModel, string>>?)null)
@@ -186,6 +194,10 @@ public partial class TabViewModel : ITabViewModel
} }
} }
private static SortExpressionComparer<IItemViewModel> SortItems()
//TODO: Order
=> SortExpressionComparer<IItemViewModel>.Ascending(i => i.DisplayNameText ?? "");
private static async Task<IItem> MapItem(AbsolutePath item) private static async Task<IItem> MapItem(AbsolutePath item)
=> await item.ResolveAsync(forceResolve: true, => await item.ResolveAsync(forceResolve: true,
itemInitializationSettings: new ItemInitializationSettings(true)); itemInitializationSettings: new ItemInitializationSettings(true));