Set up the file tree view to use the old tree view interfaces.

MeltyPlayer · Dec 19, 2024 · 634a702 · 634a702
1 parent 795fb5a
commit 634a702
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 50 deletions.
diff --git a/FinModelUtility/Fin/Fin/src/io/bundles/AnnotatedFileBundleExtensions.cs b/FinModelUtility/Fin/Fin/src/io/bundles/AnnotatedFileBundleExtensions.cs
@@ -0,0 +1,16 @@
+namespace fin.io.bundles;
+
+public static class AnnotatedFileBundleExtensions {
+  public static bool IsOfType<TSpecificFile>(
+      this IAnnotatedFileBundle file,
+      out IAnnotatedFileBundle<TSpecificFile> outFile)
+      where TSpecificFile : IFileBundle {
+    if (file is IAnnotatedFileBundle<TSpecificFile>) {
+      outFile = (IAnnotatedFileBundle<TSpecificFile>) file;
+      return true;
+    }
+
+    outFile = default;
+    return false;
+  }
+}
diff --git a/...rsalAssetTool/UniversalAssetTool.Ui.Avalonia/common/treeViews/FileBundleTreeViewModels.cs b/...rsalAssetTool/UniversalAssetTool.Ui.Avalonia/common/treeViews/FileBundleTreeViewModels.cs
@@ -10,6 +10,7 @@
 using fin.model.io;
 using fin.scene;
 using fin.util.asserts;
+using fin.util.linq;
 
 using grezzo.api;
 
@@ -18,6 +19,7 @@
 using ObservableCollections;
 
 using uni.ui.avalonia.ViewModels;
+using uni.ui.winforms.common.fileTreeView;
 
 namespace uni.ui.avalonia.common.treeViews;
 
@@ -81,13 +83,17 @@ public class FileBundleTreeViewModelForDesigner()
     ]);
 
 // Node types
+public abstract class BFileBundleNode(string text) : ViewModelBase, IFileTreeNode {
+  public string Text => text;
+  public IFileTreeParentNode? Parent => null;
+}
+
 public class FileBundleDirectoryNode
