collection.go

@@ -2,16 +2,20 @@ package movies
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"sync"
 )
 
 type Collection struct {
-	Movies []*Movie
+	Movies   []*Movie
+	movieMap map[string]*Movie
+
+	Lists   []*List
+	listMap map[string]*List
 
 	mutex      sync.RWMutex
 	hasChanged bool
-	movieMap   map[string]*Movie
 }
 
 func Import(filename string) (*Collection, error) {
@@ -31,6 +35,11 @@ func Import(filename string) (*Collection, error) {
 		c.movieMap[m.IMDBID] = m
 	}
 
+	c.listMap = make(map[string]*List)
+	for _, l := range c.Lists {
+		c.listMap[l.ID] = l
+	}
+
 	return &c, nil
 }
 
@@ -56,16 +65,18 @@ func (c *Collection) Add(m *Movie) {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
 
+	c.hasChanged = true
+
 	for _, present := range c.Movies {
 		if m.IMDBID == present.IMDBID {
+			present.OMDB = m.OMDB
+			present.FillFromOMDB()
 			return
 		}
 	}
 
 	c.Movies = append(c.Movies, m)
 	c.movieMap[m.IMDBID] = m
-
-	c.hasChanged = true
 }
 
 func (c *Collection) HasChanged() bool {
@@ -100,3 +111,55 @@ func (c *Collection) Update(m *Movie) {
 
 	c.hasChanged = true
 }
+
+func (c *Collection) GetList(listID string) (*List, bool) {
+	c.mutex.RLock()
+	defer c.mutex.RUnlock()
+
+	l, ok := c.listMap[listID]
+	return l, ok
+}
+
+func (c *Collection) AddList(id, title string) error {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
+	c.hasChanged = true
+
+	for _, present := range c.Lists {
+		if id == present.ID {
+			return fmt.Errorf("there is already a list with id %q", id)
+		}
+	}
+
+	l := &List{
+		ID:    id,
+		Title: title,
+	}
+
+	c.Lists = append(c.Lists, l)
+	c.listMap[l.ID] = l
+
+	return nil
+}
+
+func (c *Collection) UpdateList(l *List) {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
+	c.listMap[l.ID] = l
+
+	found := false
+	for i := range c.Lists {
+		if c.Lists[i].ID == l.ID {
+			c.Lists[i] = l
+			found = true
+			break
+		}
+	}
+	if !found {
+		c.Lists = append(c.Lists, l)
+	}
+
+	c.hasChanged = true
+}

list.go

@@ -0,0 +1,19 @@
+package movies
+
+import "encoding/json"
+
+type List struct {
+	ID          string
+	Title       string
+	Description string
+	Movies      []string // IMDBIDs
+}
+
+func UnmarshalList(b []byte) (*List, error) {
+	var l List
+	if err := json.Unmarshal(b, &l); err != nil {
+		return nil, err
+	}
+
+	return &l, nil
+}

movies.go

@@ -12,6 +12,9 @@ type Movie struct {
 	Poster   string
 	Rating   *Rating
 	IMDBID   string
+	Country  string
+	Year     string
+	Runtime  string
 
 	OMDB OMDBMovie
 }
@@ -83,6 +86,15 @@ func (m *Movie) FillFromOMDB() error {
 	if m.IMDBID == "" {
 		m.IMDBID = m.OMDB.IMDBID
 	}
+	if m.Country == "" {
+		m.Country = m.OMDB.Country
+	}
+	if m.Year == "" {
+		m.Year = m.OMDB.Year
+	}
+	if m.Runtime == "" {
+		m.Runtime = m.OMDB.Runtime
+	}
 
 	if m.Rating == nil {
 		m.Rating = &Rating{}

pages/pages.go

@@ -12,18 +12,22 @@ import (
 )
 
 func Router(c *movies.Collection) http.HandlerFunc {
-	listHandler := List(c)
+	homeHandler := Home(c)
 	movieHandler := Movie(c)
+	listHandler := List(c)
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		path := r.URL.Path
 		switch {
 		case path == "/":
-			listHandler(w, r)
+			homeHandler(w, r)
 			return
 		case path == "/style.css":
 			http.ServeFile(w, r, "templates/style.css")
 			return
+		case strings.HasPrefix(path, "/l/"):
+			listHandler(w, r)
+			return
 		case strings.HasPrefix(path, "/tt"):
 			movieHandler(w, r)
 			return
@@ -31,9 +35,9 @@ func Router(c *movies.Collection) http.HandlerFunc {
 	})
 }
 
-func List(c *movies.Collection) http.HandlerFunc {
+func Home(c *movies.Collection) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		t, err := template.ParseFiles("templates/list.html")
+		t, err := template.ParseFiles("templates/home.html")
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -42,12 +46,20 @@ func List(c *movies.Collection) http.HandlerFunc {
 		var errs []error
 
 		if r.Method == "POST" {
-			m, err := movies.Unmarshal([]byte(r.FormValue("omdb_json")))
-			if err != nil {
-				w.WriteHeader(http.StatusBadRequest)
-				errs = append(errs, err)
-			} else {
-				c.Add(m)
+			if r.FormValue("omdb_json") != "" {
+				m, err := movies.Unmarshal([]byte(r.FormValue("omdb_json")))
+				if err != nil {
+					w.WriteHeader(http.StatusBadRequest)
+					errs = append(errs, err)
+				} else {
+					c.Add(m)
+				}
+			}
+
+			if r.FormValue("list-id") != "" {
+				if err := c.AddList(r.FormValue("list-id"), r.FormValue("list-title")); err != nil {
+					errs = append(errs, err)
+				}
 			}
 		}
 
@@ -118,3 +130,52 @@ func Movie(c *movies.Collection) http.HandlerFunc {
 		})
 	})
 }
+
+func List(c *movies.Collection) http.HandlerFunc {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		t, err := template.ParseFiles("templates/list.html")
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		var errs []error
+
+		splitted := strings.Split(r.URL.Path, "/")
+		if len(splitted) < 3 {
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		listID := splitted[2]
+
+		l, ok := c.GetList(listID)
+		if !ok {
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		if r.Method == "POST" {
+			updated, err := movies.UnmarshalList([]byte(r.FormValue("list_json")))
+			if err != nil {
+				errs = append(errs, err)
+			} else if listID != updated.ID {
+				errs = append(errs, fmt.Errorf("you cannot change the imdb id."))
+			} else {
+				l = updated
+				c.UpdateList(updated)
+			}
+		}
+
+		b, err := json.MarshalIndent(l, "", "  ")
+		if err != nil {
+			errs = append(errs, err)
+		}
+
+		t.Execute(w, map[string]interface{}{
+			"List":     l,
+			"ListJSON": string(b),
+			"Errors":   errs,
+		})
+	})
+}

templates/home.html

@@ -0,0 +1,76 @@
+<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 }}
+
+        <h2>Movies</h2>
+
+        <ul class="movie-list">
+            {{ range $m := .Collection.Movies }}
+            <a href="/{{ $m.IMDBID }}">
+                <li class="movie">
+                    <div class="poster">
+                        <img src="{{ $m.Poster }}" title="{{ $m.Title }}" alt="{{ $m.Title }}" />
+                    </div>
+                    <div class="title">
+                        <h3>{{ $m.Title }}</h3>
+                        <div>{{ $m.Director }}</div>
+                    </div>
+                    <ul class="metadata">
+                        <li>{{ $m.Year }}</li>
+                        <li style="flex-grow: 2;">{{ $m.Country }}</li>
+                        <li>{{ $m.Runtime }}</li>
+                    </ul>
+                </li>
+            </a>
+            {{ end }}
+        </ul>
+
+        <h2>Lists</h2>
+
+        <ul class="list-list">
+            {{ range $l := .Collection.Lists }}
+            <a href="/l/{{ $l.ID }}">
+                <li class="list">
+                    <h3>{{ $l.Title }} ({{ $l.ID }})</h3>
+                    <p>{{ $l.Description }}</p>
+                </li>
+            </a>
+            {{ end }}
+        </ul>
+
+        <h2>Add a movie</h2>
+        <div>
+            <form method="get">
+                <p>
+                    Search by IMDB id: <input type="text" name="imdb_id" value="{{ .IMDBID }}" />
+                    <input type="submit" />
+                </p>
+            </form>
+            <form method="post" action="/">
+                <p>Add OMBD JSON movie:<br />
+                    <textarea name="omdb_json" style="width:500px;height:140px;">{{ .OMDBString }}</textarea>
+                    <input type="submit" />
+                </p>
+            </form>
+        </div>
+
+        <h2>Add a list</h2>
+        <div>
+            <form method="post" action="/">
+                <div>
+                    ID: <input type="text" name="list-id" />
+                    Title: <input type="text" name="list-title" />
+                    <input type="submit" />
+                </div>
+            </form>
+        </div>
+    </body>
+</html>

