X-Git-Url: http://git.pippins.net/embedvideo/.git/.%24link.?a=blobdiff_plain;f=organize_videos;h=647e08d8f7ededd8fe745f0e3d4f32d4cc285546;hb=5a4d4d3ceec69ce1973f790d0c9f27be9e38339b;hp=5727d57c6e4da119668975640cdb389bdc5d8d59;hpb=9990cf64d87333417ab72d6e106fa53df6ad2943;p=videoscripts%2F.git

diff --git a/organize_videos b/organize_videos
index 5727d57..647e08d 100755
--- 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;
@@ -223,7 +233,7 @@ foreach $file (`$find_cmd_with_mkv`) {
 	print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
     } else {
 	# Make sure the destination directories exist
-	$errno=system("mkdir -p \"$dstdir\"");
+	$errno=system("mkdir -p -m $dirmode \"$dstdir\"");
 	if($errno) { print "-E- Error creating dstdir: $dstdir\n"; next; }
 	# Perform the move operation from $srcdir/$srcfile -> $dstfile
 	print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";