-    : ViewModelBase, IFileBundleNode {
+    : BFileBundleNode, IFileBundleNode, IFileTreeParentNode {
   private readonly IReadOnlyList<IFileBundleNode>? subNodes_;
 
-  private readonly
-      ISynchronizedView<IFileBundleNode,
-          IFileBundleNode>? filteredSubNodes_;
+  private readonly ISynchronizedView<IFileBundleNode,
+      IFileBundleNode>? filteredSubNodes_;
 
   public FileBundleDirectoryNode(
       string label,
@@ -98,7 +104,7 @@ public FileBundleDirectoryNode(
   public FileBundleDirectoryNode(
       string label,
       IReadOnlyList<IFileBundleNode>? subNodes,
-      IReadOnlySet<string> filterTerms) {
+      IReadOnlySet<string> filterTerms) : base(label) {
     this.subNodes_ = subNodes;
     this.Label = label;
     this.FilterTerms = filterTerms;
@@ -141,10 +147,14 @@ public IFilter<IAnnotatedFileBundle>? Filter {
   }
 
   public bool InFilter { get; private set; } = true;
+
+  public IEnumerable<IFileTreeNode> ChildNodes
+    => this.subNodes_.Cast<IFileTreeNode>();
 }
 
-public class FileBundleLeafNode(string label, IAnnotatedFileBundle data)
-    : ViewModelBase, IFileBundleNode {
+public class FileBundleLeafNode(string label,
+                                IAnnotatedFileBundle data)
+    : BFileBundleNode(label), IFileBundleNode, IFileTreeLeafNode {
   public INotifyCollectionChangedSynchronizedViewList<
       IFileBundleNode>? FilteredSubNodes => null;
 
@@ -156,7 +166,8 @@ public INotifyCollectionChangedSynchronizedViewList<
   };
 
   public IAnnotatedFileBundle Value => data;
-  public string Label { get; } = label;
+  public IAnnotatedFileBundle File => data;
+  public string Label => label;
 
   public IFilter<IAnnotatedFileBundle>? Filter {
     set => this.InFilter = value?.MatchesNode(this) ?? true;
@@ -168,7 +179,7 @@ public IFilter<IAnnotatedFileBundle>? Filter {
 public class FileBundleFilter(IReadOnlySet<string> tokens)
     : IFilter<IAnnotatedFileBundle> {
   public static FileBundleFilter? FromText(string? text) {
-    var tokens = text?.Split(new[] { ' ', '\t', '\n' },
+    var tokens = text?.Split([' ', '\t', '\n'],
                              StringSplitOptions.RemoveEmptyEntries |
                              StringSplitOptions.TrimEntries);
     return tokens?.Length > 0

diff --git a/...tTool/UniversalAssetTool.Ui/src/winforms/common/fileTreeView/FileTreeView_LeafFileNode.cs b/...tTool/UniversalAssetTool.Ui/src/winforms/common/fileTreeView/FileTreeView_LeafFileNode.cs
@@ -20,19 +20,4 @@ public LeafFileNode(ParentFileNode parent,
     public IAnnotatedFileBundle File { get; }
     public override string FullName => this.File.FileBundle.TrueFullPath;
   }
-}
-
-public static class AnnotatedFileBundleExtensions {
-  public static bool IsOfType<TSpecificFile>(
-      this IAnnotatedFileBundle file,
-      out IAnnotatedFileBundle<TSpecificFile> outFile)
-      where TSpecificFile : IFileBundle {
-      if (file is IAnnotatedFileBundle<TSpecificFile>) {
-        outFile = (IAnnotatedFileBundle<TSpecificFile>) file;
-        return true;
-      }
-
-      outFile = default;
-      return false;
-    }
 }
diff --git a/...ool/UniversalAssetTool.Ui/src/winforms/common/fileTreeView/FileTreeView_ParentFileNode.cs b/...ool/UniversalAssetTool.Ui/src/winforms/common/fileTreeView/FileTreeView_ParentFileNode.cs
@@ -42,27 +42,6 @@ public LeafFileNode AddChild(IAnnotatedFileBundle file,
     public IEnumerable<IFileTreeNode> ChildNodes
       => this.filterNode.Children.Select(fuzzyNode => fuzzyNode.Data);
 
-    public IEnumerable<IAnnotatedFileBundle> GetFiles(bool recursive) {
-        var children = this.ChildNodes.OfType<IFileTreeLeafNode>()
-                           .Select(fileNode => fileNode.File);
-        return !recursive
-            ? children
-            : children.Concat(
-                this.ChildNodes
-                    .OfType<IFileTreeParentNode>()
-                    .SelectMany(parentNode
-                                    => parentNode
-                                        .GetFiles(
-                                            true)));
-      }
-
-    public IEnumerable<IAnnotatedFileBundle<TSpecificFile>> GetFilesOfType<
-        TSpecificFile>(bool recursive) where TSpecificFile : IFileBundle
-      => this.GetFiles(recursive)
-             .SelectWhere<IAnnotatedFileBundle,
-                 IAnnotatedFileBundle<TSpecificFile>>(
-                 AnnotatedFileBundleExtensions.IsOfType);
-
     public void Expand() => this.treeNode.Expand();
   }
 }
diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/common/FileTreeViewInterfaces.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/common/FileTreeViewInterfaces.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 
 using fin.io.bundles;
+using fin.util.linq;
 
 namespace uni.ui.winforms.common.fileTreeView;
 
@@ -26,11 +27,26 @@ public interface IFileTreeNode {
 public interface IFileTreeParentNode : IFileTreeNode {
   IEnumerable<IFileTreeNode> ChildNodes { get; }
 
-  IEnumerable<IAnnotatedFileBundle> GetFiles(bool recursive);
-
-  IEnumerable<IAnnotatedFileBundle<TSpecificFile>>
-      GetFilesOfType<TSpecificFile>(bool recursive)
-      where TSpecificFile : IFileBundle;
+  IEnumerable<IAnnotatedFileBundle> GetFiles(bool recursive) {
+    var children = this.ChildNodes.OfType<IFileTreeLeafNode>()
+                       .Select(fileNode => fileNode.File);
+    return !recursive
+        ? children
+        : children.Concat(
+            this.ChildNodes
+                .OfType<IFileTreeParentNode>()
+                .SelectMany(parentNode
+                                => parentNode
+                                    .GetFiles(
+                                        true)));
+  }
+
+  IEnumerable<IAnnotatedFileBundle<TSpecificFile>> GetFilesOfType<
+      TSpecificFile>(bool recursive) where TSpecificFile : IFileBundle
+    => this.GetFiles(recursive)
+           .SelectWhere<IAnnotatedFileBundle,
+               IAnnotatedFileBundle<TSpecificFile>>(
+               AnnotatedFileBundleExtensions.IsOfType);
 }
 
 public interface IFileTreeLeafNode : IFileTreeNode {