X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=blobdiff_plain;f=organize_videos;h=647e08d8f7ededd8fe745f0e3d4f32d4cc285546;hb=5a4d4d3ceec69ce1973f790d0c9f27be9e38339b;hp=782ee17e61fb5f910137746ac17a52f5198680b9;hpb=edc693952db5a6ff437046e6ee03be89c64ac62e;p=videoscripts%2F.git
diff --git a/organize_videos b/organize_videos
index 782ee17..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
]\n";
+ print "usage: $0 [-v] [-t] [-r] [-p] [-f] [-d ]\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 .\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; }
@@ -142,7 +144,9 @@ my $errno = 0;
my $merge_opts = "";
if(defined $opt_t) { $merge_opts .= "-t "; }
if(defined $opt_k) { $merge_opts .= "-k "; }
-$errno=system("$merge_videos_by_day -q -s \"$srcpathname\" $merge_opts");
+if($requantize_input_video) { $merge_opts .= ' -q'; }
+if($recompress_input_video) { $merge_opts .= ' -z'; }
+$errno=system("$merge_videos_by_day -s \"$srcpathname\" $merge_opts");
$errno = $errno >> 8;
if($errno) { die "-E- $merge_videos_by_day encountered some errors with exit code $errno\n"; }
@@ -188,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;
@@ -221,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";