Remake with handlers for a more readable decision tree

Author: vitorgalvao

custom_iterm_script.applescript

@@ -1,23 +1,54 @@
--- Change this property to true to always use a new window
+-- Set this property to true to always open in a new window
 property open_in_new_window : false
 
-on alfred_script(q)
-	tell application "iTerm"
-		if application "iTerm" is running then
-			if open_in_new_window is true then
-				create window with default profile
-			else
-				try
-					tell the first window to create tab with default profile
-				on error
-					create window with default profile
-				end try
-			end if
-		end if
+-- Handlers
+on new_window()
+	tell application "iTerm" to create window with default profile
+end new_window
+
+on new_tab()
+	tell application "iTerm" to tell the first window to create tab with default profile
+end new_tab
+
+on call_forward()
+	tell application "iTerm" to activate
+end call_forward
+
+on is_running()
+	application "iTerm" is running
+end is_running
 
-		delay 0.1 -- If we do not wait, the command may fail to send
+on has_windows()
+	if not is_running() then return false
+	if windows of application "iTerm" is {} then return false
+	true
+end has_windows
 
-		tell the first window to tell current session to write text q
-		activate
-	end tell
-end alfred_script
+on send_text(custom_text)
+	-- iTerm may try to write text before a window exists, so wait for it
+	repeat until has_windows()
+		delay 0.1
+	end repeat
+	
+	tell application "iTerm" to tell the first window to tell current session to write text custom_text
+end send_text
+
+-- Main
+on alfred_script(query)
+	if has_windows() then
+		if open_in_new_window then
+			new_window()
+		else
+			new_tab()
+		end if
+	else
+		if is_running() then
+			new_window()
+		else
+			call_forward()
+		end if
+	end if
+	
+	send_text(query)
+	call_forward()
+end alfred_script