From fdefed663faff5ac466943efba25d87090ba8cbb Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Fri, 29 Aug 2014 09:11:36 +0200
Subject: [PATCH] Some more lua-scripts and library fixes from iceman,
 including more default keys

---
 client/lualibs/html_dumplib.lua    | 74 +++++++++++++++++++++++++++---
 client/lualibs/mf_default_keys.lua | 17 ++++++-
 client/scripts/dumptoemul.lua      |  2 +-
 3 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index e730920c..b8c7ccaa 100644
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -8,10 +8,17 @@ bin = require('bin')
 --- 
 -- A debug printout-function
 local function dbg(args)
-	if DEBUG then
+	
+    if type(args) == "table" then
+		local i = 1
+		while args[i] do
+			print("###", args[i])
+			i = i+1
+		end
+	else
 		print("###", args)
-	end
-end 
+	end	
+end	
 --- 
 -- This is only meant to be used when errors occur
 local function oops(err)
@@ -40,20 +47,38 @@ local function save_HTML(javascript, filename)
 
 end
 
-
+local function save_BIN(data, filename)
+	-- Open the output file
+	
+	local outfile = io.open(filename, "wb")
+	if outfile == nil then 
+		return oops(string.format("Could not write to file %s",tostring(filename)))
+	end
+	
+	-- Write the data into it
+	local i = 1
+	while data[i] do
+		outfile:write(data[i])
+		i = i+1
+	end
+	
+	io.close(outfile)
+	return filename   
+end
 
 local function convert_ascii_dump_to_JS(infile)
 	local t = infile:read("*all")
 	
 	local output = "[";
 	for line in string.gmatch(t, "[^\n]+") do 
-		output = output .. "'"..line.."',\n"
+	    if string.byte(line,1) ~= string.byte("+",1) then
+                  output = output .. "'"..line.."',\n"
+        end
 	end
 	output = output .. "]"
 	return output
 end
 
-
 local function convert_binary_dump_to_JS(infile, blockLen)
 	 local bindata = infile:read("*all")
 	 len = string.len(bindata)
@@ -78,6 +103,21 @@ local function convert_binary_dump_to_JS(infile, blockLen)
 	return js
 end
 
+local function convert_ascii_dump_to_BIN(infile)
+	local t = infile:read("*all")
+	
+	local output = {};
+	for line in string.gmatch(t, "[^\n]+") do 
+		if string.byte(line) ~= string.byte("+") then
+			for c in (line or ''):gmatch('..') do
+				output[#output+1] = string.char( tonumber(c,16) )
+			end
+		end
+	end
+	return output
+end
+
+
 ---
 -- Converts a .eml-file into a HTML/Javascript file. 
 -- @param input the file to convert
@@ -118,7 +158,27 @@ local function convert_bin_to_html(input, output, blockLen)
 	return save_HTML(javascript, output )
 end
 
+--- Converts a eml dump into a binary file
+-- @param input the file containing the eml-dump  (defaults to dumpdata.eml)
+-- @param output the file to write to  ( defaults to dumpdata.bin)
+local function convert_eml_to_bin(input, output)
+	input = input or 'dumpdata.eml'
+	output = output or 'dumpdata.bin'
+
+	local infile = io.open(input, "rb")
+	if infile == nil then 
+		return oops(string.format("Could not read file %s",tostring(input)))
+	end
+	-- Read file, get BIN
+	local data = convert_ascii_dump_to_BIN(infile)
+	io.close(infile)
+
+	return save_BIN(data, output )
+end
+
+
 return {
 	convert_bin_to_html = convert_bin_to_html,
-	convert_eml_to_html = convert_eml_to_html,	
+	convert_eml_to_html = convert_eml_to_html,
+    convert_eml_to_bin = convert_eml_to_bin,	
 }
diff --git a/client/lualibs/mf_default_keys.lua b/client/lualibs/mf_default_keys.lua
index f6264a33..4859ff0c 100644
--- a/client/lualibs/mf_default_keys.lua
+++ b/client/lualibs/mf_default_keys.lua
@@ -126,6 +126,21 @@ local _keys = {
     'eeeeeeeeeeee',
     '0123456789ab',
     '123456789abc',
+	
+	--[[
+    The keys below are taken from from https://github.com/4ZM/mfterm/blob/master/dictionary.txt
+    --]]
+	
+	'abcdef123456', -- Key from ladyada.net
+
+	'000000000001',
+	'000000000002',
+	'00000000000a',
+	'00000000000b',
+	'100000000000',
+	'200000000000',
+	'a00000000000',
+	'b00000000000',	
   }
 
 ---
@@ -148,4 +163,4 @@ local function uniq(list)
     return foobar
 end
 
-return uniq(_keys)
\ No newline at end of file
+return uniq(_keys)
diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index f4f91931..f9b71509 100644
--- a/client/scripts/dumptoemul.lua
+++ b/client/scripts/dumptoemul.lua
@@ -13,7 +13,7 @@ by the emulator
 Arguments:
 	-h 				This help
 	-i <file>		Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used	
-	-o <filename>	Speciies the output file. If omitted, <uid>.eml is used. 	
+	-o <filename>	Specifies the output file. If omitted, <uid>.eml is used. 	
 
 ]]
 
-- 
2.39.2