Merge pull request #4 from es-kumagai/support_file_selection

Support file selection

Author: es-kumagai

Sources/OpenTerminal/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

Sources/OpenTerminal/URL.swift

@@ -8,10 +8,42 @@
 
 import Foundation
 
+private let fileManager = FileManager()
+
 extension URL {
-	
+
 	var pathForAppleScriptWithEscapedSpace: String {
 
 		return "\(path.replacingOccurrences(of: " ", with: "\\\\ "))"
 	}
+	
+	var truncatedToDirectoryName: URL {
+		
+		var isDirectory: ObjCBool = false
+		var isFile: Bool {
+			
+			return !isDirectory.boolValue
+		}
+		
+		guard fileManager.fileExists(atPath: path, isDirectory: &isDirectory) else {
+			
+			// Return self if the url is not exists. This is an unexpected case.
+			return self
+		}
+		
+		guard isFile else {
+			
+			return self
+		}
+		
+		return deletingLastPathComponent()
+	}
+}
+
+extension Sequence where Element == URL {
+	
+	var uniquelySet: Set<Element> {
+		
+		return Set(self)
+	}
 }

Sources/OpenTerminal/main.swift

@@ -14,7 +14,7 @@ let finder = SBApplication(bundleIdentifier: "com.apple.Finder")! as FinderAppli
 let selection = finder.selection!
 let selectionItems = selection.get() as! Array<AnyObject>
 
-let fileUrls: Array<String>
+let filePaths: Array<String>
 
 if selectionItems.isEmpty {
 
@@ -23,31 +23,33 @@ if selectionItems.isEmpty {
 	let container = window.target!
 	let item = container.get() as! FinderItemProtocol
 
-	fileUrls = [item.url!]
+	filePaths = [item.url!]
 }
 else {
 
 	// This case is for launch from Finder directly.
-	fileUrls = selectionItems
+	filePaths = selectionItems
 		.compactMap { $0 as? FinderApplicationFileProtocol }
 		.compactMap { $0.url }
 }
 
-fileUrls
-	.compactMap { URL(string: $0) }
+filePaths
+	.compactMap { URL.init(string: $0) }
+	.compactMap { $0.truncatedToDirectoryName }
+	.uniquelySet
 	.forEach { url in
+	
+	do {
 
-		do {
-		
-			guard let terminal = settings.terminal else {
-			
-				throw OpenError.cannotSpecifyTargetTerminal
-			}
+		guard let terminal = settings.terminal else {
 
-			try terminal.open(url: url)
+			throw OpenError.cannotSpecifyTargetTerminal
 		}
-		catch {
 
-			alert(message: "\(error)")
-		}
+		try terminal.open(url: url)
+	}
+	catch {
+		
+		alert(message: "\(error)")
+	}
 }