Fixed bug in not removing original src files

diff --git a/merge_videos_by_day b/merge_videos_by_day
index e164bee42d08f452c22076478943caa52fdbb35e..42744fe3b1de5318e301b56f47f78f0d6e780407 100755 (executable)
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -163,7 +163,7 @@ foreach $ext (sort keys %videos) {
 foreach $ext (sort keys %videos) {
     foreach $video (sort keys %{$videos{$ext}}) {
        foreach $srcfile (@{$videos{$ext}{$video}}) { 
-           print "   merging \"$srcfile\" into \"$video\"\n";
+           print "   merging $srcfile into \"$video\"\n";
        }
     }
 }
@@ -194,15 +194,12 @@ foreach $ext (sort keys %videos) {
            print "$cmd\n";
            if(!defined $opt_k) { 
                foreach $video (@{$videos{$ext}{$video}}) {
-                   if($save_originals) {
+                   if(($save_originals) && ($video =~ /\.$originals_file_ext$/)) {
                        print "-> Saving the original video $video\n";
-                       if($video =~ /\.$originals_file_ext/) {
-                           print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
-                           $video = "";
-                       }
-                   }
-                   if(-e $video) { 
-                       print("rm -f $video\n");
+                       print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
+                   } else {
+                       print "-> Removing the original video $video\n";
+                       print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
                    }
                }
            }
@@ -219,15 +216,12 @@ foreach $ext (sort keys %videos) {
            # Remove the individual video files
            if(!defined $opt_k) { 
                foreach $srcvideo (@{$videos{$ext}{$video}}) {
-                   if($save_originals) {
+                   if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext$/)) {
                        print "-> Saving the original video $srcvideo to $origpathname\n";
-                       if($srcvideo =~ /\.$originals_file_ext/) {
-                           system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
-                           $srcvideo = "";
-                       }
-                   }
-                   if(-e $srcvideo) { 
-                       system("rm -f $srcvideo");
+                       system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
+                   } else {
+                       print "-> Removing the original video $srcvideo\n";
+                       system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
                    }
                }
            }

diff --git a/organize_videos.conf b/organize_videos.conf
index a4c06b48cf906fc7936d457f0344f5ecdb432e87..702a75260a6728f1e8964c80c3ebb74de62c7a69 100644 (file)
--- a/organize_videos.conf
+++ b/organize_videos.conf
@@ -26,7 +26,7 @@ $save_originals = 1;
 $merge_videos_by_day = "/naspool/videos/bin/merge_videos_by_day";
 
 # Flag to merge videos by modification date instead of the date parsed from the filename
-$merge_by_modification_date = 1;
+$merge_by_modification_date = 0;
 
 # Path to the make_mkv script
 $make_mkv = "/naspool/videos/bin/make_mkv";