X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=merge_videos_by_day;h=1a153b00e63ad4bfed95eeb85838666cc9d22b27;hb=bfa24cc8c0228028cae669b2fa0adddef10470ae;hp=6dce13c1eb54d88f48b340c8693622ddceb1ef07;hpb=c91b8b9feda0a1fc3221cffd3e28cee33e919b5a;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index 6dce13c..1a153b0 100755
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -9,7 +9,7 @@ use File::stat;
 use Time::localtime;
 
 # Early command line options processing
-getopts("qkh:tvs:");
+getopts("qzkh:tvs:");
 my $srcpathname = $opt_s;
 
 ####################################################################################################
@@ -23,19 +23,20 @@ if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.loca
 ####################################################################################################
 
 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 "   -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 MTS input videos to decrease output video size (requires HandBrakeCLI)\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(defined $opt_q && !$use_compute_host) { die "-E- Unable to find required program: handbrake\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; }
 
@@ -83,17 +84,36 @@ foreach $file (sort `$find_cmd`) {
     $srcext = "";
     if($srcfile =~ /\.(\w+)$/) { $srcext = $1; }
     $ext = "mkv";
-    
-    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; }
+
+    # Throw out encoded files left over from a previous run
+    print "srcfile: $srcfile\n";
+    if($srcfile =~ /.hb.mp4/) { next; }
+
+    print "Found movie: srcdir: $srcdir srcfile: $srcfile srcext: $srcext dstext: $ext\n" if($opt_v);
             
     # Make a note of the month, year, and day this video was taken (from the modification time of the file)
     $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);
