Merge pull request gordon-cs#119 from sillsdev/replace-ffprobe

Replace ffprobe

README.md

@@ -24,24 +24,23 @@ Final Presentation Slides: [Link](https://docs.google.com/presentation/d/1OxTRJq
 4. Run code in a CLI set to directory of executable with "./executable_name" or just "executable_name" for Windows
 5. There are also several flags you can include at runtime to alter the output or inputs:
 
+ -h : Help, display list of possible flags and their uses
 
-  -h : Help, display list of possible flags and their uses
+ -t : Template, used to input a specific template file to use, otherwise the program searches executable's current directory for any .slideshow files and uses the first it finds
 
-  -t : Template, used to input a specific template file to use, otherwise the program searches executable's current directory for any .slideshow files and uses the first it finds
+ -o : Output location, used to specify where to store the finished video, will use executable's current directory by default
 
-  -o : Output location, used to specify where to store the finished video, will use executable's current directory by default
+ -l : Lower quality, used to generate a lower quality video for smaller file size for easier distribution (default videos will be 1280x720)
 
-  -l : Lower quality, used to generate a lower quality video for smaller file size for easier distribution (default videos will be 1280x720)
+ -td : Temporary Directory, used to specify a location to store the temporary files used in video production (default is in your OS' temp directory/storybuilder-\*)
 
-  -td : Temporary Directory, used to specify a location to store the temporary files used in video production (default is in your OS' temp directory/storybuilder-\*)
+ -v : Verbosity, used to modify how much output is reported on the commandline for debugging purposes (less verbose by default)
 
-  -v : Verbosity, used to modify how much output is reported on the commandline for debugging purposes (less verbose by default)
+ -s : Save files, used to specify if user wants to preserve the temporary files used in the video production (videos are deleted by default)
 
-  -s : Save files, used to specify if user wants to preserve the temporary files used in the video production (videos are deleted by default)
+ -f : Fadetype, include to use the non-xfade default transitions for video
 
- -f : Fadetype, include to use the non-xfade default transitions for video
-
- -ov : Overlay video, used to specify the location of a test video to create an overlay video with the generated video
+ -ov : Overlay video, used to specify the location of a test video to create an overlay video with the generated video
 
 # Testing Documentation
 
@@ -53,17 +52,14 @@ Our source code contains unit tests per packages, to which we are adding more te
 
 # Release Documentation
 
-In order to generate a release version for our code after making adjustments you will need to follow the steps below:
+GitHub Actions are configured to build a release on tagged commits.
+
+In order to generate a release version locally, follow the steps below:
 
 1. Install GoReleaser [link](https://goreleaser.com/install/)
-2. In a CLI, navigate to the directory containing the source code (main.go and read.go)
-3. Run `goreleaser init` to generate a `.goreleaser.yaml` file
-4. Ensure you have proper write access to the repository and generate a GitHub [personal access token](https://github.com/settings/tokens) for your account, making sure it has at least the `write:packages` option checked
-5. Create a folder in your `homedirectory~/.config/` directory labeled `goreleaser` if it doesn't already exist
-6. Copy your token into a file called `github_token` and place it into the `goreleaser` folder you created.
-7. With your CLI set to the folder with your source code and the `.goreleaser.yaml` file, create a tag for your release with `git tag -a TAG_ID -m TAG_MESSAGE`(e.g. `git tag -a v0.1.0 -m "Release Version 0.1.0"`)
-8. Push your tag using `git push origin TAG_ID` (e.g. `git push origin v0.1.0`), and GitHub Actions will take care of the building!
-
-(Optional) 9. If you wish to compile without releasing to GitHub you can use `goreleaser build` or `goreleaser release --skip-publish` in your source code directory to prevent publishing to GitHub
+2. In a CLI, navigate to the root directory (contains main.go)
+3. Run `goreleaser release --snapshow --rm-dist`
+
+Binaries will be located in the `dist` folder.
 
 If any of these steps cause issues you can reference the [GoReleaser documentation](https://goreleaser.com/)

src/ffmpeg/ffmpeg.go

@@ -154,13 +154,7 @@ func MergeTempVideos(Images []string, Transitions []string, TransitionDurations
  settb += fmt.Sprintf("[%d:v]tpad=stop_mode=clone:stop_duration=%f[v%d];", i, transition_duration/2, i)
 
  //get the current video length in seconds
- cmd := CmdGetVideoLength(fmt.Sprintf(tempPath+"/temp%d-%d.mp4", i, totalNumImages))
-
- output, err := cmd.CombinedOutput()
- CheckCMDError(output, err)
-
- //store the video length in an array
- video_each_length[i], err = strconv.ParseFloat(strings.TrimSpace(string(output)), 8)
+ video_each_length[i] = GetVideoLength(fmt.Sprintf(tempPath+"/temp%d-%d.mp4", i, totalNumImages))
 
  //get the total video length of the videos combined thus far in seconds
  video_total_length += video_each_length[i]
@@ -233,11 +227,7 @@ func MergeTempVideosOldFade(Images []string, TransitionDurations []string, Timin
  }
 
  //get the current video length in seconds
- cmd := CmdGetVideoLength(fmt.Sprintf(tempLocation+"/temp%d-%d.mp4", i, totalNumImages))
- output, err := cmd.CombinedOutput()
- CheckCMDError(output, err)
-
- video_each_length[i], err = strconv.ParseFloat(strings.TrimSpace(string(output)), 8)
+ video_each_length[i] = GetVideoLength(fmt.Sprintf(tempLocation+"/temp%d-%d.mp4", i, totalNumImages))
 
  //get the total video length of the videos combined thus far in seconds
  video_total_duration += video_each_length[i]
@@ -376,3 +366,40 @@ func CreateOverlaidVideoForTesting(finalVideoDirectory string, trueVideo string,
  output, err := cmd.CombinedOutput()
  CheckCMDError(output, err)
 }
+
+func ParseVideoLength(output string) float64 {
+ re := regexp.MustCompile(`Duration: (?P<hour>\d{2}):(?P<minute>\d{2}):(?P<second>\d{2}\.\d{2})`)
+ match := re.FindStringSubmatch(output)
+ if match == nil {
+ log.Fatal(match)
+ }
+
+ hour, err := strconv.ParseInt(string(match[1]), 10, 8)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ minute, err := strconv.ParseInt(string(match[2]), 10, 8)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ second, err := strconv.ParseFloat(string(match[3]), 8)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ return second + float64(60*minute) + float64(3600*hour)
+}
+
+func GetVideoLength(inputPath string) float64 {
+ fmt.Println("File: " + inputPath)
+ cmd := CmdGetVideoLength(inputPath)
+ output, err := cmd.CombinedOutput()
+ CheckCMDError(output, err)
+
+ outputString := string(output)
+ fmt.Println("Output: " + outputString)
+
+ return ParseVideoLength(outputString)
+}

src/ffmpeg/ffmpeg_local.go

@@ -5,8 +5,6 @@ import (
  "log"
  "math"
  "os/exec"
- "strconv"
- "strings"
 )
 
 /* Function to get the ffmpeg version
@@ -60,16 +58,21 @@ func CmdTrimLengthOfVideo(duration string, tempPath string) *exec.Cmd {
 /* Function to get the length (seconds) of a video
  *
  * Parameters:
- * inputDirectory - the directory of the video to find the length of
+ * inputPath - the path of the video to find the length of
  * Returns:
  exectauble command
 */
-func CmdGetVideoLength(inputDirectory string) *exec.Cmd {
- cmd := exec.Command("ffprobe",
- "-v", "error",
- "-show_entries", "format=duration",
- "-of", "default=noprint_wrappers=1:nokey=1",
- inputDirectory,
+func CmdGetVideoLength(inputPath string) *exec.Cmd {
+ // cmd := exec.Command("ffprobe",
+ // "-v", "error",
+ // "-show_entries", "format=duration",
+ // "-of", "default=noprint_wrappers=1:nokey=1",
+ // inputPath,
+ // )
+ cmd := exec.Command("ffmpeg",
+ "-hide_banner",
+ "-i", inputPath,
+ "-f", "null", "-",
  )
 
  return cmd
@@ -175,14 +178,10 @@ func checkSign(num float64) string {
 func trimEnd(tempPath string) {
  fmt.Println("Trimming end of merged video...")
 
- cmd := CmdGetVideoLength(tempPath + "/video_with_no_audio.mp4")
- output, err := cmd.CombinedOutput()
- CheckCMDError(output, err)
-
- video_length, err := strconv.ParseFloat(strings.TrimSpace(string(output)), 8)
+ video_length := GetVideoLength(tempPath + "/video_with_no_audio.mp4")
 
  //match the video length of the merged video with the true length of the video
- cmd = CmdTrimLengthOfVideo(fmt.Sprintf("%f", video_length), tempPath)
- output, err = cmd.CombinedOutput()
+ cmd := CmdTrimLengthOfVideo(fmt.Sprintf("%f", video_length), tempPath)
+ output, err := cmd.CombinedOutput()
  CheckCMDError(output, err)
 }

src/slideshow/slideshow.go

@@ -138,6 +138,10 @@ func (s slideshow) ScaleImages(lowQuality bool) {
  * v - verbose flag to determine what feedback to print
  */
 func (s slideshow) CreateVideo(useOldfade bool, tempDirectory string, outputDirectory string, v bool) {
+ if v {
+ fmt.Println("Temp Directory: " + tempDirectory)
+ fmt.Println("Output Directory: " + outputDirectory)
+ }
  // Checking FFmpeg version to use Xfade
  fmt.Println("Checking FFmpeg version...")
  var fadeType string = FFmpeg.ParseVersion()