From 86bb73a4725d5bf95060bc28da3d3f89660d4c9e Mon Sep 17 00:00:00 2001
From: "Colin T.A. Gray" <colinta@gmail.com>
Date: Thu, 10 Aug 2017 09:29:02 -0600
Subject: [PATCH] move more code into 'loadRequest' (accepts string, opens
 file, reads json)

---
 commands.go | 14 +-------------
 wuzz.go     | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/commands.go b/commands.go
index 1f53840..d08d52e 100644
--- a/commands.go
+++ b/commands.go
@@ -52,19 +52,7 @@ var COMMANDS map[string]func(string, *App) CommandFunc = map[string]func(string,
 				func(g *gocui.Gui, _ *gocui.View) error {
 					defer a.closePopup(g, SAVE_DIALOG_VIEW)
 					loadLocation := getViewValue(g, SAVE_DIALOG_VIEW)
-
-					requestJson, ioErr := ioutil.ReadFile(loadLocation)
-					if ioErr != nil {
-						return ioErr
-					}
-
-					var requestMap map[string]string
-					jsonErr := json.Unmarshal(requestJson, &requestMap)
-					if jsonErr != nil {
-						return jsonErr
-					}
-
-					return a.LoadRequest(g, requestMap)
+					return a.LoadRequest(g, loadLocation)
 				})
 		}
 	},
diff --git a/wuzz.go b/wuzz.go
index b57c94d..fff6824 100644
--- a/wuzz.go
+++ b/wuzz.go
@@ -1171,7 +1171,18 @@ func (a *App) CreatePopupView(name string, width, height int, g *gocui.Gui) (v *
 	return
 }
 
-func (a *App) LoadRequest(g *gocui.Gui, requestMap map[string]string) (err error) {
+func (a *App) LoadRequest(g *gocui.Gui, loadLocation string) (err error) {
+	requestJson, ioErr := ioutil.ReadFile(loadLocation)
+	if ioErr != nil {
+		return ioErr
+	}
+
+	var requestMap map[string]string
+	jsonErr := json.Unmarshal(requestJson, &requestMap)
+	if jsonErr != nil {
+		return jsonErr
+	}
+
 	var v *gocui.View
 	url, exists := requestMap[URL_VIEW]
 	if exists {
@@ -1547,17 +1558,8 @@ func (a *App) ParseArgs(g *gocui.Gui, args []string) error {
 				return errors.New("-f or --file requires a file path be provided as an argument")
 			}
 			arg_index += 1
-			requestJson, ioErr := ioutil.ReadFile(args[arg_index])
-			if ioErr != nil {
-				return ioErr
-			}
-			var requestMap map[string]string
-			jsonErr := json.Unmarshal(requestJson, &requestMap)
-			if jsonErr != nil {
-				return jsonErr
-			}
-
-			a.LoadRequest(g, requestMap)
+			loadLocation := args[arg_index]
+			a.LoadRequest(g, loadLocation)
 		default:
 			u := args[arg_index]
 			if strings.Index(u, "http://") != 0 && strings.Index(u, "https://") != 0 {