From af704250e2876f1c1bb8cb94c6809001a618ff9f Mon Sep 17 00:00:00 2001
From: Aaron Lindsay <aaron@aclindsay.com>
Date: Tue, 7 Feb 2017 20:59:52 -0500
Subject: [PATCH] lua: Fetch reports from directory

---
 reports.go       | 29 ++++++++++++++++-------------
 reports/test.lua |  8 ++++++++
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 reports/test.lua

diff --git a/reports.go b/reports.go
index 903bb0c..034eebd 100644
--- a/reports.go
+++ b/reports.go
@@ -5,6 +5,7 @@ import (
 	"github.com/yuin/gopher-lua"
 	"log"
 	"net/http"
+	"path"
 	"time"
 )
 
@@ -28,6 +29,15 @@ func ReportHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if r.Method == "GET" {
+		var reportname string
+		n, err := GetURLPieces(r.URL.Path, "/report/%s", &reportname)
+		if err != nil || n != 1 {
+			WriteError(w, 3 /*Invalid Request*/)
+			return
+		}
+
+		reportpath := path.Join(baseDir, "reports", reportname+".lua")
+
 		// Create a new LState without opening the default libs for security
 		L := lua.NewState(lua.Options{SkipOpenLibs: true})
 		defer L.Close()
@@ -53,7 +63,9 @@ func ReportHandler(w http.ResponseWriter, r *http.Request) {
 				NRet:    0,
 				Protect: true,
 			}, lua.LString(pair.n)); err != nil {
-				panic(err)
+				WriteError(w, 999 /*Internal Error*/)
+				log.Print(err)
+				return
 			}
 		}
 
@@ -62,21 +74,12 @@ func ReportHandler(w http.ResponseWriter, r *http.Request) {
 		luaRegisterBalances(L)
 		luaRegisterDates(L)
 
-		err := L.DoString(`accounts = account.get_all()
-last_parent = nil
-for id, account in pairs(accounts) do
-	parent = account.parent
-	print(account, parent, account.security)
-	if parent then
-		print(last_parent, parent)
-		print("parent equals last:", last_parent == parent)
-		last_parent = parent
-	end
-end
-`)
+		err = L.DoFile(reportpath)
 
 		if err != nil {
+			WriteError(w, 3 /*Invalid Request*/)
 			log.Print("lua:" + err.Error())
+			return
 		}
 	}
 }
diff --git a/reports/test.lua b/reports/test.lua
new file mode 100644
index 0000000..e81d3d6
--- /dev/null
+++ b/reports/test.lua
@@ -0,0 +1,8 @@
+accounts = get_accounts()
+
+for id, account in pairs(accounts) do
+	print(account, account.security)
+	a = account:balance(date.new("2015-12-01"), date.new("2017-12-01"))
+	b = account:balance(date.new("2015-06-01"), date.new("2015-12-01"))
+	print(a, b, a+b, account:balance())
+end