Serve files

files.go

@@ -2,6 +2,7 @@ package movies
 
 import (
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -61,3 +62,7 @@ func stringContainsAll(path string, split []string) bool {
 	}
 	return true
 }
+
+func (fs *FileSource) Serve(w http.ResponseWriter, r *http.Request, file string) {
+	http.ServeFile(w, r, file)
+}

pages/pages.go

@@ -18,6 +18,7 @@ func Router(c *movies.Collection) http.HandlerFunc {
 	movieHandler := Movie(c)
 	listHandler := List(c)
 	filesHandler := Files(c)
+	fileHandler := File(c, "/files/")
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		path := r.URL.Path
@@ -25,9 +26,6 @@ func Router(c *movies.Collection) http.HandlerFunc {
 		case path == "/":
 			homeHandler(w, r)
 			return
-		case path == "/files":
-			filesHandler(w, r)
-			return
 		case path == "/style.css":
 			http.ServeFile(w, r, "templates/style.css")
 			return
@@ -37,6 +35,12 @@ func Router(c *movies.Collection) http.HandlerFunc {
 		case strings.HasPrefix(path, "/tt"):
 			movieHandler(w, r)
 			return
+		case path == "/files":
+			filesHandler(w, r)
+			return
+		case strings.HasPrefix(path, "/files/"):
+			fileHandler(w, r)
+			return
 		}
 	})
 }
@@ -244,3 +248,11 @@ func Files(c *movies.Collection) http.HandlerFunc {
 		})
 	})
 }
+
+func File(c *movies.Collection, prefix string) http.HandlerFunc {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		file := "/" + strings.TrimPrefix(r.URL.Path, prefix)
+
+		c.Files.Serve(w, r, file)
+	})
+}

templates/files.html

@@ -18,7 +18,7 @@
 
         <ul class="file-list">
             {{ range $f := .Files }}
-            <li>{{ $f }}</li>
+            <li><a href="/files/{{ $f }}">{{ $f }}</a></li>
             {{ end }}
         </ul>
     </body>

templates/movie.html

@@ -20,7 +20,7 @@
 
         <ul class="file-list">
             {{ range $f := .Movie.Files }}
-            <li>{{ $f }}</li>
+            <li><a href="/files/{{ $f }}">{{ $f }}</a></li>
             {{ end }}
         </ul>