Skip to content

Commit 308ee40

Browse files
committed
1 parent 3b6e6cf commit 308ee40

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

src/NexusMods.App.UI/Pages/LibraryPage/LibraryItemModel.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ public class LibraryItemModel : TreeDataGridItemModel<LibraryItemModel, EntityId
1919
{
2020
public required string Name { get; init; }
2121
public required DateTime CreatedAt { get; init; }
22-
public BindableReactiveProperty<Size> ItemSize { get; } = new(Size.Zero);
22+
23+
// TODO: turn this back into a `Size`
24+
// NOTE(erri120): requires https://github.com/AvaloniaUI/Avalonia.Controls.TreeDataGrid/pull/304
25+
public BindableReactiveProperty<string> ItemSize { get; } = new(Size.Zero.ToString());
2326
public BindableReactiveProperty<string> Version { get; set; } = new("-");
2427

2528
public IObservable<IChangeSet<LibraryLinkedLoadoutItem.ReadOnly, EntityId>> LinkedLoadoutItemsObservable { get; init; } = System.Reactive.Linq.Observable.Empty<IChangeSet<LibraryLinkedLoadoutItem.ReadOnly, EntityId>>();
@@ -158,13 +161,13 @@ public static IColumn<LibraryItemModel> CreateVersionColumn()
158161

159162
public static IColumn<LibraryItemModel> CreateSizeColumn()
160163
{
161-
return new CustomTextColumn<LibraryItemModel, Size>(
164+
return new CustomTextColumn<LibraryItemModel, string>(
162165
header: "SIZE",
163166
getter: model => model.ItemSize.Value,
164167
options: new TextColumnOptions<LibraryItemModel>
165168
{
166-
CompareAscending = static (a, b) => a is null ? -1 : a.ItemSize.Value.CompareTo(b?.ItemSize.Value ?? Size.Zero),
167-
CompareDescending = static (a, b) => b is null ? -1 : b.ItemSize.Value.CompareTo(a?.ItemSize.Value ?? Size.Zero),
169+
CompareAscending = static (a, b) => a is null ? -1 : a.ItemSize.Value.CompareTo(b?.ItemSize.Value ?? "0 B"),
170+
CompareDescending = static (a, b) => b is null ? -1 : b.ItemSize.Value.CompareTo(a?.ItemSize.Value ?? "0 B"),
168171
IsTextSearchEnabled = false,
169172
CanUserResizeColumn = true,
170173
CanUserSortColumn = true,

src/NexusMods.App.UI/Pages/LibraryPage/NexusModsModPageLibraryItemModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public NexusModsModPageLibraryItemModel() : base(default(LibraryItemId))
2121
// TODO: different selection, need to check with design
2222
if (model.LibraryItems.TryGetFirst(static x => x.ToLibraryFile().ToDownloadedFile().ToNexusModsLibraryFile().IsValid(), out var libraryItem))
2323
{
24-
model.ItemSize.Value = libraryItem.ToLibraryFile().Size;
24+
model.ItemSize.Value = libraryItem.ToLibraryFile().Size.ToString();
2525
model.Version.Value = libraryItem.ToLibraryFile().ToDownloadedFile().ToNexusModsLibraryFile().FileMetadata.Version;
2626
}
2727
else
2828
{
29-
model.ItemSize.Value = Size.Zero;
29+
model.ItemSize.Value = Size.Zero.ToString();
3030
model.Version.Value = "-";
3131
}
3232
})

src/NexusMods.App.UI/Pages/LocalFileDataProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private LibraryItemModel ToLibraryItemModel(LibraryFile.ReadOnly libraryFile)
5454
LinkedLoadoutItemsObservable = linkedLoadoutItemsObservable,
5555
};
5656

57-
model.ItemSize.Value = libraryFile.Size;
57+
model.ItemSize.Value = libraryFile.Size.ToString();
5858
return model;
5959
}
6060

@@ -96,7 +96,7 @@ public IObservable<IChangeSet<LibraryItemModel, EntityId>> ObserveNestedLibraryI
9696
LibraryItemsObservable = UIObservableExtensions.ReturnFactory(() => new ChangeSet<LibraryItem.ReadOnly, EntityId>([new Change<LibraryItem.ReadOnly, EntityId>(ChangeReason.Add, entityId, LibraryItem.Load(_connection.Db, entityId))])),
9797
};
9898

99-
model.ItemSize.Value = libraryFile.Size;
99+
model.ItemSize.Value = libraryFile.Size.ToString();
100100
return (LibraryItemModel)model;
101101
});
102102
}

src/NexusMods.App.UI/Pages/NexusModsDataProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private LibraryItemModel ToLibraryItemModel(NexusModsLibraryFile.ReadOnly nexusM
6262
LinkedLoadoutItemsObservable = linkedLoadoutItemsObservable,
6363
};
6464

65-
model.ItemSize.Value = nexusModsLibraryFile.AsDownloadedFile().AsLibraryFile().Size;
65+
model.ItemSize.Value = nexusModsLibraryFile.AsDownloadedFile().AsLibraryFile().Size.ToString();
6666
model.Version.Value = nexusModsLibraryFile.FileMetadata.Version;
6767

6868
return model;

0 commit comments

Comments
 (0)