templates/list.html

@@ -10,38 +10,14 @@
         <div class="error">{{ $e }}</div>
         {{ end }}
 
-        <h2>Movies</h2>
+        <h1>{{ .List.Title }}</h1>
 
-        <ul class="movie-list">
-            {{ range $m := .Collection.Movies }}
-            <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>
+        <p>{{ .List.Description }}</p>
 
-        <h2>Add a movie</h2>
-        <div>
-            <form method="get">
-                <p>
-                    Search by IMDB id: <input type="text" name="imdb_id" value="{{ .IMDBID }}" />
-                    <input type="submit" />
-                </p>
-            </form>
-            <form method="post" action="/">
-                <p>Add OMBD JSON movie:<br />
-                    <textarea name="omdb_json" style="width:500px;height:140px;">{{ .OMDBString }}</textarea>
-                    <input type="submit" />
-                </p>
-            </form>
-        </div>
+        <form method="post">
+            <p>Update list: <input type="submit" /><br />
+                <textarea name="list_json" style="width:90%;height:500px;">{{ .ListJSON }}</textarea>
+            </p>
+        </form>
     </body>
 </html>

templates/style.css

@@ -16,26 +16,40 @@ ul.movie-list {
     flex-wrap: wrap;
     padding: 0;
 }
-ul.movie-list li {
+ul.movie-list li.movie {
     width: 240px;
-    height: 400px;
+    height: 440px;
     display: grid;
-    grid-template-rows: 320px 80px;
+    grid-template-rows: 320px 80px 40px;
     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 {
+ul.movie-list li.movie .poster {
     justify-self: center;
     align-self: center;
 }
-ul.movie-list li .metadata {
+ul.movie-list li.movie .title {
     padding: 10px;
 }
-ul.movie-list li img {
+ul.movie-list li.movie img {
     max-width: 240px;
     max-height: 320px;
 }
-ul.movie-list li a {
+ul.movie-list li.movie a {
     color: black;
     text-decoration: none;
 }
+ul.movie-list li.movie ul.metadata {
+    list-style-type: none;
+    padding: 0;
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+ul.movie-list li.movie ul.metadata li {
+    overflow: hidden;
+    padding-left: 10px;
+    padding-right: 10px;
+}