my $merge_opts = "";
if(defined $opt_t) { $merge_opts .= "-t "; }
if(defined $opt_k) { $merge_opts .= "-k "; }
+if(defined $opt_v) { $merge_opts .= "-v "; }
if($requantize_input_video) { $merge_opts .= ' -q'; }
if($recompress_input_video) { $merge_opts .= ' -z'; }
$errno=system("$merge_videos_by_day -s \"$srcpathname\" $merge_opts");
# Copy the videos over to the destination path
my %dstdirs;
chdir "$srcpathname";
-print "$find_cmd_with_mkv\n" if($opt_v);
-foreach $file (`$find_cmd_with_mkv`) {
+print "$find_mkv\n" if($opt_v);
+foreach $file (`$find_mkv`) {
chomp($file);
$srcdir = dirname($file);
$srcfile = $file;
$ext = $file; $ext =~ s/.*\.(\S+)$/$1/; $ext = lc($ext);
- print "Found movie: srcdir: $srcdir srcfile: $srcfile ext: $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 ext: $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);
$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;