Added force option to organize_videos which ignores $minage

[videoscripts/.git] / organize_videos

diff --git a/organize_videos b/organize_videos
index f666e84f0eb56660e2b8bea198d5824d161253bf..647e08d8f7ededd8fe745f0e3d4f32d4cc285546 100755 (executable)
--- a/organize_videos
+++ b/organize_videos
@@ -54,12 +54,13 @@ my %month2monthname = (
                       "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";
@@ -126,6 +127,7 @@ $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; }
 
@@ -190,6 +192,14 @@ foreach $file (`$find_cmd_with_mkv`) {
         $monthnum = $month;
         $monthname = lc($month2monthname{$month});
     }
+    # Get the date taken from the source directory
+    elsif($srcdir =~ /(\d+)-(\d+)-(\d+)/) {
+       $year = $1;
+       $month = $2;
+       $day = sprintf("%02d",$3);
+       $monthnum = $month;
+       $monthname = lc($month2monthname{$month});
+    }
     # Get the date taken from the modification time
     elsif($date_taken =~ /\S+\s+(\S+)\s+(\d+)\s+\S+\s+(\d+)/) {
        $year = $3;