Add MovieFile and Subtitle file to Movies, fix Movie update

movies.go

@@ -16,7 +16,9 @@ type Movie struct {
 	Year     string
 	Runtime  string
 
-	Files []string
+	Files     []string
+	MovieFile string
+	Subtitles string
 
 	OMDB OMDBMovie
 }
@@ -59,6 +61,19 @@ type OMDBRating struct {
 }
 
 func Unmarshal(b []byte) (*Movie, error) {
+	var m Movie
+	if err := json.Unmarshal(b, &m); err != nil {
+		return nil, err
+	}
+
+	if err := m.FillFromOMDB(); err != nil {
+		return nil, err
+	}
+
+	return &m, nil
+}
+
+func UnmarshalFromOMDB(b []byte) (*Movie, error) {
 	var omdb OMDBMovie
 	if err := json.Unmarshal(b, &omdb); err != nil {
 		return nil, err

pages/pages.go

@@ -57,7 +57,7 @@ func Home(c *movies.Collection) http.HandlerFunc {
 
 		if r.Method == "POST" {
 			if r.FormValue("omdb_json") != "" {
-				m, err := movies.Unmarshal([]byte(r.FormValue("omdb_json")))
+				m, err := movies.UnmarshalFromOMDB([]byte(r.FormValue("omdb_json")))
 				if err != nil {
 					w.WriteHeader(http.StatusBadRequest)
 					errs = append(errs, err)
@@ -125,12 +125,14 @@ func Movie(c *movies.Collection) http.HandlerFunc {
 					errs = append(errs, fmt.Errorf("you cannot change the imdb id."))
 				} else {
 					m = updated
+					fmt.Println("Update with", m)
 					c.Update(updated)
 				}
 			}
 
 			if files := r.FormValue("files"); files != "" {
 				m.Files = strings.Split(files, "\n")
+				fmt.Println("Update with", m)
 				c.Update(m)
 			}
 		}