View difference between Paste ID: wQ1aUnpU and 53QyFfHt

 -- FileHider
 -- By KillaVanilla
 -- CLI by randomdude999
 
 local args = {...}
 
-	print("FileHider - A file encryption tool")
+
-	print("Usage: "..fs.getName(shell.getRunningProgram()).." [target]")
+	print("FileHiderCLI - A command-line file encryption tool")
 	print("Usage: "..fs.getName(shell.getRunningProgram()).." <file> <encrypt | decrypt> <key> <init. vector> <output>")
 	return
 end
 
-	print("Target file "..args[1].." does not exist!")
+
 	error("File "..args[1].." does not exist",0)
 end
 
 -- Download the AES API if we don't already have it:
 
-if not fs.exists("AES") then
+if not fs.exists("/.apis/AES") then
 	local webHandle = http.get("http://pastebin.com/raw.php?i=rCYDnCxn")
 	if webHandle then
 		local apiData = webHandle.readAll()
 		webHandle.close()
-		local apiHandle = fs.open("AES", "w")
+		local apiHandle = fs.open("/.apis/AES", "w")
 		apiHandle.write(apiData)
 		apiHandle.close()
 	else
-		print("Could not retrieve AES API!")
+		error("Could not retrieve AES API.\nMake sure Internet connection is available.")
-		print("Ensure that the HTTP API is enabled.")
+
-		return
+
 
 os.loadAPI("AES")
 
 local function getParam(param)
 	local key = {}
-local function selectParameter(parameterName)
+	local keyStr = args[param]
-	local x,y = term.getCursorPos()
+
 		if #keyStr > 16 then
-	local keyStr = ""
+			error("Key too long. (Must be smaller than or equal to 16)",0)
 		else
-		term.setCursorPos(1,y)
+
-		term.clearLine()
+
-		term.setCursorPos(1,y+1)
+
-		term.clearLine()
+
-		term.setCursorPos(1,y)
+
-		print("Please type in the "..parameterName..":")
+
-		write(">")
+
-		keyStr = read()
+
 		end
-			print("Please type in a valid "..parameterName..".")
+
-			os.sleep(1.5)
+
-			term.setCursorPos(1, y+2)
+
-			term.clearLine()
+
 local key, keyStr = getParam(3)
 local iv, ivStr = getParam(4)
 local outputFile = args[5]
 local fData = {}
 local blocks = {}
 local blockNum = 1
 
 local fHandle = fs.open(args[1], "rb")
 while true do
 	local byte = fHandle.read()
 	if byte then
 		if byte > 0xFF then
 			local t1 = bit.band(byte, 0x000000FF)
 			local t2 = bit.brshift(bit.band(byte, 0x0000FF00), 8)
-local doDecrypt = false
+
-local sX, sY = term.getSize()
+
-local key, keyStr = selectParameter("encryption key")
+
-local iv, ivStr = selectParameter("initalization vector")
+
 			if t3 ~= 0 then
 				table.insert(fData, t3)
 			end
 			if t4 ~= 0 then
 				table.insert(fData, t4)
 			end
 		else
 			table.insert(fData, byte)
 		end
 	else
 		break
 	end
 end
 fHandle.close()
 
 if args[2] == "encrypt" then
 	-- Insert the signature:
 	table.insert(fData, 1, string.byte("A"))
 	table.insert(fData, 1, string.byte("T"))
 	table.insert(fData, 1, string.byte("A"))
 	table.insert(fData, 1, string.byte("D"))
 	local fileName = args[5]
 	local bytes = AES.encrypt_bytestream(fData, key, iv)
 	local fHandle = fs.open(fileName, "wb")
 	for byte=1, #bytes do
 		fHandle.write(bytes[byte])
 	end
 	fHandle.close()
 elseif args[2] == "decrypt" then
 	local bytes = AES.decrypt_bytestream(fData, key, iv)
 	if string.char( bytes[1], bytes[2], bytes[3], bytes[4] ) == "DATA" then
-	term.clear()
+		local fileName = args[5]
-	term.setCursorPos(1,1)
+
-	print("Options")
+
-	print("Using key: "..keyStr)
+
-	print("Using IV: "..ivStr)
+
-	print("Size: "..#fData.." bytes, "..math.ceil(#fData/16).." blocks")
+
-	print(string.rep("=", sX))
+
-	print("1 - Encrypt")
+		error("Decryption failed. Is the key / init. vector incorrect, or was the file encrypted with this tool?\n(Technical info: First 4 bytes are not equal to \"DATA\")",0)
-	print("2 - Decrypt")
+
-	print("3 - Reselect Key")
+
-	print("4 - Reselect IV")
+	error("2nd parameter should be either encrypt or decrypt.")
-	print("5 - Exit")
+