From 175955cdd10834b925e4e1a89a75bbd48947eb89 Mon Sep 17 00:00:00 2001
From: rroller <ronnie@ronnieroller.com>
Date: Thu, 26 Dec 2024 16:31:39 -0800
Subject: [PATCH] Add ffprobe

---
 Dockerfile                 |  3 ++-
 src/media/about.go         | 21 +++++++++++----------
 templates/media/about.html |  4 ++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bb3cf29..5b3ae9f 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,8 @@ RUN apk add --update --no-cache \
 
 # https://hub.docker.com/r/mwader/static-ffmpeg/tags
 # https://github.com/wader/static-ffmpeg
-COPY --from=mwader/static-ffmpeg:7.1 /ffmpeg /usr/local/bin/
+COPY --from=mwader/static-ffmpeg:7.1 /ffmpeg  /usr/local/bin/
+COPY --from=mwader/static-ffmpeg:7.1 /ffprobe /usr/local/bin/
 COPY --from=builder /app/media-roller /app/media-roller
 COPY templates /app/templates
 COPY static /app/static
diff --git a/src/media/about.go b/src/media/about.go
index 1b75574..b3ad281 100644
--- a/src/media/about.go
+++ b/src/media/about.go
@@ -23,16 +23,17 @@ func AboutIndex(w http.ResponseWriter, _ *http.Request) {
 	gi, _ := goInfo.GetInfo()
 
 	data := map[string]interface{}{
-		"ytDlpVersion":  CachedYtDlpVersion,
-		"goVersion":     strings.TrimPrefix(utils.RunCommand("go", "version"), "go version "),
-		"pythonVersion": strings.TrimPrefix(pythonVersion, "Python "),
-		"ffmpegVersion": newlineRegex.Split(utils.RunCommand("ffmpeg", "-version"), -1),
-		"os":            gi.OS,
-		"kernel":        gi.Kernel,
-		"core":          gi.Core,
-		"platform":      gi.Platform,
-		"hostname":      gi.Hostname,
-		"cpus":          gi.CPUs,
+		"ytDlpVersion":   CachedYtDlpVersion,
+		"goVersion":      strings.TrimPrefix(utils.RunCommand("go", "version"), "go version "),
+		"pythonVersion":  strings.TrimPrefix(pythonVersion, "Python "),
+		"ffmpegVersion":  newlineRegex.Split(utils.RunCommand("ffmpeg", "-version"), -1),
+		"ffprobeVersion": newlineRegex.Split(utils.RunCommand("ffprobe", "-version"), -1),
+		"os":             gi.OS,
+		"kernel":         gi.Kernel,
+		"core":           gi.Core,
+		"platform":       gi.Platform,
+		"hostname":       gi.Hostname,
+		"cpus":           gi.CPUs,
 	}
 
 	if err := aboutIndexTmpl.Execute(w, data); err != nil {
diff --git a/templates/media/about.html b/templates/media/about.html
index f8954d2..77682f8 100644
--- a/templates/media/about.html
+++ b/templates/media/about.html
@@ -42,6 +42,10 @@
                     <td style="vertical-align: top"><a href="https://www.ffmpeg.org/download.html">ffmpeg</a></td>
                     <td>{{range $element := .ffmpegVersion}}{{ $element }}<br>{{end}}</td>
                 </tr>
+                <tr>
+                    <td style="vertical-align: top"><a href="https://www.ffmpeg.org/download.html">ffprobe</a></td>
+                    <td>{{range $element := .ffprobeVersion}}{{ $element }}<br>{{end}}</td>
+                </tr>
                 </tbody>
             </table>
         </div>