From 96c197453dd8f93f3b30d029e3c66fc7d64fe943 Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Sun, 11 Nov 2018 17:16:05 -0500
Subject: [PATCH] Fix key loading on Windows + move paths into vars

This uses filepath.Join() to make sure they always load correctly
---
 keys.go | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/keys.go b/keys.go
index 3f594f5..7058111 100644
--- a/keys.go
+++ b/keys.go
@@ -2,6 +2,17 @@ package writefreely
 
 import (
 	"io/ioutil"
+	"path/filepath"
+)
+
+const (
+	keysDir = "keys"
+)
+
+var (
+	emailKeyPath      = filepath.Join(keysDir, "email.aes256")
+	cookieAuthKeyPath = filepath.Join(keysDir, "cookies_auth.aes256")
+	cookieKeyPath     = filepath.Join(keysDir, "cookies_enc.aes256")
 )
 
 type keychain struct {
@@ -12,17 +23,17 @@ func initKeys(app *app) error {
 	var err error
 	app.keys = &keychain{}
 
-	app.keys.emailKey, err = ioutil.ReadFile("keys/email.aes256")
+	app.keys.emailKey, err = ioutil.ReadFile(emailKeyPath)
 	if err != nil {
 		return err
 	}
 
-	app.keys.cookieAuthKey, err = ioutil.ReadFile("keys/cookies_auth.aes256")
+	app.keys.cookieAuthKey, err = ioutil.ReadFile(cookieAuthKeyPath)
 	if err != nil {
 		return err
 	}
 
-	app.keys.cookieKey, err = ioutil.ReadFile("keys/cookies_enc.aes256")
+	app.keys.cookieKey, err = ioutil.ReadFile(cookieKeyPath)
 	if err != nil {
 		return err
 	}