Add Movie page

cmd/movies/main.go

@@ -28,7 +28,7 @@ func main() {
 		collection = &movies.Collection{}
 	}
 
-	http.Handle("/", pages.List(collection))
+	http.Handle("/", pages.Router(collection))
 	http.Handle("/add-movie", api.AddMovieHandler(collection))
 
 	port := "8080"

collection.go

@@ -11,6 +11,7 @@ type Collection struct {
 
 	mutex      sync.RWMutex
 	hasChanged bool
+	movieMap   map[string]*Movie
 }
 
 func Import(filename string) (*Collection, error) {
@@ -24,8 +25,10 @@ func Import(filename string) (*Collection, error) {
 		return nil, err
 	}
 
+	c.movieMap = make(map[string]*Movie)
 	for _, m := range c.Movies {
 		m.FillFromOMDB()
+		c.movieMap[m.IMDBID] = m
 	}
 
 	return &c, nil
@@ -60,9 +63,40 @@ func (c *Collection) Add(m *Movie) {
 	}
 
 	c.Movies = append(c.Movies, m)
+	c.movieMap[m.IMDBID] = m
+
 	c.hasChanged = true
 }
 
 func (c *Collection) HasChanged() bool {
 	return c.hasChanged
 }
+
+func (c *Collection) Get(imdbID string) (*Movie, bool) {
+	c.mutex.RLock()
+	defer c.mutex.RUnlock()
+
+	m, ok := c.movieMap[imdbID]
+	return m, ok
+}
+
+func (c *Collection) Update(m *Movie) {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
+	c.movieMap[m.IMDBID] = m
+
+	found := false
+	for i := range c.Movies {
+		if c.Movies[i].IMDBID == m.IMDBID {
+			c.Movies[i] = m
+			found = true
+			break
+		}
+	}
+	if !found {
+		c.Movies = append(c.Movies, m)
+	}
+
+	c.hasChanged = true
+}

pages/pages.go

@@ -1,14 +1,36 @@
 package pages
 
 import (
+	"encoding/json"
 	"fmt"
 	"html/template"
 	"net/http"
+	"strings"
 
 	"gogs.gildas.ch/gildas/movies"
 	"gogs.gildas.ch/gildas/movies/omdb"
 )
 
+func Router(c *movies.Collection) http.HandlerFunc {
+	listHandler := List(c)
+	movieHandler := Movie(c)
+
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		path := r.URL.Path
+		switch {
+		case path == "/":
+			listHandler(w, r)
+			return
+		case path == "/style.css":
+			http.ServeFile(w, r, "templates/style.css")
+			return
+		case strings.HasPrefix(path, "/tt"):
+			movieHandler(w, r)
+			return
+		}
+	})
+}
+
 func List(c *movies.Collection) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		t, err := template.ParseFiles("templates/list.html")
@@ -47,3 +69,52 @@ func List(c *movies.Collection) http.HandlerFunc {
 		})
 	})
 }
+
+func Movie(c *movies.Collection) http.HandlerFunc {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		t, err := template.ParseFiles("templates/movie.html")
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		var errs []error
+
+		splitted := strings.Split(r.URL.Path, "/")
+		if len(splitted) < 2 {
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		imdbID := splitted[1]
+
+		m, ok := c.Get(imdbID)
+		if !ok {
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		if r.Method == "POST" {
+			updated, err := movies.Unmarshal([]byte(r.FormValue("movie_json")))
+			if err != nil {
+				errs = append(errs, err)
+			} else if imdbID != updated.IMDBID {
+				errs = append(errs, fmt.Errorf("you cannot change the imdb id."))
+			} else {
+				m = updated
+				c.Update(updated)
+			}
+		}
+
+		b, err := json.MarshalIndent(m, "", "  ")
+		if err != nil {
+			errs = append(errs, err)
+		}
+
+		t.Execute(w, map[string]interface{}{
+			"Movie":     m,
+			"MovieJSON": string(b),
+			"Errors":    errs,
+		})
+	})
+}

