Major rewrite of video import scripts to handle videos from any device

[videoscripts/.git] / organize_videos

diff --git a/organize_videos b/organize_videos
index 647e08d8f7ededd8fe745f0e3d4f32d4cc285546..ea92012c51530c08b07c53a0a76e52a630337a34 100755 (executable)
--- a/organize_videos
+++ b/organize_videos
@@ -67,6 +67,7 @@ sub usage {
     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;
@@ -144,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");
@@ -160,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);
@@ -169,10 +171,14 @@ 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; }
+
+    # 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);
@@ -206,7 +212,7 @@ foreach $file (`$find_cmd_with_mkv`) {
        $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;
@@ -228,7 +234,6 @@ foreach $file (`$find_cmd_with_mkv`) {
     }
     $dstfile = "$newfile.$ext";
 
-
     if(defined $opt_t) {
        print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
     } else {