X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=organize_videos;h=ea92012c51530c08b07c53a0a76e52a630337a34;hb=5084e6bde7b0e10b98c08badc2759bff76c74f26;hp=e8b02db03b4cc8a213912178f0d829e559be1985;hpb=d0bb8d7ba0914fb2e31422aa1207ba6eaf490deb;p=videoscripts%2F.git

diff --git a/organize_videos b/organize_videos
index e8b02db..ea92012 100755
--- a/organize_videos
+++ b/organize_videos
@@ -10,19 +10,13 @@ use Time::localtime;
 use File::Pid;
 
 ####################################################################################################
-# Configuration parameters - CHANGE THESE TO SUITE YOUR NEEDS
-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 = "+0"; # 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 $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";
+# Configuration parameters
+$mydir = `cd \$(dirname $0) 2>/dev/null; pwd`; chomp($mydir); unshift @INC,("$mydir");
+# Default configuration values
+require "organize_videos.conf";
+# Override defaults with local customizations
+if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.local"; }
+
 ####################################################################################################
 
 # Sanity check
@@ -60,17 +54,20 @@ my %month2monthname = (
 		       "12" => "Dec"
 		       );
 
-getopts("htvrpd:");
+getopts("htvnkpfd:");
 
 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 "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";
+    print "   -d <dir>  directory to recreate the playlists in. Only needed if -p option is given\n";
     return 1;
 }
+$SIG{'INT'} = sub {die "-E- Killed by CTRL-C\n"};
 
 sub is_folder_empty {
     my $dirname = shift;
@@ -81,7 +78,7 @@ sub is_folder_empty {
 sub create_playlists {
     my ($dstdirs) = @_;
     
-    foreach $dstdir (@{$dstdirs}) {
+    foreach $dstdir (keys %{$dstdirs}) {
 	print "-> Recreating playlists in: $dstdir\n";
 	print "-> Creating playlists for each month & year of clips from this directory: $video_directory\n";
 	opendir(VIDEODIR, "$dstdir") or die "-E- could not open: $dstdir\n";
@@ -106,15 +103,20 @@ sub create_playlists {
 		print "   Skipping $file since we can't extract the year and month from it\n"; 
 	    }
 	}
-    }
+
+        # Fix the permissions
+        system("chown $owner \"$dstdir/\"*.$playlist_extension");
+        system("chgrp $group \"$dstdir/\"*.$playlist_extension");
+        system("chmod $mode \"$dstdir/\"*.$playlist_extension");
+   } 
 }
 
 # Sanity checks / Option processing
 if(defined $opt_h) { usage(); exit 1; }
 if(defined $opt_p) {
     if(defined $opt_d) {
-	my @dstdirs = ("$opt_d"); 
-	create_playlists(\@dstdirs);
+	my %dstdirs = ("$opt_d",1); 
+	create_playlists(\%dstdirs);
     } else {
 	die "-E- You must specify the -d <dir> option when using the -p option\n"; 
     }
@@ -122,15 +124,16 @@ if(defined $opt_p) {
 }
 
 # Only proceed if there are video files to organize
-$video_files_found=`$find_cmd`;
+$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; }
 
 # Only one instance of this script running at a time
-my $pidfile = File::Pid->new({file => "/tmp/organize_videos.pid"});
+my $pidfile = File::Pid->new({file => "$pid_file", pid => "$$"});
 exit if $pidfile->running();
 $pidfile->write();
 
@@ -141,16 +144,26 @@ 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 -q -s \"$srcpathname\" $merge_opts");
+if(defined $opt_k) { $merge_opts .= "-k "; }
+if(defined $opt_v) { $merge_opts .= "-v "; }
+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"; }
 
+# 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;
+my %dstdirs;
 chdir "$srcpathname";
-print "$find_cmd\n" if($opt_v);
-foreach $file (`$find_cmd`) {
+print "$find_mkv\n" if($opt_v);
+foreach $file (`$find_mkv`) {
 
     chomp($file);
     $srcdir = dirname($file);
@@ -158,10 +171,14 @@ foreach $file (`$find_cmd`) {
     $srcfile = $file;
     $ext = $file; $ext =~ s/.*\.(\S+)$/$1/; $ext = lc($ext);
     
-    print "Found movie: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
-
     # Throw out files not in the current srcpath
     if((! -f "$srcfile") && (! -f "$srcdir/$srcfile")) { next; }
+
+    # Throw out encoded files left over from a previous run
+    print "srcfile: $srcfile\n";
+    if($srcfile =~ /.hb.mp4/) { next; }
+    
+    print "Found movie: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
         
     # Make a note of the month, year, and day this video was taken (from the modification time of the file)
     $date_taken = ctime(stat("$srcdir/$srcfile")->mtime);
@@ -174,21 +191,36 @@ foreach $file (`$find_cmd`) {
 	$monthnum = $month;
 	$monthname = lc($month2monthname{$month});
     }
+    elsif($srcfile =~ /^(\d\d\d\d)(\d\d)(\d\d)/) {
+        $year = $1;
+        $month = $2;
+        $day = sprintf("%02d",$3);
+        $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;
 	$month = $1;
 	$day = sprintf("%02d",$2);
 	$monthnum = $monthname2month{$month};
-	$monthname = lc($month2monthname{$month});
+	$monthname = lc($month);
     } else {
 	print "-E- Unable to parse year and month from this file: $srcdir/$srcfile\n";
 	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);
+    $dstdirs{$dstdir} = 1;
     $dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
 
     # Check for duplicate filenames at the destination
@@ -206,7 +238,7 @@ foreach $file (`$find_cmd`) {
 	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";
@@ -222,24 +254,24 @@ 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);
+	    }
+	}
     }
 }
 
 # For each destination dir we copied new content into, recreate the playlists
-create_playlists(\@dstdirs);
+create_playlists(\%dstdirs);
 
 $pidfile->remove();