mac/swift: move isUrl check to String extension

der richter committed 1 year ago

Commit c75779d1 parent 6b0e4f72 files · +14 −12Browse files

Unified · Split

2 files

@@ -52,6 +52,19 @@ extension NSEvent.ModifierFlags { · 51 unmodified lines
52	public static let optionRight: NSEvent.ModifierFlags = .init(rawValue: UInt(NX_DEVICERALTKEYMASK))	52	public static let optionRight: NSEvent.ModifierFlags = .init(rawValue: UInt(NX_DEVICERALTKEYMASK))
53	}	53	}
54		54
		55	extension String {
		56	func isUrl() -> Bool {
		57	guard let regex = try? NSRegularExpression(pattern: "^(https?\|ftp)://[^\\s/$.?#].[^\\s]*$",
		58	options: .caseInsensitive) else {
		59	return false
		60	}
		61	let isUrl = regex.numberOfMatches(in: self,
		62	options: [],
		63	range: NSRange(location: 0, length: self.count))
		64	return isUrl > 0
		65	}
		66	}
		67
55	extension mp_keymap {	68	extension mp_keymap {
56	init(_ f: Int, _ t: Int32) {	69	init(_ f: Int, _ t: Int32) {
57	self.init(from: Int32(f), to: t)	70	self.init(from: Int32(f), to: t)

         return []
     }
-    func isURL(_ str: String) -> Bool {
-        guard let regex = try? NSRegularExpression(pattern: "^(https?|ftp)://[^\\s/$.?#].[^\\s]*$",
-                                                   options: .caseInsensitive) else {
-            return false
-        }
-        let isURL = regex.numberOfMatches(in: str,
-                                     options: [],
-                                       range: NSRange(location: 0, length: str.count))
-        return isURL > 0
-    }
     override func performDragOperation(_ sender: NSDraggingInfo) -> Bool {
         let pb = sender.draggingPasteboard
         guard let types = pb.types else { return false }
             files = str.components(separatedBy: "\n").compactMap {
                 let url = $0.trimmingCharacters(in: .whitespacesAndNewlines)
                 let path = (url as NSString).expandingTildeInPath
-                if isURL(url) { return url }
+                if url.isUrl() { return url }
                 if path.starts(with: "/") { return path }
                 return nil
             }

Keyboard shortcuts