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

diff --git a/organize_videos b/organize_videos
index 5727d57..a037d75 100755
--- a/organize_videos
+++ b/organize_videos
@@ -54,18 +54,20 @@ 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";
     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;
@@ -125,9 +127,10 @@ if(defined $opt_p) {
 $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
-$changed_files_found=`$find_changed_cmd`;
-if($changed_files_found) { exit 0; }
+# Only proceed if we are skipping this check or if the $srcpathname dir hasn't been modified in the last $minage minutes
+if(! $opt_f && ((time - (stat("$srcpathname"))->mtime) < ($minage * 60))) {
+  exit 0;
+}
 
 # Only one instance of this script running at a time
 my $pidfile = File::Pid->new({file => "$pid_file", pid => "$$"});
@@ -142,6 +145,7 @@ my $errno = 0;
 my $merge_opts = "";
 if(defined $opt_t) { $merge_opts .= "-t "; }
 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");
@@ -158,8 +162,8 @@ if(defined $opt_n) {
 # Copy the videos over to the destination path
 my %dstdirs;
 chdir "$srcpathname";
-print "$find_cmd_with_mkv\n" if($opt_v);
-foreach $file (`$find_cmd_with_mkv`) {
+print "$find_mkv\n" if($opt_v);
+foreach $file (`$find_mkv`) {
 
     chomp($file);
     $srcdir = dirname($file);
@@ -167,13 +171,20 @@ foreach $file (`$find_cmd_with_mkv`) {
     $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; }
-        
-    # 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);
+
+    # Throw out encoded files left over from a previous run
+    print "srcfile: $srcfile\n";
+    if($srcfile =~ /.hb.mp4/) { next; }
+    
+    print "Found video: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
+
+    # From the modification time of the file since we couldn't find it in the filename
+    $date_modified = ctime(stat("$srcdir/$srcfile")->mtime);
+
+    # NOTE: This file matching algorithm only applies to videos produced by merge_videos_by_day called by this script earlier
+    # We just need to take those merged videos, and extract what date to call the video by under HomeVideos
 
     # Get the date taken from the filename
     if($srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
@@ -190,13 +201,21 @@ 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+)/) {
+    elsif($date_modified =~ /\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;
@@ -218,12 +237,11 @@ foreach $file (`$find_cmd_with_mkv`) {
     }
     $dstfile = "$newfile.$ext";
 
-
     if(defined $opt_t) {
 	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";
@@ -245,7 +263,7 @@ foreach $file (`$find_cmd_with_mkv`) {
 	if(is_folder_empty($srcdir)) { 
 	    print "-> Subdir detected for videos ($srcdir != $srcpathname)\n" if($opt_v);
 	    if(! defined $opt_t) { 
-		$tmpdir=`tempfile`;
+		$tmpdir=`mktemp`;
 		system("rm $tmpdir");
 		system("cp -R \"$srcdir\" $tmpdir > /dev/null 2>/dev/null");
 		system("rm -rf \"$srcdir\"");