X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%7Bg-%3Eurl%20arg1=?a=blobdiff_plain;f=organize_videos.conf;h=fd1241345f1b2e5b670d013b7719999bcd6ec50c;hb=2675e038e4a9ef7bf5cee7ff32a77a6f31799965;hp=aebd225840d3b7e028a9dfbb2627ca4e75cd8626;hpb=3574551ce37f9611e12420e4b39d4e68dd20c884;p=videoscripts%2F.git

diff --git a/organize_videos.conf b/organize_videos.conf
index aebd225..fd12413 100644
--- a/organize_videos.conf
+++ b/organize_videos.conf
@@ -20,6 +20,7 @@ $dstpathname = "/naspool/videos/HomeVideos";
 # Path to move the originals to
 $origpathname = "/naspool/dropbox/Originals";
 $originals_file_ext = qr/(mov|mp4)/i;
+$originals_no_copy_brands = qr/mp42avc1/i; # Don't copy videos from camcorder to Originals because we keep these videos on those cards
 $save_originals = 1;
 
 # Path to a dir (or dirs separated by semis) to watch for videos to move to $srcpathname to be organized
@@ -29,7 +30,7 @@ $watchpathname = "/naspool/cloud/alan/files/InstantUpload/Camera;/naspool/cloud/
 $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 = 0;
+$merge_by_modification_date = 1;
 
 # Path to the make_mkv script
 $make_mkv = "/naspool/videos/bin/make_mkv";
@@ -71,11 +72,11 @@ $video_suffix = "000";
 $movie_file_ext = "-iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.avi\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mpg\" -o -iregex \".*\.mts\" -o -iregex \".*\.m4v\"";
 
 # Which movie file extensions should not be recompressed for merging
-$no_recompress_file_ext = qr/\.(mp4)$/;
+$no_recompress_file_ext = qr/\.(mp4)$/i;
 
 # Video file creation dates must not have changed in the last X minutes to process any of the video files
 # This is done to ensure that all videos from a given upload from a camera have completed prior to looking for videos to merge
-$minage = "+30";
+$minage = "+120";
 
 # What command should be used to find files that have changed (are at least $minage old) 
 $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_file_ext \\)";