pages/pages.go

@@ -9,6 +9,7 @@ import (
 
 	"gogs.gildas.ch/gildas/movies"
 	"gogs.gildas.ch/gildas/movies/omdb"
+	"gopkg.in/russross/blackfriday.v2"
 )
 
 func Router(c *movies.Collection) http.HandlerFunc {
@@ -156,14 +157,13 @@ func List(c *movies.Collection) http.HandlerFunc {
 		}
 
 		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)
+			if r.FormValue("title") != "" || r.FormValue("description") != "" {
+				l.Title = r.FormValue("title")
+				l.Description = r.FormValue("description")
+				c.UpdateList(l)
+			} else if r.FormValue("imdb_id") != "" {
+				l.Movies = append(l.Movies, r.FormValue("imdb_id"))
+				c.UpdateList(l)
 			}
 		}
 
@@ -172,8 +172,20 @@ func List(c *movies.Collection) http.HandlerFunc {
 			errs = append(errs, err)
 		}
 
+		var ms []*movies.Movie
+		for _, imdbID := range l.Movies {
+			if m, ok := c.Get(imdbID); ok {
+				ms = append(ms, m)
+			}
+		}
+
 		t.Execute(w, map[string]interface{}{
-			"List":     l,
+			"List": l,
+			"Description": template.HTML(
+				blackfriday.Run(
+					[]byte(strings.ReplaceAll(l.Description, "\r\n", "\n")),
+					blackfriday.WithExtensions(blackfriday.CommonExtensions))),
+			"Movies":   ms,
 			"ListJSON": string(b),
 			"Errors":   errs,
 		})

templates/home.html

@@ -40,7 +40,6 @@
             <a href="/l/{{ $l.ID }}">
                 <li class="list">
                     <h3>{{ $l.Title }} ({{ $l.ID }})</h3>
-                    <p>{{ $l.Description }}</p>
                 </li>
             </a>
             {{ end }}

templates/list.html

@@ -12,11 +12,40 @@
 
         <h1>{{ .List.Title }}</h1>
 
-        <p>{{ .List.Description }}</p>
+        {{ .Description }}
+
+        <ul class="movie-list">
+            {{ range $m := .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>
+
 
         <form method="post">
             <p>Update list: <input type="submit" /><br />
-                <textarea name="list_json" style="width:90%;height:500px;">{{ .ListJSON }}</textarea>
+                <input type="text" name="title" value="{{ .List.Title }}" /><br />
+                <textarea name="description" style="width:90%;height:500px;">{{ .List.Description }}</textarea>
+            </p>
+        </form>
+
+        <form method="post">
+            <p>Add movie (by id): <input type="submit" /><br />
+                <input type="text" name="imdb_id" value="" />
             </p>
         </form>
     </body>