fixed downloading

Author: fgsfds

src/Addons/Providers/DownloadableAddonsProvider.cs

@@ -2,6 +2,7 @@
 using Common.Client.Helpers;
 using Common.Client.Interfaces;
 using Common.Client.Tools;
+using Common.Entities;
 using Common.Enums;
 using Common.Helpers;
 using Common.Interfaces;
@@ -22,7 +23,7 @@ public sealed class DownloadableAddonsProvider : IDownloadableAddonsProvider
     private readonly InstalledAddonsProvider _installedAddonsProvider;
     private readonly ILogger _logger;
 
-    private Dictionary<AddonTypeEnum, Dictionary<AddonVersion, IDownloadableAddon>>? _cache;
+    private Dictionary<AddonTypeEnum, Dictionary<AddonVersion, DownloadableAddonEntity>>? _cache;
 
     private static readonly SemaphoreSlim _semaphore = new(1);
 
@@ -103,7 +104,7 @@ public async Task<bool> CreateCacheAsync(bool createNew)
 
 
     /// <inheritdoc/>
-    public ImmutableList<IDownloadableAddon> GetDownloadableAddons(AddonTypeEnum addonType)
+    public ImmutableList<DownloadableAddonEntity> GetDownloadableAddons(AddonTypeEnum addonType)
     {
         if (_cache is null)
         {
@@ -157,7 +158,7 @@ public ImmutableList<IDownloadableAddon> GetDownloadableAddons(AddonTypeEnum add
 
     /// <inheritdoc/>
     public async Task DownloadAddonAsync(
-        IDownloadableAddon addon,
+        DownloadableAddonEntity addon,
         CancellationToken cancellationToken
         )
     {

src/Avalonia.Desktop/Controls/DownloadsControl.axaml

@@ -7,6 +7,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:vm="clr-namespace:Avalonia.Desktop.ViewModels"
              xmlns:helpers="clr-namespace:Avalonia.Desktop.Helpers"
+             xmlns:misc="clr-namespace:Avalonia.Desktop.Misc"
              x:DataType="vm:DownloadsViewModel"
              x:Class="Avalonia.Desktop.Controls.DownloadsControl">
 
@@ -42,13 +43,11 @@
 
         </Grid>
 
-        <DataGrid Name="DownloadableList"
-                  Grid.Row="1" Grid.Column="0"
-                  Margin="0"
-                  Padding="2"
+        <DataGrid Grid.Row="1" Grid.Column="0"
+                  Margin="0" Padding="2"
                   ItemsSource="{Binding DownloadableList}"
-                  SelectedItem="{Binding SelectedDownloadable}"
-                  SelectionChanged="OnDownloadableListSelectionChanged"
+                  SelectionMode="Extended"
+                  misc:DataGridSelectedItemsProperty.SelectedItems="{Binding SelectedDownloads}"
                   GridLinesVisibility="Horizontal"
                   IsReadOnly="True"
                   CornerRadius="4"

src/Avalonia.Desktop/Controls/DownloadsControl.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Common.Entities;
 
 namespace Avalonia.Desktop.Controls;
 
@@ -9,12 +8,4 @@ public DownloadsControl()
     {
         InitializeComponent();
     }
-
-    private void OnDownloadableListSelectionChanged(object? sender, SelectionChangedEventArgs e)
-    {
-        foreach (var a in DownloadableList.SelectedItems)
-        {
-            _ = DownloadableList.SelectedItems.Add((DownloadableAddonEntity)a);
-        }
-    }
 }

src/Avalonia.Desktop/MainWindow.axaml

@@ -16,7 +16,8 @@
         MinWidth="1300"
         MinHeight="700"
         ExtendClientAreaToDecorationsHint="True"
-        Background="{DynamicResource Background}">
+        Background="{DynamicResource Background}"
+        ClipToBounds="True">
 
     <Window.Resources>
         <ResourceDictionary>

src/Avalonia.Desktop/Misc/DataGridSelectedItemsProperty.cs

@@ -0,0 +1,52 @@
+using Avalonia.Controls;
+using Avalonia.Data;
+using System.Collections;
+
+namespace Avalonia.Desktop.Misc;
+
+public sealed class DataGridSelectedItemsProperty
+{
+    public static readonly AttachedProperty<IList?> SelectedItemsProperty =
+        AvaloniaProperty.RegisterAttached<DataGridSelectedItemsProperty, DataGrid, IList?>(
+            "SelectedItems",
+            defaultBindingMode: BindingMode.TwoWay);
+
+    public static IList? GetSelectedItems(AvaloniaObject obj) => obj.GetValue(SelectedItemsProperty);
+
+    public static void SetSelectedItems(AvaloniaObject obj, IList? value) => obj.SetValue(SelectedItemsProperty, value);
+
+    // 2) When the attached property is set, hook/unhook SelectionChanged
+    static DataGridSelectedItemsProperty()
+    {
+        _ = SelectedItemsProperty.Changed.AddClassHandler<DataGrid>((grid, e) =>
+        {
+            grid.SelectionChanged -= OnSelectionChanged;
+
+            if (e.NewValue is IList list)
+            {
+                list.Clear();
+
+                foreach (var item in grid.SelectedItems)
+                {
+                    _ = list.Add(item);
+                }
+
+                grid.SelectionChanged += OnSelectionChanged;
+            }
+        });
+    }
+
+    private static void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (sender is DataGrid grid &&
+            GetSelectedItems(grid) is IList list)
+        {
+            list.Clear();
+
+            foreach (var item in grid.SelectedItems)
+            {
+                _ = list.Add(item);
+            }
+        }
+    }
+}

src/Avalonia.Desktop/ViewModels/DownloadsViewModel.cs

@@ -10,6 +10,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using System.Collections.Immutable;
+using System.Collections.ObjectModel;
 
 namespace Avalonia.Desktop.ViewModels;
 
@@ -26,21 +27,14 @@ public sealed partial class DownloadsViewModel : ObservableObject
 
     #region Binding Properties
 
-    [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(CancelDownloadCommand))]
-    private bool _isInProgress;
-
-    [ObservableProperty]
-    private bool _hasUpdates;
-
     /// <summary>
     /// List of downloadable addons
     /// </summary>
-    public ImmutableList<IDownloadableAddon> DownloadableList
+    public ImmutableList<DownloadableAddonEntity> DownloadableList
     {
         get
         {
-            IEnumerable<IDownloadableAddon> result;
+            IEnumerable<DownloadableAddonEntity> result;
 
             if (FilterSelectedItem is FilterItemEnum.All)
             {
@@ -85,29 +79,10 @@ public ImmutableList<IDownloadableAddon> DownloadableList
     /// </summary>
     public float ProgressBarValue { get; set; }
 
-    /// <summary>
-    /// Currently selected downloadable campaign, map or mod
-    /// </summary>
-    [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(SelectedDownloadableDescription))]
-    [NotifyPropertyChangedFor(nameof(DownloadButtonText))]
-    [NotifyCanExecuteChangedFor(nameof(DownloadAddonCommand))]
-    private DownloadableAddonEntity? _selectedDownloadable;
-
-    /// <summary>
-    /// Currently selected downloadable campaign, map or mod
-    /// </summary>
-    [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(DownloadButtonText))]
-    private List<DownloadableAddonEntity>? _selectedDownloadableList;
-
-    [ObservableProperty]
-    private string _progressMessage = string.Empty;
-
     /// <summary>
     /// Description of the selected addon
     /// </summary>
-    public string SelectedDownloadableDescription => SelectedDownloadable is null ? string.Empty : SelectedDownloadable.ToMarkdownString();
+    public string SelectedDownloadableDescription => string.Empty; /*SelectedDownloadable is null ? string.Empty : SelectedDownloadable.ToMarkdownString();*/
 
     /// <summary>
     /// Text of the download button
@@ -116,19 +91,35 @@ public string DownloadButtonText
     {
         get
         {
-            if (SelectedDownloadableList is null or [])
+            if (SelectedDownloads is null or [])
             {
                 return "Download";
             }
             else
             {
-                return $"Download ({SelectedDownloadableList.Sum(x => x.FileSize).ToSizeString()})";
+                return $"Download ({SelectedDownloads.Sum(x => x.FileSize).ToSizeString()})";
             }
         }
     }
 
     public List<FilterItemEnum> FilterItems => [.. Enum.GetValues<FilterItemEnum>()];
 
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(CancelDownloadCommand))]
+    private bool _isInProgress;
+
+    [ObservableProperty]
+    private bool _hasUpdates;
+
+    /// <summary>
+    /// Currently selected downloadable campaigns, maps or mods
+    /// </summary>
+    [ObservableProperty]
+    private ObservableCollection<DownloadableAddonEntity> _selectedDownloads = [];
+
+    [ObservableProperty]
+    private string _progressMessage = string.Empty;
+
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(DownloadableList))]
     private FilterItemEnum _filterSelectedItem;
