X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=merge_videos_by_day;h=3fdb42660bd16761e9802507a75557e47f81110a;hb=HEAD;hp=4a58f0fce3d398c5561402f573ff18c7e4f11ab8;hpb=64702de206d3356a3d80acf75b572bd9c31c86d9;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index 4a58f0f..3fdb426 100755
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -7,6 +7,12 @@ use File::Basename;
 use Getopt::Std;
 use File::stat;
 use Time::localtime;
+use DateTime::Format::Strptime qw( );
+
+# Set our ffmpeg creation_time format
+$ffmpeg_time_format_utc = DateTime::Format::Strptime->new(pattern=>'%Y-%m-%dT%H:%M:%S', time_zone => 'UTC', on_error => 'croak');
+$ffmpeg_time_format_local = DateTime::Format::Strptime->new(pattern=>'%Y-%m-%dT%H:%M:%S', time_zone => 'local', on_error => 'croak');
+$ctime_format = DateTime::Format::Strptime->new(pattern=>'%a %b %d %H:%M:%S %Y', time_zone => 'local', on_error => 'croak');
 
 # Early command line options processing
 getopts("qzkh:tvs:");
@@ -34,11 +40,14 @@ sub usage {
     return 1;
 }
 if(defined $opt_h) { usage(); exit 1; }
+$SIG{'INT'} = sub {die "-E- Killed by CTRL-C\n"};
 
+####################################################################################################
 # Sanity checks
 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; }
+if(! -x $ffmpeg) { die "-E- Missing required executable for ffmpeg: $ffmpeg\n"; }
 
 my %monthname2month = (
 		       "Jan" => "01",
@@ -84,17 +93,41 @@ 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; }
-            
-    # 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);
-    
+
+    # Throw out encoded files left over from a previous run
+    #print "srcfile: $srcfile\n" if($opt_v);
+    if($srcfile =~ /.hb.mp4/) { next; }
+
+    print "Found video: 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
+    $creation_time = `$ffmpeg -i "$srcdir/$srcfile" 2>&1 | grep "creation_time" | head -n 1 | awk '{print \$3}'`;
+    $brands = `$ffmpeg -i "$srcdir/$srcfile" 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands);
+    if($creation_time) {
+	$date_taken = $ffmpeg_time_format_utc->parse_datetime($creation_time);
+        if ($brands && $brands =~ /$local_tz_brands/) {
+            $date_taken = $ffmpeg_time_format_local->parse_datetime($creation_time);
+        }
+    } else {
+	# From the modification time of the file since we couldn't find it in the video file
+	$date_modified = ctime(stat("$srcdir/$srcfile")->mtime);
+    }
+
+    # Get the date taken from the ffmpeg creation_time
+    if(!$merge_by_modification_time && $date_taken) {
+	$date_taken->set_time_zone('local');
+	$year = $date_taken->year;
+	$month = sprintf("%02d",$date_taken->month);
+	$day = sprintf("%02d",$date_taken->day);
+	$monthnum = sprintf("%02d",$date_taken->month);
+	$monthname = lc($month2monthname{$month});
+	#print "date_taken: $year-$month-$day ".$date_taken->hour.":".$date_taken->minute.":".$date_taken->second." ".$date_taken->time_zone."\n";
+    }
     # Get the date taken from the filename
-    if(!$merge_by_modification_date && $srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
+    elsif(!$merge_by_modification_date && $srcfile =~ /^(\d\d\d\d)-(\d\d)-(\d\d)/) {
 	$year = $1;
 	$month = $2;
 	$day = sprintf("%02d",$3);
@@ -109,7 +142,7 @@ foreach $file (sort `$find_cmd`) {
         $monthname = lc($month2monthname{$month});
     }
     # Get the date taken from the srcdir
-    elsif(!$merge_by_modification_date && $srcdir =~ /(\d+)-(\d+)-(\d+)/) {
+    elsif(!$merge_by_modification_date && $srcdir =~ /(\d\d\d\d)-(\d\d)-(\d\d)/) {
 	$year = $1;
 	$month = $2;
 	$day = sprintf("%02d",$3);
@@ -117,12 +150,12 @@ foreach $file (sort `$find_cmd`) {
 	$monthname = lc($month2monthname{$month});
     }
     # Get the date taken from the modification time
-    elsif($date_taken =~ /\S+\s+(\S+)\s+(\d+)\s+\S+\s+(\d+)/) {
+    elsif($date_modified =~ /\S+\s+(\S+)\s+(\d+)\s+\S+\s+(\d+)/) {
 	$year = $3;
 	$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;
@@ -132,112 +165,86 @@ foreach $file (sort `$find_cmd`) {
     $dstdir = $srcdir;
     $dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
 
-    # Check for duplicate filenames at the destination
-    $newfile = $dstfile . "." . $video_suffix;
-    if(-e "$newfile.$ext") {
-	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";
-
-    # You can only merge videos into a single destination that have the same extension/type
-    push(@{$videos{"$srcext"}{"$dstfile"}}, "\"$srcdir/$srcfile\"");
-}
-
-# 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};
-		}
-	    }
-	}
-    }
+    # Make a note of this video and its merged destination
+    push(@{$videos{"$dstfile"}}, "\"$srcdir/$srcfile\"");
 }
 
 # 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";
-	}
+foreach $dstfile (sort keys %{$videos}) {
+    foreach $srcfile (@{$videos{$dstfile}}) { 
+	print "   merging $srcfile into \"$dstfile\"\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}});
-	
-	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($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_k) { 
-		foreach $video (@{$videos{$ext}{$video}}) {
-		    if(($save_originals) && ($video =~ /\.$originals_file_ext/)) {
-			print "-> Saving the original video $video\n";
+foreach $dstfile (sort keys %videos) {
+
+    my $videos = join(',', @{$videos{$dstfile}});
+    
+    if($dstfile =~ /(\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 \"$dstfile\" -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 \"$dstfile\"\n";
+	print "$cmd\n";
+	if(!defined $opt_k) { 
+	    foreach $video (@{$videos{$dstfile}}) {
+		if($opt_v) { print "   $ffmpeg -i $video 2>&1 | grep \"compatible_brands\" | tail -n 1\n"; }
+		my $brands=`$ffmpeg -i $video 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands);
+		if(($save_originals) && ($video =~ /\.$originals_file_ext/) && (!$brands || $brands !~ /$originals_no_copy_brands/)) {
+		    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 "-> Removing the original video $video\n";
-			print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
+			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
-	    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_k) { 
-		foreach $srcvideo (@{$videos{$ext}{$video}}) {
-		    if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
-			print "-> Saving the original video $srcvideo to $origpathname\n";
+	}
+    } else {
+	# Create the merged video
+	print "$cmd\n" 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 \"$dstfile\"*");
+	system("chgrp $group \"$dstfile\"*");
+	system("find \"$dstfile\"* -type f -exec chmod $mode -- {} +");
+
+	# Remove the individual video files
+	if(!defined $opt_k) { 
+	    foreach $srcvideo (@{$videos{$dstfile}}) {
+		if($opt_v) { print "   $ffmpeg -i $srcvideo 2>&1 | grep \"compatible_brands\" | tail -n 1\n"; }
+		my $brands=`$ffmpeg -i $srcvideo 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands);
+		if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/) && (!$brands || $brands !~ /$originals_no_copy_brands/)) {		
+		    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 {
-			print "-> Removing the original video $srcvideo\n";
-			system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
+			system("mv $srcvideo \"$origpathname/".basename($srcvideo));
 		    }
+		} else {
+		    print "-> Removing the original video $srcvideo\n";
+		    system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
 		}
 	    }
 	}