Image is now stored in memory (speedup).

3 files changed, 42 insertions, 6 deletions

diff --git a/earthporn.go b/earthporn.go
index 9edb837..a7800ef 100644
--- a/earthporn.go
+++ b/earthporn.go
@@ -1,8 +1,11 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
+	"io"
+	"log"
 	"mime"
 	"net/http"
 	"strings"
@@ -21,6 +24,8 @@ type EarthPorn struct {
 	URL       string `json:"url,omitempty"`
 	Permalink string `json:"permalink"`
 	Domain    string `json:"domain"`
+	data      []byte
+	mediatype string
 }
 
 const earthPornURL = "http://www.reddit.com/r/EarthPorn.json"
@@ -49,19 +54,19 @@ func GetEarthPorn() (EarthPorn, error) {
 			continue
 		}
 
-		if (&p).getImageURL() {
-			return p, nil
+		if p.fetch() {
+			return *p, nil
 		}
 	}
 
 	return EarthPorn{}, errors.New("Could not get EarthPorn: No image could be extracted")
 }
 
-func (p *EarthPorn) getImageURL() bool {
+func (p *EarthPorn) fetch() bool {
 	// TODO: We can do further processing here (e.g. if we get a link to flickr, extract the image).
 	// For now, we will simply test, if the URL points to an image.
 
-	resp, err := http.Head(p.URL)
+	resp, err := http.Get(p.URL)
 	if err != nil {
 		return false
 	}
@@ -69,12 +74,28 @@ func (p *EarthPorn) getImageURL() bool {
 
 	t := resp.Header.Get("Content-Type")
 	if t == "" {
+		log.Printf("could not get image of %s: no Content-Type", p.Permalink)
 		return false
 	}
 	mt, _, err := mime.ParseMediaType(t)
 	if err != nil {
+		log.Printf("could not get image of %s: %s", p.Permalink, err)
 		return false
 	}
 
-	return (strings.Split(mt, "/")[0] == "image")
+	if strings.Split(mt, "/")[0] != "image" {
+		log.Printf("could not get image of %s: not an image", p.Permalink)
+		return false
+	}
+
+	buf := new(bytes.Buffer)
+	if _, err := io.Copy(buf, resp.Body); err != nil {
+		log.Printf("could not get image of %s: %s", p.Permalink, err)
+		return false
+	}
+
+	p.mediatype = t
+	p.data = buf.Bytes()
+	return true
+}
 }
diff --git a/main.go b/main.go
index 3ed3e9c..3dcdc2e 100644
--- a/main.go
+++ b/main.go
@@ -128,6 +128,7 @@ func main() {
 	}(stopch)
 
 	http.HandleFunc("/", startpage)
+	http.HandleFunc("/bgimg", bgimg)
 	log.Fatal(http.ListenAndServe(*laddr, nil))
 }
 
@@ -143,3 +144,17 @@ func startpage(rw http.ResponseWriter, req *http.Request) {
 		log.Printf("Failed executing template: %s\n", err)
 	}
 }
+
+func bgimg(rw http.ResponseWriter, req *http.Request) {
+	defer req.Body.Close()
+
+	if len(porn.data) == 0 {
+		rw.WriteHeader(http.StatusNotFound)
+	}
+
+	rw.Header().Add("Content-Type", porn.mediatype)
+	if _, err := rw.Write(porn.data); err != nil {
+		log.Printf("Failed serving background: %s", err)
+	}
+}
+
diff --git a/template.html b/template.html
index 212979f..d244b70 100644
--- a/template.html
+++ b/template.html
@@ -4,7 +4,7 @@
 		<title>Startpage</title>
 		<style type="text/css">
 			body {
-				background: black url({{ .Porn.URL }}) no-repeat center center fixed;
+				background: black url(/bgimg) no-repeat center center fixed;
 				-moz-background-size: cover;
 				-o-background-size: cover;
 				background-size: cover;