fix crummy ffprobe json output handling
All checks were successful
/ build-linux-amd64 (push) Successful in 1m35s
All checks were successful
/ build-linux-amd64 (push) Successful in 1m35s
This commit is contained in:
parent
f4381f7cdc
commit
51a1de845f
2 changed files with 42 additions and 16 deletions
24
main.go
24
main.go
|
|
@ -6,6 +6,7 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"math"
|
||||
"net/http"
|
||||
"os"
|
||||
"path"
|
||||
|
|
@ -247,18 +248,21 @@ func main() {
|
|||
// concatenate VOD segments into full VOD
|
||||
fullVodExists := func () bool {
|
||||
// check if full VOD already exists with expected duration
|
||||
if fullVodProbe, err := scanner.ProbeSegment(video.Filename); err != nil {
|
||||
var totalLength float64 = 0
|
||||
for _, filename := range vodFiles {
|
||||
probe, err := scanner.ProbeSegment(filename)
|
||||
if err != nil { continue }
|
||||
totalLength += probe.Format.Duration
|
||||
}
|
||||
return fullVodProbe.Format.Duration == totalLength
|
||||
fullVodProbe, err := scanner.ProbeSegment(video.Filename)
|
||||
if err != nil { return false }
|
||||
video.SizeBytes = fullVodProbe.Format.Size
|
||||
var totalLength float64 = 0
|
||||
|
||||
for _, filename := range vodFiles {
|
||||
probe, err := scanner.ProbeSegment(path.Join(metadata.FootageDir, filename))
|
||||
if err != nil { continue }
|
||||
totalLength += probe.Format.Duration
|
||||
}
|
||||
return false
|
||||
return math.Abs(fullVodProbe.Format.Duration - totalLength) < float64(0.1)
|
||||
}()
|
||||
if !fullVodExists {
|
||||
if fullVodExists {
|
||||
log.Print("Full VOD appears to already exist- uploading this file...")
|
||||
} else {
|
||||
video.SizeBytes, err = vid.ConcatVideo(video, vodFiles, verbose)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to concatenate VOD segments: %v", err)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue