X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=merge_videos_by_day;h=91070d8f432a8d8219ab7c9151cb92912de26977;hb=26e29c4b2a1ba5181b379a64c86f4d521d77dcf7;hp=0737ee128484420b439dd46474701685923ce639;hpb=eb8eb0bd100a288298370362135991ad4710cc59;p=videoscripts%2F.git diff --git a/merge_videos_by_day b/merge_videos_by_day index 0737ee1..91070d8 100755 --- a/merge_videos_by_day +++ b/merge_videos_by_day @@ -92,10 +92,10 @@ foreach $file (sort `$find_cmd`) { if((! -f "$srcfile") && (! -f "$srcdir/$srcfile")) { next; } # Throw out encoded files left over from a previous run - print "srcfile: $srcfile\n"; + #print "srcfile: $srcfile\n" if($opt_v); if($srcfile =~ /.hb.mp4/) { next; } - print "Found movie: srcdir: $srcdir srcfile: $srcfile srcext: $srcext dstext: $ext\n" if($opt_v); + 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 (from the modification time of the file) $date_taken = ctime(stat("$srcdir/$srcfile")->mtime); @@ -176,8 +176,8 @@ foreach $dstfile (sort keys %videos) { 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($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) { @@ -193,7 +193,7 @@ foreach $dstfile (sort keys %videos) { } } else { # Create the merged video - print "$cmd" if($opt_v); + 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"; } @@ -202,13 +202,13 @@ foreach $dstfile (sort keys %videos) { # Fix the permissions system("chown $owner \"$dstfile\"*"); system("chgrp $group \"$dstfile\"*"); - system("chmod $mode \"$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($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) {