Added ability to pull date from srcdir name

[videoscripts/.git] / organize_videos

diff --git a/organize_videos b/organize_videos
index 5625f8bcd927a0ca19830dadabf4155cafd255bd..ef49df53054ec8a2dcbaf479d3dc121d09f19dfa 100755 (executable)
--- a/organize_videos
+++ b/organize_videos
@@ -101,7 +101,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
@@ -137,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"; }
 
@@ -183,6 +190,14 @@ 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+)/) {
        $year = $3;
@@ -216,7 +231,7 @@ foreach $file (`$find_cmd_with_mkv`) {
        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";