+	$monthnum = $month;
+	$monthname = lc($month2monthname{$month});
+    }
+    elsif(!$merge_by_modification_date && $srcfile =~ /^(\d\d\d\d)(\d\d)(\d\d)/) {
+        $year = $1;
+        $month = $2;
+        $day = sprintf("%02d",$3);
+        $monthnum = $month;
+        $monthname = lc($month2monthname{$month});
+    }
+    # Get the date taken from the srcdir
+    elsif(!$merge_by_modification_date && $srcdir =~ /(\d+)-(\d+)-(\d+)/) {
 	$year = $1;
 	$month = $2;
 	$day = sprintf("%02d",$3);
@@ -106,7 +126,7 @@ foreach $file (sort `$find_cmd`) {
 	$month = $1;
 	$day = sprintf("%02d",$2);
 	$monthnum = $monthname2month{$month};
-	$monthname = lc($month2monthname{$month});
+	$monthname = lc($month);
     } else {
 	print "-E- Unable to parse year and month from this file: $srcdir/$srcfile\n";
 	next;
@@ -133,119 +153,49 @@ foreach $file (sort `$find_cmd`) {
     push(@{$videos{"$srcext"}{"$dstfile"}}, "\"$srcdir/$srcfile\"");
 }
 
-# For single videos, with the re-quantize option given, rename the destination file to mp4
-foreach $ext (sort keys %videos) {
-    foreach $video (sort keys %{$videos{$ext}}) {	
-	# Get a count of the number of videos for this date
-	# If we only have a single video, its extension will actually be mp4 if opt_q is specified
-	my $num_videos = $#{$videos{$ext}{$video}} + 1;
-	if((defined $opt_q) && ($num_videos <= 1)) {
-	    if($video =~ /(.*?)\.(\d+)\.(\w+)$/) {
-		$dstfile = $1;
-		$dstnum = $2;
-		$new_dstvideo = "$1.$2.mp4";
-		$videos{$ext}{$new_dstvideo} = $videos{$ext}{$video}; # make a new dst video entry with the src video being the same
-		delete $videos{$ext}{$video}; # delete the old destination video from the hash
-	    }
-	}
-    }
-}
-
 # Check for duplicate filenames in the dstfiles being created for other exts
+my $last_dstnum = 0;
+my $changed_dst = 0;
 foreach $ext (sort keys %videos) {
-    foreach $video (sort keys %{$videos{$ext}}) {	
+    #print "checking: $ext\n";
+    foreach $video (sort keys %{$videos{$ext}}) {
+	#print "checking: $ext $video\n";
 	# Make sure this video name is not in use as a destination for any other ext
 	foreach $checkext (sort keys %videos) {
+	    #print "checking: $ext $video $checkext\n";
 	    if($checkext eq $ext) { next; }
 	    foreach $checkvideo (sort keys %{$videos{$checkext}}) {
+		#print "checking: $ext $video $checkext $checkvideo\n";
 	     	if("$video" eq "$checkvideo") {
 		    if($video =~ /(.*?)\.(\d+)\.(\w+)$/) {
 			$dstfile = $1;
 			$dstnum = $2;
 			$dstext = $3;
 		    }
-		    foreach $i ($dstnum .. '999') {
+		    foreach $i ($last_dstnum .. '999') {
+			$last_dstnum = $i + 1;
 			$newfile = $dstfile . "." . sprintf("%03d",$i);
 			if("$video" ne "$newfile.$dstext") { last; }
 		    }
 		    $videos{$ext}{"$newfile.$dstext"} = $videos{$ext}{$video};
+		    #print "for ext $ext changed destination to: $newfile.$dstext: $videos{$ext}{$video};\n";
 		    delete $videos{$ext}{$video};
+		    $changed_dst = 1;
+		    last;
 		}
 	    }
+	    if($changed_dst) { last; }
 	}
+	if($changed_dst) { last; }
     }
-}
-
-# Only merge the videos if there is more than 1 video to merge on a given day for a given ext
-# If there is only 1 video for a given day for a given ext, re-quantize it here if that option was given
-foreach $ext (sort keys %videos) {
-    foreach $video (sort keys %{$videos{$ext}}) {
-	
-	# Get a count of the number of videos for this date
-	my $num_videos = $#{$videos{$ext}{$video}} + 1;
-
-	# Process any single videos now
-	if($num_videos <= 1) {
-
-	    # Store the srcvideo name
-	    my $srcvideo = $videos{$ext}{$video}[0];
-	    my $pwd = `pwd`; chomp($pwd);
-
-	    # Make a note if this video is interlaced or not
-	    my $ffmpeg_cmd = "";
-	    if($use_compute_host) { $ffmpeg_cmd .= "ssh $compute_host 'cd \"$pwd\";"; }
-	    $ffmpeg_cmd .= "$ffmpeg -i $srcvideo 2>&1 | grep -q \"frame rate differs\"";
-	    if($use_compute_host) { $ffmpeg_cmd .= "'"; }
-	    my $progressive = system('$ffmpeg_cmd');
-	    if(!$progressive) { print "   Detected interlaced video content: $srcvideo\n"; }
-	    
-	    # Re-quantize the input video to reduce the resulting output filesize
-	    # This also gives us a chance to deinterlace the video as well
-	    # Only do this for .MTS videos
-	    if((defined $opt_q) && ($ext =~ /mts/i)) {
-		
-		# Set our requantize factor accordingly
-		my $requantize_option = "";
-		if(!$progressive) { $requantize_option = "-q $interlaced_requantize_quality"; }
-		else { $requantize_option = "-q $progressive_requantize_quality"; }
-		
-		# Set our de-interlace option accordingly
-		my $deinterlace_option = "";
-		if(!$progressive) { $deinterlace_option = "-d"; }
-		
-		# Use HandBrake to requantize/deinterlace the input video
-		print "   Re-quantizing input video content: $video\n";
-		my $handbrake_cmd = "";
-		if($use_compute_host) { $handbrake_cmd .= "ssh $compute_host 'cd \"$pwd\";"; }
-		$handbrake_cmd .= "$handbrake $deinterlace_option $requantize_option $handbrake_options -i $srcvideo -o \"$video\" > /dev/null 2>&1";
-		if($use_compute_host) { $handbrake_cmd .= "'"; }
-		if(! defined $opt_t) { 
-		    my $errno = system("$handbrake_cmd");
-		    $errno = $errno >> 8;
-		    if($errno > 1) {
-			unlink "$video";
-			die "-E- handbrake encountered some errors with exit code $errno\n";
-		    } else {
-			# Remove the original srcvideo since we created a new version of it that we are going to keep instead
-			if(!defined $opt_k) { 
-			    system("rm -f $srcvideo\n");
-			}
-		    }
-		}
-	    }
-
-	    # Remove the video from the array since we already processed it above
-	    delete $videos{$ext}{$video};
-	    next;
-	}
-    }
+    $changed_dst = 0;
 }
 
 # 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";
+	    print "   merging $ext $srcfile into \"$video\"\n";
 	}
     }
 }
@@ -268,28 +218,55 @@ foreach $ext (sort keys %videos) {
 	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($opt_v) { $cmd .= ' -v'; }
 	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_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";
+			if(index($video, basename(dirname($video))) == -1) { 
+			    print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
+			} else {
+			    print("mv $video \"$origpathname/".basename($video)."\n");
+			}
+		    } else {
+			print "-> Removing the original video $video\n";
+			print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
+		    }
 		}
 	    }
 	} else {
 	    # Create the merged video
+	    print "$ext: $cmd" if($opt_v);
 	    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\"");
+	    if(-f "$video") { 
+		system("chown $owner \"$video\"");
+		system("chgrp $group \"$video\"");
+		system("chmod $mode \"$video\"");
+	    }
 	    # Remove the individual video files
 	    if(!defined $opt_k) { 
-		foreach $video (@{$videos{$ext}{$video}}) {
-		    system("rm -f $video");
+		foreach $srcvideo (@{$videos{$ext}{$video}}) {
+		    if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
+			print "-> Saving the original video $srcvideo to $origpathname\n";
+			if(index($srcvideo, basename(dirname($srcvideo))) == -1) { 
+			    system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
+			} else {
+			    system("mv $srcvideo \"$origpathname/".basename($srcvideo));
+			}
+		    } else {
+			print "-> Removing the original video $srcvideo\n";
+			system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
+		    }
 		}
 	    }
 	}