Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix & refactor

goenning6a55a3dac240
diff --git a/app/renderer.go b/app/renderer.go
index 6f90bae47..88c4d2db7 100644
--- a/app/renderer.go
+++ b/app/renderer.go
@@ -19,18 +19,11 @@ type HTMLRenderer struct {
logger echo.Logger
}
-var path string
-
// NewHTMLRenderer creates a new HTMLRenderer
func NewHTMLRenderer(logger echo.Logger) *HTMLRenderer {
renderer := &HTMLRenderer{nil, logger}
renderer.templates = make(map[string]*template.Template)
- path = "views/"
- if env.IsTest() {
- path = os.Getenv("GOPATH") + "/src/github.com/WeCanHearYou/wechy/" + path
- }
-
//TODO: load all templates automatically
renderer.add("index.html")
renderer.add("idea.html")
@@ -42,8 +35,11 @@ func NewHTMLRenderer(logger echo.Logger) *HTMLRenderer {
//Render a template based on parameters
func (r *HTMLRenderer) add(name string) *template.Template {
- tpl, err := template.ParseFiles(path+"base.html", path+name)
+ base := env.Path("/views/base.html")
+ file := env.Path("/views", name)
+ tpl, err := template.ParseFiles(base, file)
if err != nil {
+ panic(err)
r.logger.Error(err)
}
diff --git a/app/toolbox/env/env.go b/app/toolbox/env/env.go
index c0f7bf5a5..2428d30ce 100644
--- a/app/toolbox/env/env.go
+++ b/app/toolbox/env/env.go
@@ -1,7 +1,11 @@
package env
-import "os"
-import "fmt"
+import (
+ "fmt"
+ "os"
+
+ "path"
+)
// GetEnvOrDefault retrieves the value of the environment variable named by the key.
// It returns the value if available, otherwise returns defaultValue
@@ -66,6 +70,17 @@ func IsTest() bool {
return Current() == "test"
}
+// Path returns root path of project + given path
+func Path(p ...string) string {
+ root := "./"
+ if IsTest() {
+ root = os.Getenv("GOPATH") + "/src/github.com/WeCanHearYou/wechy/"
+ }
+
+ elems := append([]string{root}, p...)
+ return path.Join(elems...)
+}
+
// IsDevelopment returns true on Wechy production environment
func IsDevelopment() bool {
return Current() == "development"
diff --git a/main.go b/main.go
index a6680992d..ab759fb4c 100644
--- a/main.go
+++ b/main.go
@@ -18,13 +18,8 @@ var buildtime string
var version = "0.0.0"
func migrate() {
- path := "./migrations"
- if env.IsTest() {
- path = os.Getenv("GOPATH") + "/src/github.com/WeCanHearYou/wechy/migrations"
- }
-
fmt.Printf("Running migrations... \n")
- errors, ok := mig.UpSync(env.MustGet("DATABASE_URL"), path)
+ errors, ok := mig.UpSync(env.MustGet("DATABASE_URL"), env.Path("/migrations"))
if !ok {
for i, err := range errors {
fmt.Printf("Error #%d: %s.\n", i, err)