X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=organize_videos;fp=organize_videos;h=d62af19c673c5f2f518001164ba3d11319d00eb2;hb=aea4af9869a2086c5085afb34a1bd790940c8b7d;hp=05edab463cb246cba2357155bd67c6985c5ed1bc;hpb=2675e038e4a9ef7bf5cee7ff32a77a6f31799965;p=videoscripts%2F.git diff --git a/organize_videos b/organize_videos index 05edab4..d62af19 100755 --- a/organize_videos +++ b/organize_videos @@ -179,10 +179,13 @@ foreach $file (`$find_mkv`) { print "srcfile: $srcfile\n"; if($srcfile =~ /.hb.mp4/) { next; } - print "Found movie: srcdir: $srcdir srcfile: $srcfile ext: $ext\n" if($opt_v); - - # 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); + 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+)/) { @@ -208,7 +211,7 @@ foreach $file (`$find_mkv`) { $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);