Preserve file URLs when pasting without formatting

Fixes p0deje#962
columbusux · Nov 28, 2024 · e09fb0d · e09fb0d
1 parent 23a2f41
commit e09fb0d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/Designs/App-Store/01-Main.pxd b/Designs/App-Store/01-Main.pxd
diff --git a/Maccy/Clipboard.swift b/Maccy/Clipboard.swift
@@ -78,15 +78,7 @@ class Clipboard {
     var contents = item.contents
 
     if removeFormatting {
-      let stringContents = contents.filter({
-        NSPasteboard.PasteboardType($0.type) == .string
-      })
-
-      // If there is no string representation of data,
-      // behave like we didn't have to remove formatting.
-      if !stringContents.isEmpty {
-        contents = stringContents
-      }
+      contents = clearFormatting(contents)
     }
 
     for content in contents {
@@ -296,4 +288,24 @@ class Clipboard {
     NSApp.activate(ignoringOtherApps: true)
     NSApp.hide(self)
   }
+
+  private func clearFormatting(_ contents: [HistoryItemContent]) -> [HistoryItemContent] {
+    var newContents: [HistoryItemContent] = contents
+    let stringContents = contents.filter { NSPasteboard.PasteboardType($0.type) == .string }
+
+    // If there is no string representation of data,
+    // behave like we didn't have to remove formatting.
+    if !stringContents.isEmpty {
+      newContents = stringContents
+
+      // Preserve file URLs.
+      // https://github.com/p0deje/Maccy/issues/962
+      let fileURLContents = contents.filter { NSPasteboard.PasteboardType($0.type) == .fileURL }
+      if !fileURLContents.isEmpty {
+        newContents += fileURLContents
+      }
+    }
+
+    return newContents
+  }
 }
diff --git a/MaccyTests/ClipboardTests.swift b/MaccyTests/ClipboardTests.swift
@@ -224,6 +224,7 @@ class ClipboardTests: XCTestCase {
   func testCopyWithoutFormatting() {
     let contents = [
       HistoryItemContent(type: stringType.rawValue, value: "foo".data(using: .utf8)!),
+      HistoryItemContent(type: fileURLType.rawValue, value: "file://foo.bar".data(using: .utf8)!),
       HistoryItemContent(type: rtfType.rawValue,
                          value: coloredString.rtf(from: NSRange(location: 0, length: coloredString.length),
                                                   documentAttributes: [:]))
@@ -234,6 +235,7 @@ class ClipboardTests: XCTestCase {
     clipboard.copy(item, removeFormatting: true)
     XCTAssertEqual(pasteboard.string(forType: .string), "foo")
     XCTAssertEqual(pasteboard.string(forType: .fromMaccy), "")
+    XCTAssertEqual(pasteboard.string(forType: .fileURL), "file://foo.bar")
     XCTAssertNil(pasteboard.data(forType: .rtf))
   }