X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=organize_videos;h=0b252eab0cfbb6d362c421653f4bd1bc42965869;hb=d479508edd42fc325ede515aa6ffeceff258dea1;hp=754ac28124e8c17079678527a77a204d28c295e9;hpb=6868d6dcb3b2aa816c411ccc640a38d73980df15;p=videoscripts%2F.git

diff --git a/organize_videos b/organize_videos
index 754ac28..0b252ea 100755
--- a/organize_videos
+++ b/organize_videos
@@ -14,13 +14,15 @@ use File::Pid;
 my $srcpathname = "/naspool/pictures/New Photos"; # Path to look for videos to move from
 my $dstpathname = "/naspool/videos/HomeVideos"; # Path to move the videos to
 my $merge_videos_by_day = "/naspool/videos/bin/merge_videos_by_day";
-my $minage = "+10"; # File creation dates must be older than X minutes to move
+my $minage = "+15"; # Video file creation dates must not have changed in the last X minutes to process any of the video files
 my $owner = "ajp"; # The owner of the files after they are moved
 my $group = "pip"; # The group of the files after they are moved
 my $mode = "664"; # The mode to set on each file after they are moved
 my $playlist_extension = "pls"; # The extension to use when creating playlist files
 my $video_suffix = "000"; # What number to start with when adding an incrementing suffix to the end of the final video clip to avoid name collisions
-my $find_cmd = "find \"$srcpathname/\" -cmin $minage -a \\( -iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mts\" -o -iregex \".*\.mkv\" \\)";
+my $movie_file_ext = "-iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mts\" -o -iregex \".*\.mkv\"";
+my $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_file_ext \\)";
+my $find_cmd = "find \"$srcpathname/\" $movie_file_ext";
 ####################################################################################################
 
 # Sanity check
@@ -58,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;
 }
 
@@ -123,6 +126,10 @@ if(defined $opt_p) {
 $video_files_found=`$find_cmd`;
 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 one instance of this script running at a time
 my $pidfile = File::Pid->new({file => "/tmp/organize_videos.pid"});
 exit if $pidfile->running();
@@ -135,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 "; }
-$errno=system("$merge_videos_by_day -s \"$srcpathname\" $merge_opts");
-if($errno > 0) { $errno = $errno - 255; }
+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";
@@ -180,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;
@@ -189,13 +203,14 @@ foreach $file (`$find_cmd`) {
     $newfile = $dstfile . "." . $video_suffix;
     if(-e "$newfile.$ext") {
 	foreach $i ($video_suffix+1 .. '999') {
-	    $newfile = $dstfile . "." . $i;
+	    $newfile = $dstfile . "." . sprintf("%03d",$i);;
 	    if(! -e "$newfile.$ext") { last; }
 	}
 	$dstfile = $newfile;
     }
     $dstfile = "$newfile.$ext";
 
+
     if(defined $opt_t) {
 	print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
     } else {
@@ -216,18 +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("mv \"$srcdir\" $tmpdir > /dev/null 2>/dev/null");
-	      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);
+	    }
+	}
     }
 }