Replace lstool for swift script.

Replaces lstool for a brief swift command-line tool. As much as lstool will be missed, this is enough for the purposes of this plug-in.

Author: Lord-Kamina

Applescript_Code.txt

@@ -27,21 +27,24 @@ on open location this_URL
 end open location
 tell application "Finder" to set thisPath to (POSIX path of (application file id "org.deluge.MagnetURIHandler" as string))
 log thisPath
-set lsToolRead to do shell script (quoted form of (thisPath & "/Contents/Resources/lstool") & " read url magnet")
-if (lsToolRead contains "Magnet Handler.app") then
+set lsToolRead to do shell script (quoted form of (thisPath & "/Contents/Resources/registerHandler") & " -check")
+log lsToolRead
+if (lsToolRead contains "org.deluge.magneturihandler") then
 	display dialog "Magnet Handler is already the default application to handle magnet URIs" buttons {"OK"} with title "Notification" with icon POSIX file (thisPath & "/Contents/Resources/deluge_magnet.icns")
 else
 	try
 		set dialogResult to display dialog "Magnet Handler has not been configured to handle magnet URIs.
 
 Would you like to do this now?" buttons {"Yes", "No"} default button "Yes" cancel button "No" with title "Notification" with icon POSIX file (thisPath & "/Contents/Resources/deluge_magnet.icns")
 	on error number -128
+		return
 	end try
 	try
+	on error number -128
+		return
 		if button returned of dialogResult is "Yes" then
-			do shell script (quoted form of (thisPath & "/Contents/Resources/lstool") & " write url magnet org.deluge.MagnetURIHandler")
+			do shell script (quoted form of (thisPath & "/Contents/Resources/registerHandler") & " -register")
 			display dialog "Magnet Handler has now been configured as the default application to handle magnet URIs" buttons {"OK"} with title "Notification" with icon POSIX file (thisPath & "/Contents/Resources/deluge_magnet.icns")
-			
 		end if
 	end try
 end if

Magnet Handler.app/Contents/Resources/Scripts/main.scpt

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf340
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }

Magnet Handler.app/Contents/Resources/description.rtfd/TXT.rtf

@@ -3,12 +3,35 @@
 import Foundation
 import Cocoa
 
-let currentHandler = LSCopyDefaultHandlerForURLScheme("magnet" as CFString)!.takeUnretainedValue() as String;
+func getArgument() -> String? {
+    if (2 > CommandLine.arguments.count) {
+        return nil;
+    }
+    else {
+        return CommandLine.arguments[1];
+    }
+}
+
+let command = getArgument() ?? "null";
+
+switch command {
+
+    case "-register":
+        let currentHandler = LSCopyDefaultHandlerForURLScheme("magnet" as CFString)!.takeUnretainedValue() as String;
+        
+        if ("org.deluge.magneturihandler" != currentHandler) {
+            LSSetDefaultHandlerForURLScheme("magnet" as CFString, "org.deluge.magneturihandler" as CFString);
+        }
+        else {
+            print("MagnetURIHandler is already registered to handle magnets.");
+        }
+    
+    case "-check":
+        
+    let currentHandler = LSCopyDefaultHandlerForURLScheme("magnet" as CFString)!.takeUnretainedValue() as String;
+    print(currentHandler);
+    
+    default:
+        print ("Usage: magnetHandler <command>, where <command> is one of:\n\n\t-register\t\t\t (Register MagnetURIHandler as the default handler for magnet:// URIs.)\n\t-check\t\t\t\t (Prints the bundle id for the application currently registered to handle magnet URIs)\n\nmagnetHandler with ether an invalid <command> or without arguments will print this message.");
 
-if ("org.deluge.magneturihandler" != currentHandler) {
-    print("MagnetURIHandler is not registered to handle magnets; fixing that now.");
-    LSSetDefaultHandlerForURLScheme("magnet" as CFString, "org.deluge.magneturihandler" as CFString);
 }
-else {
-    print("MagnetURIHandler is already registered to handle magnets.");
-}