Move data files to data

Plus error out when the files can't be loaded.
badges · Aug 5, 2013 · 47b3611 · 47b3611
1 parent 4b6af85
commit 47b3611
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/edge.xcf → assets/edge.xcf b/edge.xcf → assets/edge.xcf
diff --git a/favicon.xcf → assets/favicon.xcf b/favicon.xcf → assets/favicon.xcf
diff --git a/gradient.xcf → assets/gradient.xcf b/gradient.xcf → assets/gradient.xcf
diff --git a/edge.png → data/edge.png b/edge.png → data/edge.png
diff --git a/gradient.png → data/gradient.png b/gradient.png → data/gradient.png
diff --git a/opensanssemibold.ttf → data/opensanssemibold.ttf b/opensanssemibold.ttf → data/opensanssemibold.ttf
diff --git a/png.go b/png.go
@@ -65,22 +65,36 @@ const (
 )
 
 func init() {
-	fi, _ := os.Open("edge.png")
-	edge, _ = png.Decode(fi)
+	fi, err := os.Open("data/edge.png")
+	if err != nil {
+		log.Fatal(err)
+	}
 	defer fi.Close()
 
-	fi, _ = os.Open("gradient.png")
-	gradient, _ = png.Decode(fi)
+	edge, err = png.Decode(fi)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fi, err = os.Open("data/gradient.png")
+	if err != nil {
+		log.Fatal(err)
+	}
 	defer fi.Close()
 
-	fontBytes, err := ioutil.ReadFile("opensanssemibold.ttf")
+	gradient, err = png.Decode(fi)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fontBytes, err := ioutil.ReadFile("data/opensanssemibold.ttf")
 	if err != nil {
-		log.Println(err)
+		log.Fatal(err)
 	}
 
 	font, err = freetype.ParseFont(fontBytes)
 	if err != nil {
-		log.Println(err)
+		log.Fatal(err)
 	}
 
 	c = freetype.NewContext()