Fixed some bugs found in re-testing

diff --git a/merge_videos_by_day b/merge_videos_by_day
index 6dce13c1eb54d88f48b340c8693622ddceb1ef07..4cf293ddea47cbd2b699faf4febcaa0fbe22fff7 100755 (executable)
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -282,14 +282,15 @@ foreach $ext (sort keys %videos) {
            my $errno = system("$cmd");
            $errno = $errno >> 8;
            if($errno) { die "-E- make_mkv encountered some errors with exit code $errno\n"; }
+           system("ls -l \"$srcpathname/\" > /dev/null"); # Make sure the video file is there
            # Fix the permissions
            system("chown $owner \"$video\"");
            system("chgrp $group \"$video\"");
            system("chmod $mode \"$video\"");
            # Remove the individual video files
            if(!defined $opt_k) { 
-               foreach $video (@{$videos{$ext}{$video}}) {
-                   system("rm -f $video");
+               foreach $srcvideo (@{$videos{$ext}{$video}}) {
+                   system("rm -f $srcvideo");
                }
            }
        }

diff --git a/organize_videos b/organize_videos
index 4e1ad7ff95bd95c29ffb28cd442304680a820592..5625f8bcd927a0ca19830dadabf4155cafd255bd 100755 (executable)
--- a/organize_videos
+++ b/organize_videos
@@ -197,7 +197,7 @@ foreach $file (`$find_cmd_with_mkv`) {
 
     # We are ready to pick a destination folder to put the video in
     $dstdir = $dstpathname . "/" . $year;
-    $dstdirs[$dstdir] = 1;
+    $dstdirs{$dstdir} = 1;
     $dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
 
     # Check for duplicate filenames at the destination