@@ -160,6 +151,7 @@ ILogger logger
 
         _installedAddonsProvider.AddonsChangedEvent += OnAddonChanged;
         _downloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;
+        SelectedDownloads.CollectionChanged += OnSelectedDownloadsChanged;
     }
 
 
@@ -204,7 +196,7 @@ private async Task UpdateAsync(bool? createNew)
 
             OnPropertyChanged(nameof(DownloadableList));
 
-            SelectedDownloadable = null;
+            SelectedDownloads.Clear();
         }
         catch (Exception ex)
         {
@@ -223,14 +215,17 @@ private async Task UpdateAsync(bool? createNew)
     [RelayCommand(CanExecute = nameof(DownloadSelectedAddonCanExecute))]
     private async Task DownloadAddon()
     {
+        DownloadableAddonEntity? _currentDownloadable = null;
+
         try
         {
-            if (SelectedDownloadableList is null or [])
+
+            if (SelectedDownloads is null or [])
             {
                 return;
             }
 
-            List<DownloadableAddonEntity> filesToDownload = [.. SelectedDownloadableList];
+            List<DownloadableAddonEntity> filesToDownload = [.. SelectedDownloads];
 
             IsInProgress = true;
 
@@ -242,6 +237,8 @@ private async Task DownloadAddon()
 
             foreach (var item in filesToDownload)
             {
+                _currentDownloadable = item;
+
                 if (_cancellationTokenSource.IsCancellationRequested)
                 {
                     ThrowHelper.ThrowOperationCanceledException();
@@ -268,7 +265,7 @@ private async Task DownloadAddon()
                 NotificationType.Error
                 );
 
-            _logger.LogCritical(ex, $"=== Error while downloading addon {SelectedDownloadable?.DownloadUrl} ===");
+            _logger.LogCritical(ex, $"=== Error while downloading addon {_currentDownloadable?.DownloadUrl} ===");
         }
         finally
         {
@@ -279,7 +276,7 @@ private async Task DownloadAddon()
             ProgressMessage = string.Empty;
         }
     }
-    private bool DownloadSelectedAddonCanExecute => SelectedDownloadable is not null;
+    private bool DownloadSelectedAddonCanExecute => true; /*SelectedDownloadable is not null;*/
 
 
     /// <summary>
@@ -319,6 +316,13 @@ private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)
         OnPropertyChanged(nameof(DownloadableList));
     }
 
