From: Alan J. Pippin Date: Fri, 5 Aug 2016 15:23:24 +0000 (-0600) Subject: Added ability to pull date from srcdir name X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/%7Blink_ppi%7D?a=commitdiff_plain;h=64702de206d3356a3d80acf75b572bd9c31c86d9;p=videoscripts%2F.git Added ability to pull date from srcdir name --- diff --git a/merge_videos_by_day b/merge_videos_by_day index 27f2e2b..4a58f0f 100755 --- a/merge_videos_by_day +++ b/merge_videos_by_day @@ -92,7 +92,7 @@ foreach $file (sort `$find_cmd`) { # 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); - + # Get the date taken from the filename if(!$merge_by_modification_date && $srcfile =~ /^(\d+)-(\d+)-(\d+)/) { $year = $1; @@ -101,6 +101,21 @@ foreach $file (sort `$find_cmd`) { $monthnum = $month; $monthname = lc($month2monthname{$month}); } + elsif(!$merge_by_modification_date && $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 srcdir + elsif(!$merge_by_modification_date && $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; diff --git a/organize_videos b/organize_videos index f666e84..ef49df5 100755 --- a/organize_videos +++ b/organize_videos @@ -190,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;