Implement showing actions

hypha.go

@@ -3,6 +3,8 @@ package main
 import (
 	"errors"
 	"fmt"
+	"log"
+	"net/http"
 	"strconv"
 )
 
@@ -38,21 +40,23 @@ func (h Hypha) String() string {
 		revbuf)
 }
 
-func GetRevision(hyphae map[string]*Hypha, hyphaName string, rev string) (Revision, error) {
+func GetRevision(hyphae map[string]*Hypha, hyphaName string, rev string, w http.ResponseWriter) (Revision, bool) {
 	for name, _ := range hyphae {
 		if name == hyphaName {
 			for _, r := range hyphae[name].Revisions {
 				id, err := strconv.Atoi(rev)
 				if err != nil {
-					return Revision{}, err
+					log.Println("No such revision", rev, "at hypha", hyphaName)
+					w.WriteHeader(http.StatusNotFound)
+					return Revision{}, false
 				}
 				if r.Id == id {
-					return r, nil
+					return r, true
 				}
 			}
 		}
 	}
-	return Revision{}, errors.New("Some error idk")
+	return Revision{}, false
 }
 
 // `rev` is the id of revision to render. If it = 0, the last one is rendered. If the revision is not found, an error is returned.

main.go

@@ -23,46 +23,73 @@ func RevInMap(m map[string]string) string {
 func HandlerGetBinary(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	revno := RevInMap(vars)
-	rev, err := GetRevision(hyphae, vars["hypha"], revno)
+	rev, ok := GetRevision(hyphae, vars["hypha"], revno, w)
-	if err != nil {
+	if !ok {
-		log.Println("Failed to show image of", rev.FullName)
+		return
 	}
 	fileContents, err := ioutil.ReadFile(rev.BinaryPath)
 	if err != nil {
-		log.Println("Failed to show image of", rev.FullName)
+		log.Println("Failed to load binary data of", rev.FullName, rev.Id)
+		w.WriteHeader(http.StatusNotFound)
+		return
 	}
-	log.Println("Contents:", fileContents[:10], "...")
 	w.Header().Set("Content-Type", rev.MimeType)
-	// w.Header().Set("Content-Length", strconv.Itoa(len(fileContents)))
 	w.WriteHeader(http.StatusOK)
 	w.Write(fileContents)
-	log.Println("Showing image of", rev.FullName)
+	log.Println("Showing image of", rev.FullName, rev.Id)
 }
 
 func HandlerRaw(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusNotImplemented)
+	vars := mux.Vars(r)
-	log.Println("Attempt to access an unimplemented thing")
+	revno := RevInMap(vars)
+	rev, ok := GetRevision(hyphae, vars["hypha"], revno, w)
+	if !ok {
+		return
+	}
+	fileContents, err := ioutil.ReadFile(rev.TextPath)
+	if err != nil {
+		log.Println("Failed to load text data of", rev.FullName, rev.Id)
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+	w.Header().Set("Content-Type", "text/plain")
+	w.WriteHeader(http.StatusOK)
+	w.Write(fileContents)
+	log.Println("Serving text data of", rev.FullName, rev.Id)
 }
 
 func HandlerZen(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusNotImplemented)
-	log.Println("Attempt to access an unimplemented thing")
-}
-
-func HandlerView(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	rev, err := GetRevision(hyphae, vars["hypha"], "0")
+	revno := RevInMap(vars)
-	if err != nil {
+	rev, ok := GetRevision(hyphae, vars["hypha"], revno, w)
-		log.Println("Failed to show image of", rev.FullName)
+	if !ok {
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	html, err := rev.Render(hyphae)
 	if err != nil {
-		log.Println("Failed to show image of", rev.FullName)
+		log.Println("Failed to render", rev.FullName)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	w.WriteHeader(http.StatusOK)
+	fmt.Fprint(w, html)
+}
+
+func HandlerView(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	revno := RevInMap(vars)
+	rev, ok := GetRevision(hyphae, vars["hypha"], revno, w)
+	if !ok {
+		return
+	}
+	html, err := rev.Render(hyphae)
+	if err != nil {
+		log.Println("Failed to render", rev.FullName)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	w.WriteHeader(http.StatusOK)
 	fmt.Fprint(w, HyphaPage(hyphae, rev, html))
 	log.Println("Rendering", rev.FullName)