drag on files too

Author: mohnjiles

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFile.cs

@@ -55,6 +55,9 @@ public partial class CheckpointFile : ViewModelBase
     [ObservableProperty]
     private CivitModelType modelType;
 
+    [ObservableProperty]
+    private CheckpointFolder parentFolder;
+
     public string FileName => Path.GetFileName(FilePath);
 
     public ObservableCollection<string> Badges { get; set; } = new();
@@ -220,6 +223,7 @@ private void OpenOnCivitAi()
     /// - {filename}.cm-info.json (connected model info)
     /// </summary>
     public static IEnumerable<CheckpointFile> FromDirectoryIndex(
+        CheckpointFolder parentFolder,
         string directory,
         SearchOption searchOption = SearchOption.TopDirectoryOnly
     )
@@ -268,6 +272,8 @@ public static IEnumerable<CheckpointFile> FromDirectoryIndex(
                 checkpointFile.PreviewImagePath = Assets.NoImage.ToString();
             }
 
+            checkpointFile.ParentFolder = parentFolder;
+
             yield return checkpointFile;
         }
     }
@@ -329,13 +335,14 @@ var file in Directory.EnumerateFiles(
     /// Index with progress reporting.
     /// </summary>
     public static IEnumerable<CheckpointFile> FromDirectoryIndex(
+        CheckpointFolder parentFolder,
         string directory,
         IProgress<ProgressReport> progress,
         SearchOption searchOption = SearchOption.TopDirectoryOnly
     )
     {
         var current = 0ul;
-        foreach (var checkpointFile in FromDirectoryIndex(directory, searchOption))
+        foreach (var checkpointFile in FromDirectoryIndex(parentFolder, directory, searchOption))
         {
             current++;
             progress.Report(new ProgressReport(current, "Indexing", checkpointFile.FileName));

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFolder.cs

@@ -575,7 +575,7 @@ private IEnumerable<CheckpointFile> GetCheckpointFiles()
             return Enumerable.Empty<CheckpointFile>();
         }
 
-        return CheckpointFile.FromDirectoryIndex(DirectoryPath);
+        return CheckpointFile.FromDirectoryIndex(this, DirectoryPath);
     }
 
     /// <summary>

StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml

@@ -44,7 +44,7 @@
         <!-- Checkpoint File Card -->
         <DataTemplate DataType="{x:Type checkpointManager:CheckpointFile}" x:Key="CheckpointFileDataTemplate">
             <Border
-                DragDrop.AllowDrop="False"
+                DragDrop.AllowDrop="True"
                 Background="Transparent"
                 BorderThickness="2"
                 Margin="4">
@@ -400,10 +400,10 @@
             HorizontalAlignment="Right"
             Margin="16,0"
             Orientation="Horizontal">
-            <TextBox Margin="16, 16"
+            <TextBox Margin="8, 16"
                      Watermark="{x:Static lang:Resources.Action_Search}"
                      Height="16"
-                     MinWidth="150"
+                     MinWidth="220"
                      KeyDown="InputElement_OnKeyDown"
                      Text="{Binding SearchFilter, Mode=TwoWay}">
                 <TextBox.InnerRightContent>
@@ -459,6 +459,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Grid.Row="1"
+            x:Name="MainScrollViewer"
             HorizontalScrollBarVisibility="Disabled"
             VerticalScrollBarVisibility="Auto">
             <Grid>

StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.VisualTree;
 using DynamicData.Binding;
 using StabilityMatrix.Avalonia.Controls;
 using StabilityMatrix.Avalonia.ViewModels;
+using StabilityMatrix.Avalonia.ViewModels.CheckpointManager;
 using StabilityMatrix.Core.Attributes;
+using StabilityMatrix.Core.Models.FileInterfaces;
 using CheckpointFolder = StabilityMatrix.Avalonia.ViewModels.CheckpointManager.CheckpointFolder;
 
 namespace StabilityMatrix.Avalonia.Views;
@@ -59,12 +62,36 @@ private void InvalidateRepeater()
         }
     }
 
-    private static async void OnDrop(object? sender, DragEventArgs e)
+    private async void OnDrop(object? sender, DragEventArgs e)
     {
         var sourceDataContext = (e.Source as Control)?.DataContext;
-        if (sourceDataContext is CheckpointFolder folder)
+        switch (sourceDataContext)
         {
-            await folder.OnDrop(e);
+            case CheckpointFolder folder:
+            {
+                if (e.Data.Get("Context") is not CheckpointFile file)
+                    return;
+
+                var filePath = new FilePath(file.FilePath);
+                if (filePath.Directory?.FullPath != folder.DirectoryPath)
+                {
+                    await folder.OnDrop(e);
+                }
+                break;
+            }
+            case CheckpointFile file:
+            {
+                if (e.Data.Get("Context") is not CheckpointFile dragFile)
+                    return;
+
+                var parentFolder = file.ParentFolder;
+                var dragFilePath = new FilePath(dragFile.FilePath);
+                if (dragFilePath.Directory?.FullPath != parentFolder.DirectoryPath)
+                {
+                    await parentFolder.OnDrop(e);
+                }
+                break;
+            }
         }
     }
 
@@ -77,7 +104,7 @@ private static void OnDragExit(object? sender, DragEventArgs e)
         }
     }
 
-    private static void OnDragEnter(object? sender, DragEventArgs e)
+    private void OnDragEnter(object? sender, DragEventArgs e)
     {
         // Only allow Copy or Link as Drop Operations.
         e.DragEffects &= DragDropEffects.Copy | DragDropEffects.Link;
@@ -90,10 +117,29 @@ private static void OnDragEnter(object? sender, DragEventArgs e)
 
         // Forward to view model
         var sourceDataContext = (e.Source as Control)?.DataContext;
-        if (sourceDataContext is CheckpointFolder folder)
+        switch (sourceDataContext)
         {
-            folder.IsExpanded = true;
-            folder.IsCurrentDragTarget = true;
+            case CheckpointFolder folder:
+            {
+                folder.IsExpanded = true;
+                if (e.Data.Get("Context") is not CheckpointFile file)
+                    return;
+
+                var filePath = new FilePath(file.FilePath);
+                folder.IsCurrentDragTarget = filePath.Directory?.FullPath != folder.DirectoryPath;
+                break;
+            }
+            case CheckpointFile file:
+            {
+                if (e.Data.Get("Context") is not CheckpointFile dragFile)
+                    return;
+
+                var parentFolder = file.ParentFolder;
+                var dragFilePath = new FilePath(dragFile.FilePath);
+                parentFolder.IsCurrentDragTarget =
+                    dragFilePath.Directory?.FullPath != parentFolder.DirectoryPath;
+                break;
+            }
         }
     }