X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=sidebyside;f=merge_videos_by_day;h=27f2e2bbd7fed6673ae9f2e441ac85f9fe79eca6;hb=c99a50a0fd63d9bb9eb0fa9d1232366e9e2d444f;hp=b285f1a4ad07e285aa427ae7186cb2ff42fca47b;hpb=e47e6977db0498c8b59328a1a122e6c11b571a73;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index b285f1a..27f2e2b 100755
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -9,36 +9,34 @@ use File::stat;
 use Time::localtime;
 
 # Early command line options processing
-getopts("rh:tvs:");
+getopts("qzkh: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\"";
+# Configuration parameters
+$mydir = `cd \$(dirname $0) 2>/dev/null; pwd`; chomp($mydir); unshift @INC,("$mydir");
+# Default configuration values
+require "organize_videos.conf";
+# Override defaults with local customizations
+if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.local"; }
+
 ####################################################################################################
 
 sub usage {
-    print "usage: $0 [-tvrh] -s <srcpath>\n";
+    print "usage: $0 [-tvrhz] -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";
+    print "   -k                    keep the individual video files that are merged. By default, after a merge, individual video files that were merged are removed\n";
+    print "   -q                    Requantize input videos to decrease output video size (requires HandBrakeCLI)\n";
+    print "   -z                    Recompress input videos to decrease output video size (requires HandBrakeCLI)\n";
     return 1;
 }
 if(defined $opt_h) { usage(); exit 1; }
 
 # Sanity checks
-if(! -x $make_mkv) { die "-E- Unable to find required script: make_mkv\n"; }
+if((defined $opt_q || defined $opt_z) && !$use_compute_host && ! -x "$handbrake") { die "-E- Unable to find required program: handbrake\n"; }
 if(! -d $srcpathname) { &usage; print "-E- Can't find srcpath: $srcpathname\n"; exit 1; }
 if(defined $opt_h) { $compute_host = $opt_h; }
 
@@ -96,7 +94,7 @@ foreach $file (sort `$find_cmd`) {
     $date_taken = ctime(stat("$srcdir/$srcfile")->mtime);
 
     # Get the date taken from the filename
-    if($srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
+    if(!$merge_by_modification_date && $srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
 	$year = $1;
 	$month = $2;
 	$day = sprintf("%02d",$3);
@@ -136,20 +134,9 @@ foreach $file (sort `$find_cmd`) {
     push(@{$videos{"$srcext"}{"$dstfile"}}, "\"$srcdir/$srcfile\"");
 }
 
-# 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;
-	}
-    }
-}
-    
 # Check for duplicate filenames in the dstfiles being created for other exts
 foreach $ext (sort keys %videos) {
-    foreach $video (sort keys %{$videos{$ext}}) {
+    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; }
@@ -176,7 +163,7 @@ foreach $ext (sort keys %videos) {
 foreach $ext (sort keys %videos) {
     foreach $video (sort keys %{$videos{$ext}}) {
 	foreach $srcfile (@{$videos{$ext}{$video}}) { 
-	    print "   merging \"$srcfile\" into \"$video\"\n";
+	    print "   merging $srcfile into \"$video\"\n";
 	}
     }
 }
@@ -188,10 +175,6 @@ foreach $ext (sort keys %videos) {
 
 	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;
@@ -202,13 +185,22 @@ foreach $ext (sort keys %videos) {
 	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($requantize_input_video) { $cmd .= ' -q'; }
+	if($recompress_input_video) { $cmd .= ' -z'; }
 	if($use_compute_host) { $cmd .= "'"; }
 	if(defined $opt_t) {
+	    # Print what will be done, but don't actually do it
 	    print "\n-> Creating \"$video\"\n";
 	    print "$cmd\n";
-	    if(defined $opt_r) { 
+	    if(!defined $opt_k) { 
 		foreach $video (@{$videos{$ext}{$video}}) {
-		    print("rm -f $video\n");
+		    if(($save_originals) && ($video =~ /\.$originals_file_ext/)) {
+			print "-> Saving the original video $video\n";
+			print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
+		    } else {
+			print "-> Removing the original video $video\n";
+			print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
+		    }
 		}
 	    }
 	} else {
@@ -216,14 +208,21 @@ foreach $ext (sort keys %videos) {
 	    my $errno = system("$cmd");
 	    $errno = $errno >> 8;
 	    if($errno) { die "-E- make_mkv encountered some errors with exit code $errno\n"; }
+	    system("ls -l \"$srcpathname/\" > /dev/null"); # Make sure the video file is there
 	    # 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");
+	    if(!defined $opt_k) { 
+		foreach $srcvideo (@{$videos{$ext}{$video}}) {
+		    if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
+			print "-> Saving the original video $srcvideo to $origpathname\n";
+			system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
+		    } else {
+			print "-> Removing the original video $srcvideo\n";
+			system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
+		    }
 		}
 	    }
 	}