From: Alan J. Pippin <alan@pippins.net>
Date: Fri, 5 Aug 2016 05:29:01 +0000 (-0600)
Subject: Fixed bug in not removing original src files
X-Git-Url: http://git.pippins.net/embedvideo/.git/%7Blink_hometeaching%7D?a=commitdiff_plain;h=5a32fa802ac2f30553b33cd2c4ed9a935f13839d;p=videoscripts%2F.git

Fixed bug in not removing original src files
---

diff --git a/merge_videos_by_day b/merge_videos_by_day
index e164bee..42744fe 100755
--- 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 a4c06b4..702a752 100644
--- 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";