Fixed a few bugs

[videoscripts/.git] / merge_videos_by_day

diff --git a/merge_videos_by_day b/merge_videos_by_day
index dd0d1caed6f01ef7bde9a9b6da139602c71ea067..91070d8f432a8d8219ab7c9151cb92912de26977 100755 (executable)
--- 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);
@@ -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,7 +202,7 @@ 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) {