# 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;
$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;
foreach $ext (sort keys %videos) {
foreach $video (sort keys %{$videos{$ext}}) {
foreach $srcfile (@{$videos{$ext}{$video}}) {
- print " merging \"$srcfile\" into \"$video\"\n";
+ print " merging $srcfile into \"$video\"\n";
}
}
}
print "$cmd\n";
if(!defined $opt_k) {
foreach $video (@{$videos{$ext}{$video}}) {
- if($save_originals) {
+ if(($save_originals) && ($video =~ /\.$originals_file_ext/)) {
print "-> Saving the original video $video\n";
- if($video =~ /\.$originals_file_ext/) {
+ if(index($video, basename(dirname($video))) == -1) {
print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
- $video = "";
+ } else {
+ print("mv $video \"$origpathname/".basename($video)."\n");
}
- }
- if(-e $video) {
- print("rm -f $video\n");
+ } else {
+ print "-> Removing the original video $video\n";
+ print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
}
}
}
# Remove the individual video files
if(!defined $opt_k) {
foreach $srcvideo (@{$videos{$ext}{$video}}) {
- if($save_originals) {
+ if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
print "-> Saving the original video $srcvideo to $origpathname\n";
- if($srcvideo =~ /\.$originals_file_ext/) {
+ if(index($srcvideo, basename(dirname($srcvideo))) == -1) {
system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
- $srcvideo = "";
+ } else {
+ system("mv $srcvideo \"$origpathname/".basename($srcvideo));
}
- }
- if(-e $srcvideo) {
- system("rm -f $srcvideo");
+ } else {
+ print "-> Removing the original video $srcvideo\n";
+ system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
}
}
}