X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=merge_videos_by_day;h=6d48bfc5dc6dc36ac43dfdd8abaa6c549cf63cb5;hb=6868d6dcb3b2aa816c411ccc640a38d73980df15;hp=dec78b2355b21f55754a2301fca7da4b58e78ff2;hpb=632c817d641c5701894b61c6080380ecfb36ca4e;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index dec78b2..6d48bfc 100755
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -1,4 +1,6 @@
 #!/usr/bin/perl
+# Author: Alan J. Pippin
+# Description: For the given srcpath, merge all the videos that were taken on the same day into a single mkv file
 
 use File::Copy;
 use File::Basename;
@@ -6,30 +8,36 @@ use Getopt::Std;
 use File::stat;
 use Time::localtime;
 
+####################################################################################################
+# Configuration parameters - CHANGE THESE TO SUITE YOUR NEEDS
+my $compute_host = "pippin.pippins.net"; # I need this since this script is run from a virtual machine 
+my $use_compute_host = 1; # Set to 1 to use a remote compute host to run the mkvmerge command. Set to 0 to use the local host to run it.
+my $make_mkv = "/naspool/videos/bin/make_mkv"; # Update this to be the path to the make_mkv script
+my $minage = "+10"; # Files must be older than X minutes to move
+my $owner = "ajp"; # The owner of the files after they are moved
+my $group = "pip"; # The group of the files after they are moved
+my $mode = "664"; # The mode to set on each file after they are moved
+my $video_suffix = "000"; # What number to start with when adding an incrementing suffix to the end of the video clip to avoid name collisons
+my $video_title_prefix = "HomeVideos:"; # What text to put on the front of the title for the merged video being created
+my $find_cmd = "find \"$srcpathname/\" -cmin $minage -iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mts\"";
+####################################################################################################
+
 # Command line options
-getopts("h:tvs:");
+getopts("rh:tvs:");
 
 sub usage {
-    print "usage: $0 [-t] -s <srcpath>\n";
+    print "usage: $0 [-tvrh] -s <srcpath>\n";
     print "   -s <srcpath>          specify the path to search for videos to merge under\n";
     print "   -h <compute host>     specify the remote compute host to submit the mkvmerge job to\n";
     print "   -v                    verbose mode; print extra information about what is being found/merged\n";
     print "   -t                    test mode; print what will happen, but don't do anything\n";
+    print "   -r                    remove merged video clips; after a merge, remove the individual video files that were merged\n";
     return 1;
 }
-if(defined $opt_h) { usage(); exit 1; }
-
-# Configuration parameters
-my $compute_host = "pippin.pippins.net";
 my $srcpathname = $opt_s;
-my $minage = "+10"; # Files must be older than X minutes to move
-my $owner = "ajp"; # The owner of the files after they are moved
-my $group = "pip"; # The group of the files after they are moved
-my $mode = "664"; # The mode to set on each file after they are moved
-my $make_mkv = "/naspool/videos/bin/make_mkv"; chomp($make_mkv);
-my $find_cmd = "find \"$srcpathname/\" -cmin $minage -iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mts\"";
+if(defined $opt_h) { usage(); exit 1; }
 
-# Sanity check
+# Sanity checks
 if(! -x $make_mkv) { die "-E- Unable to find required script: make_mkv\n"; }
 if(! -d $srcpathname) { &usage; print "-E- Can't find srcpath: $srcpathname\n"; exit 1; }
 if(defined $opt_h) { $compute_host = $opt_h; }
@@ -110,9 +118,9 @@ foreach $file (sort `$find_cmd`) {
     $dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
 
     # Check for duplicate filenames at the destination
-    $newfile = $dstfile . "." . "000";
+    $newfile = $dstfile . "." . $video_suffix;
     if(-e "$newfile.$ext") {
-	foreach $i ('001' .. '999') {
+	foreach $i ($video_suffix+1 .. '999') {
 	    $newfile = $dstfile . "." . $i;
 	    if(! -e "$newfile.$ext") { last; }
 	}
@@ -139,12 +147,17 @@ foreach $video (sort keys %videos) {
     }
     
     my $pwd = `pwd`; chomp($pwd);
-    my $cmd = "ssh $compute_host 'cd \"$pwd\"; $make_mkv -t \"HomeVideos: $year-$month-$day\" -o \"$video\" -i $videos'\n"; 
+    my $cmd = "";
+    if($use_compute_host) { $cmd .= "ssh $compute_host 'cd \"$pwd\";"; }
+    $cmd .= "$make_mkv -t \"$video_title_prefix $year-$month-$day\" -o \"$video\" -i $videos";
+    if($use_compute_host) { $cmd .= "'"; }
     if(defined $opt_t) {
 	print "\n-> Creating \"$video\"\n";
 	print "$cmd\n";
-	foreach $video (@{$videos{$video}}) {
-	    print("rm -f $video\n");
+	if(defined $opt_r) { 
+	    foreach $video (@{$videos{$video}}) {
+		print("rm -f $video\n");
+	    }
 	}
     } else {
 	# Create the merged video
@@ -156,8 +169,10 @@ foreach $video (sort keys %videos) {
 	system("chgrp $group \"$video\"");
 	system("chmod $mode \"$video\"");
 	# Remove the individual video files
-	foreach $video (@{$videos{$video}}) {
-	    system("rm -f $video");
+	if(defined $opt_r) { 
+	    foreach $video (@{$videos{$video}}) {
+		system("rm -f $video");
+	    }
 	}
     }
 }