X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=merge_videos_by_day;h=b285f1a4ad07e285aa427ae7186cb2ff42fca47b;hb=3a3bb78c7414ec15e6b557522792069eca34530a;hp=dec78b2355b21f55754a2301fca7da4b58e78ff2;hpb=be9a9d1914a8f80b031631f902c9daae0b8f6d90;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index dec78b2..b285f1a 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;
 
-# Command line options
-getopts("h:tvs:");
+# Early command line options processing
+getopts("rh:tvs:");
+my $srcpathname = $opt_s;
+
+####################################################################################################
+# 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\"";
+####################################################################################################
 
 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\"";
-
-# 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; }
@@ -75,9 +83,11 @@ foreach $file (sort `$find_cmd`) {
     $srcdir = dirname($file);
     $file = basename($file);
     $srcfile = $file;
+    $srcext = "";
+    if($srcfile =~ /\.(\w+)$/) { $srcext = $1; }
     $ext = "mkv";
     
-    print "Found movie: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
+    print "Found movie: srcdir: $srcdir srcfile: $srcfile srcext: $srcext dstext: $ext\n" if($opt_v);
 
     # Throw out files not in the current srcpath
     if((! -f "$srcfile") && (! -f "$srcdir/$srcfile")) { next; }
@@ -110,54 +120,112 @@ 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') {
-	    $newfile = $dstfile . "." . $i;
+	foreach $i ($video_suffix+1 .. '999') {
+	    $newfile = $dstfile . "." . sprintf("%03d",$i);
 	    if(! -e "$newfile.$ext") { last; }
 	}
 	$dstfile = $newfile;
     }
+
+    # Set the name of our unique destination file
     $dstfile = "$newfile.$ext";
 
-    print "   merging \"$srcdir/$srcfile\" into \"$dstfile\"\n";
-    push(@{$videos{"$dstfile"}}, "\"$srcdir/$srcfile\"");
+    # You can only merge videos into a single destination that have the same extension/type
+    push(@{$videos{"$srcext"}{"$dstfile"}}, "\"$srcdir/$srcfile\"");
 }
 
-foreach $video (sort keys %videos) {
-
-    my $videos = join(',', @{$videos{$video}});
-
-    # Only merge the videos if there is more than 1
-    my $num_videos = $#{$videos{$video}} + 1;
-    if($num_videos <= 1) { next; }
-    
-    if($video =~ /(\d+)-(\d+)-(\d+)/) {
-	$year = $1;
-	$month = $2;
-	$day = sprintf("%02d",$3);
+# Only merge the videos if there is more than 1 video to merge on a given day for a given ext
+foreach $ext (sort keys %videos) {
+    foreach $video (sort keys %{$videos{$ext}}) {
+	my $num_videos = $#{$videos{$ext}{$video}} + 1;
+	if($num_videos <= 1) {
+	    delete $videos{$ext}{$video};
+	    next;
+	}
     }
+}
     
-    my $pwd = `pwd`; chomp($pwd);
-    my $cmd = "ssh $compute_host 'cd \"$pwd\"; $make_mkv -t \"HomeVideos: $year-$month-$day\" -o \"$video\" -i $videos'\n"; 
-    if(defined $opt_t) {
-	print "\n-> Creating \"$video\"\n";
-	print "$cmd\n";
-	foreach $video (@{$videos{$video}}) {
-	    print("rm -f $video\n");
+# Check for duplicate filenames in the dstfiles being created for other exts
+foreach $ext (sort keys %videos) {
+    foreach $video (sort keys %{$videos{$ext}}) {
+	# Make sure this video name is not in use as a destination for any other ext
+	foreach $checkext (sort keys %videos) {
+	    if($checkext eq $ext) { next; }
+	    foreach $checkvideo (sort keys %{$videos{$checkext}}) {
+	     	if("$video" eq "$checkvideo") {
+		    if($video =~ /(.*?)\.(\d+)\.(\w+)$/) {
+			$dstfile = $1;
+			$dstnum = $2;
+			$dstext = $3;
+		    }
+		    foreach $i ($dstnum .. '999') {
+			$newfile = $dstfile . "." . sprintf("%03d",$i);
+			if("$video" ne "$newfile.$dstext") { last; }
+		    }
+		    $videos{$ext}{"$newfile.$dstext"} = $videos{$ext}{$video};
+		    delete $videos{$ext}{$video};
+		}
+	    }
 	}
-    } else {
-	# Create the merged video
-	my $errno = system("$cmd");
-	if($errno > 0) { $errno = $errno - 255; }
-	if($errno) { die "-E- make_mkv encountered some errors with exit code $errno\n"; }
-	# Fix the permissions
-	system("chown $owner \"$video\"");
-	system("chgrp $group \"$video\"");
-	system("chmod $mode \"$video\"");
-	# Remove the individual video files
-	foreach $video (@{$videos{$video}}) {
-	    system("rm -f $video");
+    }
+}
+
+# Tell the user which videos we are going to merge
+foreach $ext (sort keys %videos) {
+    foreach $video (sort keys %{$videos{$ext}}) {
+	foreach $srcfile (@{$videos{$ext}{$video}}) { 
+	    print "   merging \"$srcfile\" into \"$video\"\n";
+	}
+    }
+}
+
+# Now actually do the merging
+print "\n";
+foreach $ext (sort keys %videos) {
+    foreach $video (sort keys %{$videos{$ext}}) {
+
+	my $videos = join(',', @{$videos{$ext}{$video}});
+	
+	# Only merge the videos if there is more than 1
+	#my $num_videos = $#{$videos{$ext}{$video}} + 1;
+	#if($num_videos <= 1) { next; }
+	
+	if($video =~ /(\d+)-(\d+)-(\d+)/) {
+	    $year = $1;
+	    $month = $2;
+	    $day = sprintf("%02d",$3);
+	}
+	
+	my $pwd = `pwd`; chomp($pwd);
+	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";
+	    if(defined $opt_r) { 
+		foreach $video (@{$videos{$ext}{$video}}) {
+		    print("rm -f $video\n");
+		}
+	    }
+	} else {
+	    # Create the merged video
+	    my $errno = system("$cmd");
+	    $errno = $errno >> 8;
+	    if($errno) { die "-E- make_mkv encountered some errors with exit code $errno\n"; }
+	    # Fix the permissions
+	    system("chown $owner \"$video\"");
+	    system("chgrp $group \"$video\"");
+	    system("chmod $mode \"$video\"");
+	    # Remove the individual video files
+	    if(defined $opt_r) { 
+		foreach $video (@{$videos{$ext}{$video}}) {
+		    system("rm -f $video");
+		}
+	    }
 	}
     }
 }