"12" => "Dec"
);
-getopts("htvnkpd:");
+getopts("htvnkpfd:");
sub usage {
- print "usage: $0 [-v] [-t] [-r] [-p] [-d <dir>]\n";
+ print "usage: $0 [-v] [-t] [-r] [-p] [-f] [-d <dir>]\n";
print " -v verbose; print file being moved (to).\n";
print " -t test; print what will happen, but don't do anything\n";
+ print " -f force it to run by ignoring the \$minage setting in organize_videos.conf\n";
print " -n do not copy to dest; do not copy the resultant video files to the destination dir\n";
print " -k keep the individual video files that are merged. By default, after a merge, individual video files that were merged are removed\n";
print " -p only recreate video playlists, do not process any video files. Do this for each year & month of video clips in the directory specified by -d <dir>.\n";
print " -d <dir> directory to recreate the playlists in. Only needed if -p option is given\n";
return 1;
}
+$SIG{'INT'} = sub {die "-E- Killed by CTRL-C\n"};
sub is_folder_empty {
my $dirname = shift;
$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
-$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 => "$$"});
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; }
-
- # 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($srcfile =~ /.hb.mp4/) { next; }
+
+ 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);
$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;
}
$dstfile = "$newfile.$ext";
-
if(defined $opt_t) {
print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
} else {
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\"");