ffmpeg/ffmpeg.go

@@ -0,0 +1,50 @@
+package ffmpeg
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+)
+
+const (
+	inputFileIdentifier = "INPUT_VIDEO_FILE"
+)
+
+var (
+	Debug = true
+)
+
+func MediaInfo(path string) (string, error) {
+	out, err := execCommand(
+		fmt.Sprintf("-i %s", inputFileIdentifier),
+		path)
+	if err.Error() == "exit status 1" && strings.HasSuffix(out, "At least one output file must be specified") {
+		err = nil
+	}
+	return out, err
+}
+
+func execCommand(cmdStr, path string) (string, error) {
+	cmdSplit := strings.Split(cmdStr, " ")
+	for i, s := range cmdSplit {
+		if s == inputFileIdentifier {
+			cmdSplit[i] = path
+		}
+	}
+
+	cmd := exec.Command("ffmpeg", cmdSplit...)
+
+	if Debug {
+		fmt.Println("Executing:", cmd)
+	}
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		fmt.Printf("Error: %#v\n", err.Error())
+		return strings.TrimSuffix(string(out), "\n"), err
+	}
+	if Debug {
+		fmt.Printf("Output: %s\n", string(out))
+	}
+
+	return strings.TrimSuffix(string(out), "\n"), err
+}

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)
+}

movies.go

@@ -2,8 +2,11 @@ package movies
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
+
+	"gogs.gildas.ch/gildas/movies/ffmpeg"
 )
 
 type Movie struct {
@@ -16,7 +19,10 @@ type Movie struct {
 	Year     string
 	Runtime  string
 
-	Files []string
+	Files     []string
+	MovieFile string
+	MediaInfo string
+	Subtitles string
 
 	OMDB OMDBMovie
 }
@@ -59,6 +65,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
@@ -112,3 +131,17 @@ func (m *Movie) FillFromOMDB() error {
 
 	return nil
 }
+
+func (m *Movie) GenerateMediaInfo() error {
+	if m.MovieFile == "" {
+		return fmt.Errorf("no movie file set")
+	}
+
+	mediaInfo, err := ffmpeg.MediaInfo(m.MovieFile)
+	if err != nil {
+		return fmt.Errorf("error generating media info from %q: %w", m.MovieFile, err)
+	}
+
+	m.MediaInfo = mediaInfo
+	return nil
+}

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
 		}
 	})
 }
@@ -53,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)
@@ -79,12 +83,14 @@ func Home(c *movies.Collection) http.HandlerFunc {
 			}
 		}
 
-		t.Execute(w, map[string]interface{}{
+		if err := t.Execute(w, map[string]interface{}{
 			"Collection": c,
 			"IMDBID":     r.URL.Query().Get("imdb_id"),
 			"OMDBString": omdbString,
 			"Errors":     errs,
-		})
+		}); err != nil {
+			fmt.Println(err)
+		}
 	})
 }
 
@@ -121,14 +127,25 @@ 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 != "" {
+				files = strings.ReplaceAll(files, "\r", "")
 				m.Files = strings.Split(files, "\n")
+				fmt.Println("Update with", m)
 				c.Update(m)
 			}
+
+			if r.FormValue("generate_mediainfo") != "" {
+				if err := m.GenerateMediaInfo(); err != nil {
+					errs = append(errs, err)
+				} else {
+					c.Update(m)
+				}
+			}
 		}
 
 		fileQuery := r.URL.Query().Get("file_query")
@@ -142,14 +159,16 @@ func Movie(c *movies.Collection) http.HandlerFunc {
 			errs = append(errs, err)
 		}
 
-		t.Execute(w, map[string]interface{}{
+		if err := t.Execute(w, map[string]interface{}{
 			"Movie":       m,
 			"MovieJSON":   string(b),
 			"Files":       strings.Join(m.Files, "\n"),
 			"FileQuery":   fileQuery,
 			"FileResults": fileResults,
 			"Errors":      errs,
-		})
+		}); err != nil {
+			fmt.Println(err)
+		}
 	})
 }
 
@@ -200,7 +219,7 @@ func List(c *movies.Collection) http.HandlerFunc {
 			}
 		}
 
-		t.Execute(w, map[string]interface{}{
+		if err := t.Execute(w, map[string]interface{}{
 			"List": l,
 			"Description": template.HTML(
 				blackfriday.Run(
@@ -209,7 +228,9 @@ func List(c *movies.Collection) http.HandlerFunc {
 			"Movies":   ms,
 			"ListJSON": string(b),
 			"Errors":   errs,
-		})
+		}); err != nil {
+			fmt.Println(err)
+		}
 	})
 }
 
@@ -238,9 +259,19 @@ func Files(c *movies.Collection) http.HandlerFunc {
 			}
 		}
 
-		t.Execute(w, map[string]interface{}{
+		if err := t.Execute(w, map[string]interface{}{
 			"Files":  c.AllFiles(),
 			"Errors": errs,
-		})
+		}); err != nil {
+			fmt.Println(err)
+		}
+	})
+}
+
+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

@@ -18,12 +18,20 @@
             <div>{{ .Movie.Director }}</div>
         </div>
 
+        <p>Movie file: <a href="/files/{{ .Movie.MovieFile }}">{{ .Movie.MovieFile }}</a></p>
+
+        <pre>{{ .Movie.MediaInfo }}</pre>
+
         <ul class="file-list">
             {{ range $f := .Movie.Files }}
-            <li>{{ $f }}</li>
+            <li><a href="/files/{{ $f }}">{{ $f }}</a></li>
             {{ end }}
         </ul>
 
+        <div>
+            <form method="post"><input type="submit" name="generate_mediainfo" value="Generate MediaInfo" /></form>
+        </div>
+
         <div>
             <form method="post">
                 <p>Update file list: <input type="submit" /><br />