templates/list.html

@@ -3,44 +3,7 @@
         <title>gildas.ch</title>
 
         <link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
-        <style>
-         body {
-             font-family: 'Roboto', sans-serif;
-         }
-         h2 {
-             font-size: 1.2em;
-             color: #757575;
-         }
-         ul {
-             list-style-type: none;
-             display: flex;
-             flex-wrap: wrap;
-             padding: 0;
-         }
-         li {
-             width: 240px;
-             height: 400px;
-             display: grid;
-             grid-template-rows: 320px 80px;
-             box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
-             margin: 10px;
-         }
-         li .poster {
-             justify-self: center;
-             align-self: center;
-         }
-         li .metadata {
-             padding: 10px;
-         }
-         li img {
-             max-width: 240px;
-             max-height: 320px;
-         }
-         h3 {
-             margin-bottom: 5px;
-             margin-top: 5px;
-         }
-        </style>
+        <link rel="stylesheet" href="/style.css">
     </head>
     <body>
         {{ range $e := .Errors }}
@@ -49,17 +12,19 @@
 
         <h2>Movies</h2>
 
-        <ul>
+        <ul class="movie-list">
             {{ range $m := .Collection.Movies }}
-            <li>
-                <div class="poster">
-                    <img src="{{ $m.Poster }}" title="{{ $m.Title }}" alt="{{ $m.Title }}" />
-                </div>
-                <div class="metadata">
-                    <h3>{{ $m.Title }}</h3>
-                    <div>{{ $m.Director }}</div>
-                </div>
-            </li>
+            <a href="/{{ $m.IMDBID }}">
+                <li>
+                    <div class="poster">
+                        <img src="{{ $m.Poster }}" title="{{ $m.Title }}" alt="{{ $m.Title }}" />
+                    </div>
+                    <div class="metadata">
+                        <h3>{{ $m.Title }}</h3>
+                        <div>{{ $m.Director }}</div>
+                    </div>
+                </li>
+            </a>
             {{ end }}
         </ul>
 

templates/movie.html

@@ -0,0 +1,27 @@
+<html>
+    <head>
+        <title>gildas.ch</title>
+
+        <link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="/style.css">
+    </head>
+    <body>
+        {{ range $e := .Errors }}
+        <div class="error">{{ $e }}</div>
+        {{ end }}
+
+        <div class="poster">
+            <img src="{{ .Movie.Poster }}" title="{{ .Movie.Title }}" alt="{{ .Movie.Title }}" />
+        </div>
+        <div class="metadata">
+            <h3>{{ .Movie.Title }}</h3>
+            <div>{{ .Movie.Director }}</div>
+        </div>
+
+        <form method="post">
+            <p>Update movie: <input type="submit" /><br />
+                <textarea name="movie_json" style="width:90%;height:500px;">{{ .MovieJSON }}</textarea>
+            </p>
+        </form>
+    </body>
+</html>

templates/style.css

@@ -0,0 +1,41 @@
+body {
+    font-family: 'Roboto', sans-serif;
+}
+h2 {
+    font-size: 1.2em;
+    color: #757575;
+}
+h3 {
+    margin-bottom: 5px;
+    margin-top: 5px;
+}
+
+ul.movie-list {
+    list-style-type: none;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0;
+}
+ul.movie-list li {
+    width: 240px;
+    height: 400px;
+    display: grid;
+    grid-template-rows: 320px 80px;
+    box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+    margin: 10px;
+}
+ul.movie-list li .poster {
+    justify-self: center;
+    align-self: center;
+}
+ul.movie-list li .metadata {
+    padding: 10px;
+}
+ul.movie-list li img {
+    max-width: 240px;
+    max-height: 320px;
+}
+ul.movie-list li a {
+    color: black;
+    text-decoration: none;
+}