X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;ds=sidebyside;f=organize_videos.conf;h=9216f4b0b5ebcec4fd3143dcef0ebf9cbeb391c7;hb=bfa24cc8c0228028cae669b2fa0adddef10470ae;hp=d6236befbc7072af6e6cbe33ae7d8564acc5534c;hpb=9990cf64d87333417ab72d6e106fa53df6ad2943;p=videoscripts%2F.git

diff --git a/organize_videos.conf b/organize_videos.conf
index d6236be..9216f4b 100644
--- a/organize_videos.conf
+++ b/organize_videos.conf
@@ -12,25 +12,38 @@
 ################################################################################
 
 # Path to look for videos to move from
-$srcpathname = "/naspool/pictures/New Photos";
+$srcpathname = "/naspool/dropbox/New Memories";
 
 # Path to move the videos to
 $dstpathname = "/naspool/videos/HomeVideos";
 
+# Path to move the originals to
+$origpathname = "/naspool/dropbox/Originals";
+$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";
 
+# Flag to merge videos by modification date instead of the date parsed from the filename
+$merge_by_modification_date = 0;
+
 # Path to the make_mkv script
 $make_mkv = "/naspool/videos/bin/make_mkv";
 
 # mkvmerge path/command name
-$mkvmerge = 'mkvmerge';
+$mkvmerge = '/usr/bin/mkvmerge';
 
 # ffmpeg path/command name
-$ffmpeg = 'ffmpeg';
+$ffmpeg = '/usr/bin/ffmpeg';
+$ffprobe = '/usr/bin/ffprobe';
+$avconv = '/usr/bin/avconv';
 
 # handbrake path/command name
-$handbrake = 'HandBrakeCLI';
+$handbrake = '/usr/bin/HandBrakeCLI';
 
 # The pid file to use to indicate organize_videos is running
 $pid_file = "/tmp/organize_videos.pid";
@@ -44,6 +57,9 @@ $group = "pip";
 # The mode to set on each file after they are moved
 $mode = "664";
 
+# The mode to set on each directory after they are created
+$dirmode = "2775";
+
 # The extension to use when creating playlist files
 $playlist_extension = "pls";
 
@@ -52,11 +68,14 @@ $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
-$minage = "+15";
+$minage = "+30";
 
 # 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 \\)";
@@ -64,9 +83,10 @@ $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
-$tmpfile = `tempfile`; chomp($tmpfile);
+# 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";
 
 # Set the timezone to use
 $timezone = `cat /etc/timezone`; chomp($timezone);
@@ -75,8 +95,8 @@ $timezone = `cat /etc/timezone`; chomp($timezone);
 $handbrake_requantize_options='--strict-anamorphic --crop 0:0:0:0 -E ac3';
 $handbrake_recompress_options='--strict-anamorphic --crop 0:0:0:0 --denoise="weak" -e x264 -q 18 -x b-adapt=2:rc-lookahead=50 -v 2 -a 1 -6 dpl2 --preset="High Profile"';
 
-# tmp chapter file used by handbrake when creating mkv
-$chapter_file = `tempfile`; chomp($chapter_file);
+# tmp chapter file used by handbrake when creating mkv, but remove the 0 byte file it creates, we'll create it if we need it
+$chapter_file = `tempfile`; chomp($chapter_file); unlink "$chapter_file";
 
 # handbrake input file options
 $input_file_options = "-S";
@@ -92,7 +112,7 @@ $progressive_requantize_quality=0.75;
 $compute_host = "pippin.pippins.net";
 
 # Set to 1 to use a remote compute host to run the mkvmerge command. Set to 0 to use the local host to run it.
-$use_compute_host = 1;
+$use_compute_host = 0;
 
 # This will dramatically decrease the size of the video with minimal compute processing requirements.
 $requantize_input_video=0;