+    private void OnSelectedDownloadsChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    {
+        OnPropertyChanged(nameof(SelectedDownloadableDescription));
+        OnPropertyChanged(nameof(DownloadButtonText));
+        DownloadAddonCommand.NotifyCanExecuteChanged();
+    }
+
     public enum FilterItemEnum
     {
         All,

src/Common.Client/Interfaces/IDownloadableAddonsProvider.cs

@@ -1,6 +1,6 @@
-using Common.Enums;
+using Common.Entities;
+using Common.Enums;
 using Common.Helpers;
-using Common.Interfaces;
 using System.Collections.Immutable;
 
 namespace Common.Client.Interfaces;
@@ -19,13 +19,13 @@ public interface IDownloadableAddonsProvider
     /// </summary>
     /// <param name="addon">Addon</param>
     /// <param name="cancellationToken">Cancellation token</param>
-    Task DownloadAddonAsync(IDownloadableAddon addon, CancellationToken cancellationToken);
+    Task DownloadAddonAsync(DownloadableAddonEntity addon, CancellationToken cancellationToken);
 
     /// <summary>
     /// Get a list of downloadable addons
     /// </summary>
     /// <param name="addonType">Addon type</param>
-    ImmutableList<IDownloadableAddon> GetDownloadableAddons(AddonTypeEnum addonType);
+    ImmutableList<DownloadableAddonEntity> GetDownloadableAddons(AddonTypeEnum addonType);
 
     /// <summary>
     /// Create downloadable addons cache

src/Common.Common/Entities/DownloadableAddonEntity.cs

@@ -1,12 +1,11 @@
 using Common.Enums;
 using Common.Helpers;
-using Common.Interfaces;
 using System.Text;
 using System.Text.Json.Serialization;
 
 namespace Common.Entities;
 
-public sealed class DownloadableAddonEntity : IDownloadableAddon
+public sealed class DownloadableAddonEntity
 {
     [JsonPropertyName("Id")]
     public required string Id { get; set; }