X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=organize_videos.conf;h=9216f4b0b5ebcec4fd3143dcef0ebf9cbeb391c7;hb=bfa24cc8c0228028cae669b2fa0adddef10470ae;hp=702a75260a6728f1e8964c80c3ebb74de62c7a69;hpb=5a4d4d3ceec69ce1973f790d0c9f27be9e38339b;p=videoscripts%2F.git

diff --git a/organize_videos.conf b/organize_videos.conf
index 702a752..9216f4b 100644
--- a/organize_videos.conf
+++ b/organize_videos.conf
@@ -19,9 +19,12 @@ $dstpathname = "/naspool/videos/HomeVideos";
 
 # Path to move the originals to
 $origpathname = "/naspool/dropbox/Originals";
-$originals_file_ext = qr/mov/i;
+$originals_file_ext = qr/(mov|mp4)/i;
 $save_originals = 1;
 
+# Path to a dir to watch for videos to move to $srcpathname to be organized
+$watchpathname = "/naspool/pictures/mylio";
+
 # Path to merge_videos_by_day script
 $merge_videos_by_day = "/naspool/videos/bin/merge_videos_by_day";
 
@@ -36,6 +39,7 @@ $mkvmerge = '/usr/bin/mkvmerge';
 
 # ffmpeg path/command name
 $ffmpeg = '/usr/bin/ffmpeg';
+$ffprobe = '/usr/bin/ffprobe';
 $avconv = '/usr/bin/avconv';
 
 # handbrake path/command name
@@ -64,7 +68,10 @@ $video_suffix = "000";
 
 # Which movie file extensions should be considered for merging
 # NOTE: Script does not support merging multiple mkv files into a single mkv file
-$movie_file_ext = "-iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mts\" -o -iregex \".*\.m4v\"";
+$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)$/;
 
 # 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
@@ -76,6 +83,7 @@ $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_fi
 # What command should be used to find all movie files
 $find_cmd = "find \"$srcpathname/\" $movie_file_ext";
 $find_cmd_with_mkv = "find \"$srcpathname/\" $movie_file_ext -o -iregex \".*\.mkv\"";
+$find_mkv = "find \"$srcpathname/\" -iregex \".*\.mkv\"";
 
 # Set the tmpfile to use, but remove the 0 byte file it creates, we'll create it if we need it
 $tmpfile = `tempfile`; chomp($tmpfile); unlink "$tmpfile";