kram-profile - re-enable mergeFiles if option held

Instead of wiping the list, this combines the lists into one. Useful for opening or drag/drop multiple archives.
alecazam · Mar 17, 2024 · c7ba9f5 · c7ba9f5
1 parent b536046
commit c7ba9f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/kram-profile/kram-profile/File.swift b/kram-profile/kram-profile/File.swift
@@ -22,7 +22,7 @@ enum FileType {
     case Unknown
 }
 
-class File: Identifiable, /*Hashable, */ Equatable, Comparable
+class File: Identifiable, Hashable, Equatable, Comparable
 {
     // TODO: archive url relative to archive so not unqique if multiple archives dropped
     // but currently all lookup is by url, and not url + archive.  Just make sure to
@@ -69,6 +69,11 @@ class File: Identifiable, /*Hashable, */ Equatable, Comparable
         return lhs.id < rhs.id
     }
 
+    // Hashable
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+    }
+
     // call this when the file is loaded
     public func setLoadStamp()  {
         loadStamp = modStamp

diff --git a/kram-profile/kram-profile/kram_profileApp.swift b/kram-profile/kram-profile/kram_profileApp.swift
@@ -1678,16 +1678,16 @@ struct kram_profileApp: App {
             // for now wipe the old list
             if filesNew.count > 0 {
                 // turning this off for now, File must impl Hashable
-//                let mergeFiles = false
-//                
-//                if mergeFiles {
-//                    fileSearcher.files = Array(Set(fileSearcher.files + filesNew))
-//                }
-//                else 
-                //{
+                let mergeFiles = NSEvent.modifierFlags.contains(.option);
+
+                if mergeFiles {
+                    fileSearcher.files = Array(Set(fileSearcher.files + filesNew))
+                }
+                else
+                {
                     // reset the list
                     fileSearcher.files = filesNew
-                //}
+                }
 
                 fileSearcher.updateFilesSorted()