$video_files_found=`$find_cmd_with_mkv`;
if(!$video_files_found) { exit 0; }
-# Only proceed if no files have changed in the past $cmin minutes
-if($opt_f) { $find_changed_cmd =~ s/cmin \S+ /cmin +0 /; }
-$changed_files_found=`$find_changed_cmd`;
-if($changed_files_found) { exit 0; }
+# Only proceed if we are skipping this check or if the $srcpathname dir hasn't been modified in the last $minage minutes
+if(! $opt_f && ((time - (stat("$srcpathname"))->mtime) < ($minage * 60))) {
+ exit 0;
+}
# Only one instance of this script running at a time
my $pidfile = File::Pid->new({file => "$pid_file", pid => "$$"});
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);
+ print "Found video: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
+
+ # From the modification time of the file since we couldn't find it in the filename
+ $date_modified = ctime(stat("$srcdir/$srcfile")->mtime);
+
+ # NOTE: This file matching algorithm only applies to videos produced by merge_videos_by_day called by this script earlier
+ # We just need to take those merged videos, and extract what date to call the video by under HomeVideos
# Get the date taken from the filename
if($srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
$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);
if(is_folder_empty($srcdir)) {
print "-> Subdir detected for videos ($srcdir != $srcpathname)\n" if($opt_v);
if(! defined $opt_t) {
- $tmpdir=`tempfile`;
+ $tmpdir=`mktemp`;
system("rm $tmpdir");
system("cp -R \"$srcdir\" $tmpdir > /dev/null 2>/dev/null");
system("rm -rf \"$srcdir\"");