projects
/
videoscripts
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in how dates were extracted from video files
[videoscripts/.git]
/
merge_videos_by_day
diff --git
a/merge_videos_by_day
b/merge_videos_by_day
index cda301dae72bcf37e2d184d0e017b9196f7557b0..ec00da97e7fe64f3ea8fe1a20240b5689a397ce8 100755
(executable)
--- a/
merge_videos_by_day
+++ b/
merge_videos_by_day
@@
-100,7
+100,7
@@
foreach $file (sort `$find_cmd`) {
$date_taken = ctime(stat("$srcdir/$srcfile")->mtime);
# Get the date taken from the filename
$date_taken = ctime(stat("$srcdir/$srcfile")->mtime);
# Get the date taken from the filename
- if(!$merge_by_modification_date && $srcfile =~ /^(\d
+)-(\d+)-(\d+
)/) {
+ if(!$merge_by_modification_date && $srcfile =~ /^(\d
\d\d\d)-(\d\d)-(\d\d
)/) {
$year = $1;
$month = $2;
$day = sprintf("%02d",$3);
$year = $1;
$month = $2;
$day = sprintf("%02d",$3);
@@
-115,7
+115,7
@@
foreach $file (sort `$find_cmd`) {
$monthname = lc($month2monthname{$month});
}
# Get the date taken from the srcdir
$monthname = lc($month2monthname{$month});
}
# Get the date taken from the srcdir
- elsif(!$merge_by_modification_date && $srcdir =~ /(\d
+)-(\d+)-(\d+
)/) {
+ elsif(!$merge_by_modification_date && $srcdir =~ /(\d
\d\d\d)-(\d\d)-(\d\d
)/) {
$year = $1;
$month = $2;
$day = sprintf("%02d",$3);
$year = $1;
$month = $2;
$day = sprintf("%02d",$3);