Fixed missing strict-anamorphic mode for HandBrake.

[videoscripts/.git] / organize_videos

diff --git a/organize_videos b/organize_videos
index ef624b7ee247f3d56b61f94ceecf858d20429c68..0b252eab0cfbb6d362c421653f4bd1bc42965869 100755 (executable)
--- a/organize_videos
+++ b/organize_videos
@@ -60,15 +60,16 @@ my %month2monthname = (
                       "12" => "Dec"
                       );
 
-getopts("htvrpd:");
+getopts("htvnkpd:");
 
 sub usage {
     print "usage: $0 [-v] [-t] [-r] [-p] [-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 "   -r = remove merged video clips; after a merge, remove the individual video files that were merged\n";
-    print "   -p = Only recreate video playlists. 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";
+    print "   -v        verbose; print file being moved (to).\n";
+    print "   -t        test; print what will happen, but don't do anything\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;
 }
 
@@ -141,11 +142,18 @@ system("date");
 my $errno = 0;
 my $merge_opts = "";
 if(defined $opt_t) { $merge_opts .= "-t "; }
-if(defined $opt_r) { $merge_opts .= "-r "; }
+if(defined $opt_k) { $merge_opts .= "-k "; }
 $errno=system("$merge_videos_by_day -q -s \"$srcpathname\" $merge_opts");
 $errno = $errno >> 8;
 if($errno) { die "-E- $merge_videos_by_day encountered some errors with exit code $errno\n"; }
 
+# Exit now if we are not supposed to copy the resultant video files to the destination path
+if(defined $opt_n) {
+    $pidfile->remove();
+    print "\n\n";
+    exit 0;
+}
+
 # Copy the videos over to the destination path
 my @dstdirs;
 chdir "$srcpathname";
@@ -186,7 +194,7 @@ foreach $file (`$find_cmd`) {
        next;
     }
 
-    # We are ready to pick a destination folder to put the picture in
+    # We are ready to pick a destination folder to put the video in
     $dstdir = $dstpathname . "/" . $year;
     push(@dstdirs,$dstdir);
     $dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
@@ -202,6 +210,7 @@ foreach $file (`$find_cmd`) {
     }
     $dstfile = "$newfile.$ext";
 
+
     if(defined $opt_t) {
        print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
     } else {
@@ -222,19 +231,19 @@ foreach $file (`$find_cmd`) {
        system("chgrp $group \"$dstfile\"");
        system("chmod $mode \"$dstfile\"");
     }
-
+    
     # Check to see if there is an empty sub directory to remove
     if(($srcdir ne $srcpathname) && ($srcpathname ne ".")) { 
-      if(is_folder_empty($srcdir)) { 
-         print "-> Subdir detected for videos ($srcdir != $srcpathname)\n" if($opt_v);
-         if(! defined $opt_t) { 
-             $tmpdir=`tempfile`;
-             system("rm $tmpdir");
-             system("cp -R \"$srcdir\" $tmpdir > /dev/null 2>/dev/null");
-             system("rm -rf \"$srcdir\"");
-             print "-> Moved empty subdir $srcdir to $tmpdir\n" if($opt_v);
-         }
-      }
+       if(is_folder_empty($srcdir)) { 
+           print "-> Subdir detected for videos ($srcdir != $srcpathname)\n" if($opt_v);
+           if(! defined $opt_t) { 
+               $tmpdir=`tempfile`;
+               system("rm $tmpdir");
+               system("cp -R \"$srcdir\" $tmpdir > /dev/null 2>/dev/null");
+               system("rm -rf \"$srcdir\"");
+               print "-> Moved empty subdir $srcdir to $tmpdir\n" if($opt_v);
+           }
+       }
     }
 }