X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=blobdiff_plain;f=organize_videos;h=d62af19c673c5f2f518001164ba3d11319d00eb2;hb=aea4af9869a2086c5085afb34a1bd790940c8b7d;hp=4e1ad7ff95bd95c29ffb28cd442304680a820592;hpb=c91b8b9feda0a1fc3221cffd3e28cee33e919b5a;p=videoscripts%2F.git
diff --git a/organize_videos b/organize_videos
index 4e1ad7f..d62af19 100755
--- a/organize_videos
+++ b/organize_videos
@@ -54,18 +54,20 @@ my %month2monthname = (
"12" => "Dec"
);
-getopts("htvnkpd:");
+getopts("htvnkpfd:");
sub usage {
- print "usage: $0 [-v] [-t] [-r] [-p] [-d
]\n";
+ print "usage: $0 [-v] [-t] [-r] [-p] [-f] [-d ]\n";
print " -v verbose; print file being moved (to).\n";
print " -t test; print what will happen, but don't do anything\n";
+ print " -f force it to run by ignoring the \$minage setting in organize_videos.conf\n";
print " -n do not copy to dest; do not copy the resultant video files to the destination dir\n";
print " -k keep the individual video files that are merged. By default, after a merge, individual video files that were merged are removed\n";
print " -p only recreate video playlists, do not process any video files. Do this for each year & month of video clips in the directory specified by -d .\n";
print " -d directory to recreate the playlists in. Only needed if -p option is given\n";
return 1;
}
+$SIG{'INT'} = sub {die "-E- Killed by CTRL-C\n"};
sub is_folder_empty {
my $dirname = shift;
@@ -101,7 +103,12 @@ 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
@@ -121,8 +128,10 @@ $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
-$changed_files_found=`$find_changed_cmd`;
-if($changed_files_found) { exit 0; }
+if(! $opt_f) {
+ $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 => "$pid_file", pid => "$$"});
@@ -137,7 +146,10 @@ 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(defined $opt_v) { $merge_opts .= "-v "; }
+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"; }
@@ -151,8 +163,8 @@ if(defined $opt_n) {
# Copy the videos over to the destination path
my %dstdirs;
chdir "$srcpathname";
-print "$find_cmd_with_mkv\n" if($opt_v);
-foreach $file (`$find_cmd_with_mkv`) {
+print "$find_mkv\n" if($opt_v);
+foreach $file (`$find_mkv`) {
chomp($file);
$srcdir = dirname($file);
@@ -160,13 +172,20 @@ foreach $file (`$find_cmd_with_mkv`) {
$srcfile = $file;
$ext = $file; $ext =~ s/.*\.(\S+)$/$1/; $ext = lc($ext);
- print "Found movie: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
-
# Throw out files not in the current srcpath
if((! -f "$srcfile") && (! -f "$srcdir/$srcfile")) { next; }
-
- # Make a note of the month, year, and day this video was taken (from the modification time of the file)
- $date_taken = ctime(stat("$srcdir/$srcfile")->mtime);
+
+ # Throw out encoded files left over from a previous run
+ print "srcfile: $srcfile\n";
+ if($srcfile =~ /.hb.mp4/) { next; }
+
+ print "Found video: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v);
+
+ # From the modification time of the file since we couldn't find it in the filename
+ $date_modified = ctime(stat("$srcdir/$srcfile")->mtime);
+
+ # NOTE: This file matching algorithm only applies to videos produced by merge_videos_by_day called by this script earlier
+ # We just need to take those merged videos, and extract what date to call the video by under HomeVideos
# Get the date taken from the filename
if($srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
@@ -183,13 +202,21 @@ foreach $file (`$find_cmd_with_mkv`) {
$monthnum = $month;
$monthname = lc($month2monthname{$month});
}
+ # Get the date taken from the source directory
+ elsif($srcdir =~ /(\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+)/) {
+ elsif($date_modified =~ /\S+\s+(\S+)\s+(\d+)\s+\S+\s+(\d+)/) {
$year = $3;
$month = $1;
$day = sprintf("%02d",$2);
$monthnum = $monthname2month{$month};
- $monthname = lc($month2monthname{$month});
+ $monthname = lc($month);
} else {
print "-E- Unable to parse year and month from this file: $srcdir/$srcfile\n";
next;
@@ -197,7 +224,7 @@ foreach $file (`$find_cmd_with_mkv`) {
# We are ready to pick a destination folder to put the video in
$dstdir = $dstpathname . "/" . $year;
- $dstdirs[$dstdir] = 1;
+ $dstdirs{$dstdir} = 1;
$dstfile = $dstdir . "/" . $year . "-" . $monthnum . "-" . $day;
# Check for duplicate filenames at the destination
@@ -211,12 +238,11 @@ foreach $file (`$find_cmd_with_mkv`) {
}
$dstfile = "$newfile.$ext";
-
if(defined $opt_t) {
print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
} else {
# Make sure the destination directories exist
- $errno=system("mkdir -p \"$dstdir\"");
+ $errno=system("mkdir -p -m $dirmode \"$dstdir\"");
if($errno) { print "-E- Error creating dstdir: $dstdir\n"; next; }
# Perform the move operation from $srcdir/$srcfile -> $dstfile
print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";