Add ffprobe

This commit is contained in:
rroller 2024-12-26 16:31:39 -08:00
parent dc4d80802a
commit 175955cdd1
3 changed files with 17 additions and 11 deletions

View file

@ -23,7 +23,8 @@ RUN apk add --update --no-cache \
# https://hub.docker.com/r/mwader/static-ffmpeg/tags # https://hub.docker.com/r/mwader/static-ffmpeg/tags
# https://github.com/wader/static-ffmpeg # 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 --from=builder /app/media-roller /app/media-roller
COPY templates /app/templates COPY templates /app/templates
COPY static /app/static COPY static /app/static

View file

@ -23,16 +23,17 @@ func AboutIndex(w http.ResponseWriter, _ *http.Request) {
gi, _ := goInfo.GetInfo() gi, _ := goInfo.GetInfo()
data := map[string]interface{}{ data := map[string]interface{}{
"ytDlpVersion": CachedYtDlpVersion, "ytDlpVersion": CachedYtDlpVersion,
"goVersion": strings.TrimPrefix(utils.RunCommand("go", "version"), "go version "), "goVersion": strings.TrimPrefix(utils.RunCommand("go", "version"), "go version "),
"pythonVersion": strings.TrimPrefix(pythonVersion, "Python "), "pythonVersion": strings.TrimPrefix(pythonVersion, "Python "),
"ffmpegVersion": newlineRegex.Split(utils.RunCommand("ffmpeg", "-version"), -1), "ffmpegVersion": newlineRegex.Split(utils.RunCommand("ffmpeg", "-version"), -1),
"os": gi.OS, "ffprobeVersion": newlineRegex.Split(utils.RunCommand("ffprobe", "-version"), -1),
"kernel": gi.Kernel, "os": gi.OS,
"core": gi.Core, "kernel": gi.Kernel,
"platform": gi.Platform, "core": gi.Core,
"hostname": gi.Hostname, "platform": gi.Platform,
"cpus": gi.CPUs, "hostname": gi.Hostname,
"cpus": gi.CPUs,
} }
if err := aboutIndexTmpl.Execute(w, data); err != nil { if err := aboutIndexTmpl.Execute(w, data); err != nil {

View file

@ -42,6 +42,10 @@
<td style="vertical-align: top"><a href="https://www.ffmpeg.org/download.html">ffmpeg</a></td> <td style="vertical-align: top"><a href="https://www.ffmpeg.org/download.html">ffmpeg</a></td>
<td>{{range $element := .ffmpegVersion}}{{ $element }}<br>{{end}}</td> <td>{{range $element := .ffmpegVersion}}{{ $element }}<br>{{end}}</td>
</tr> </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> </tbody>
</table> </table>
</div> </div>