X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=organize_videos;h=5727d57c6e4da119668975640cdb389bdc5d8d59;hb=f6af50099b5160d36517383217b8e089115cf55f;hp=0b252eab0cfbb6d362c421653f4bd1bc42965869;hpb=d479508edd42fc325ede515aa6ffeceff258dea1;p=videoscripts%2F.git

diff --git a/organize_videos b/organize_videos
index 0b252ea..5727d57 100755
--- a/organize_videos
+++ b/organize_videos
@@ -10,19 +10,13 @@ use Time::localtime;
 use File::Pid;
 
 ####################################################################################################
-# Configuration parameters - CHANGE THESE TO SUITE YOUR NEEDS
-my $srcpathname = "/naspool/pictures/New Photos"; # Path to look for videos to move from
-my $dstpathname = "/naspool/videos/HomeVideos"; # Path to move the videos to
-my $merge_videos_by_day = "/naspool/videos/bin/merge_videos_by_day";
-my $minage = "+15"; # Video file creation dates must not have changed in the last X minutes to process any of the video files
-my $owner = "ajp"; # The owner of the files after they are moved
-my $group = "pip"; # The group of the files after they are moved
-my $mode = "664"; # The mode to set on each file after they are moved
-my $playlist_extension = "pls"; # The extension to use when creating playlist files
-my $video_suffix = "000"; # What number to start with when adding an incrementing suffix to the end of the final video clip to avoid name collisions
-my $movie_file_ext = "-iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.mp4\" -o -iregex \".*\.mts\" -o -iregex \".*\.mkv\"";
-my $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_file_ext \\)";
-my $find_cmd = "find \"$srcpathname/\" $movie_file_ext";
+# Configuration parameters
+$mydir = `cd \$(dirname $0) 2>/dev/null; pwd`; chomp($mydir); unshift @INC,("$mydir");
+# Default configuration values
+require "organize_videos.conf";
+# Override defaults with local customizations
+if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.local"; }
+
 ####################################################################################################
 
 # Sanity check
@@ -82,7 +76,7 @@ sub is_folder_empty {
 sub create_playlists {
     my ($dstdirs) = @_;
     
-    foreach $dstdir (@{$dstdirs}) {
+    foreach $dstdir (keys %{$dstdirs}) {
 	print "-> Recreating playlists in: $dstdir\n";
 	print "-> Creating playlists for each month & year of clips from this directory: $video_directory\n";
 	opendir(VIDEODIR, "$dstdir") or die "-E- could not open: $dstdir\n";
@@ -107,15 +101,20 @@ sub create_playlists {
 		print "   Skipping $file since we can't extract the year and month from it\n"; 
 	    }
 	}
-    }
+
+        # Fix the permissions
+        system("chown $owner \"$dstdir/\"*.$playlist_extension");
+        system("chgrp $group \"$dstdir/\"*.$playlist_extension");
+        system("chmod $mode \"$dstdir/\"*.$playlist_extension");
+   } 
 }
 
 # Sanity checks / Option processing
 if(defined $opt_h) { usage(); exit 1; }
 if(defined $opt_p) {
     if(defined $opt_d) {
-	my @dstdirs = ("$opt_d"); 
-	create_playlists(\@dstdirs);
+	my %dstdirs = ("$opt_d",1); 
+	create_playlists(\%dstdirs);
     } else {
 	die "-E- You must specify the -d <dir> option when using the -p option\n"; 
     }
@@ -123,7 +122,7 @@ if(defined $opt_p) {
 }
 
 # Only proceed if there are video files to organize
-$video_files_found=`$find_cmd`;
+$video_files_found=`$find_cmd_with_mkv`;
 if(!$video_files_found) { exit 0; }
 
 # Only proceed if no files have changed in the past $cmin minutes
@@ -131,7 +130,7 @@ $changed_files_found=`$find_changed_cmd`;
 if($changed_files_found) { exit 0; }
 
 # Only one instance of this script running at a time
-my $pidfile = File::Pid->new({file => "/tmp/organize_videos.pid"});
+my $pidfile = File::Pid->new({file => "$pid_file", pid => "$$"});
 exit if $pidfile->running();
 $pidfile->write();
 
@@ -143,7 +142,9 @@ my $errno = 0;
 my $merge_opts = "";
 if(defined $opt_t) { $merge_opts .= "-t "; }
 if(defined $opt_k) { $merge_opts .= "-k "; }
-$errno=system("$merge_videos_by_day -q -s \"$srcpathname\" $merge_opts");
+if($requantize_input_video) { $merge_opts .= ' -q'; }
+if($recompress_input_video) { $merge_opts .= ' -z'; }
+$errno=system("$merge_videos_by_day -s \"$srcpathname\" $merge_opts");
 $errno = $errno >> 8;
 if($errno) { die "-E- $merge_videos_by_day encountered some errors with exit code $errno\n"; }
 
@@ -155,10 +156,10 @@ if(defined $opt_n) {
 }
 
 # Copy the videos over to the destination path
-my @dstdirs;
+my %dstdirs;
 chdir "$srcpathname";
-print "$find_cmd\n" if($opt_v);
-foreach $file (`$find_cmd`) {
+print "$find_cmd_with_mkv\n" if($opt_v);
+foreach $file (`$find_cmd_with_mkv`) {
 
     chomp($file);
     $srcdir = dirname($file);
@@ -182,6 +183,13 @@ foreach $file (`$find_cmd`) {
 	$monthnum = $month;
 	$monthname = lc($month2monthname{$month});
     }
+    elsif($srcfile =~ /^(\d\d\d\d)(\d\d)(\d\d)/) {
+        $year = $1;
+        $month = $2;
+        $day = sprintf("%02d",$3);
+        $monthnum = $month;
+        $monthname = lc($month2monthname{$month});
+    }
     # Get the date taken from the modification time
     elsif($date_taken =~ /\S+\s+(\S+)\s+(\d+)\s+\S+\s+(\d+)/) {
 	$year = $3;
@@ -196,7 +204,7 @@ foreach $file (`$find_cmd`) {
 
     # We are ready to pick a destination folder to put the video in
     $dstdir = $dstpathname . "/" . $year;
-    push(@dstdirs,$dstdir);
+    $dstdirs{$dstdir} = 1;
     $dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
 
     # Check for duplicate filenames at the destination
@@ -248,7 +256,7 @@ foreach $file (`$find_cmd`) {
 }
 
 # For each destination dir we copied new content into, recreate the playlists
-create_playlists(\@dstdirs);
+create_playlists(\%dstdirs);
 
 $pidfile->remove();