projects
/
videoscripts
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added force option to organize_videos which ignores $minage
[videoscripts/.git]
/
merge_videos_by_day
diff --git
a/merge_videos_by_day
b/merge_videos_by_day
index 4a58f0fce3d398c5561402f573ff18c7e4f11ab8..7179746cea631fd16daf9072326a5947834bfaa1 100755
(executable)
--- a/
merge_videos_by_day
+++ b/
merge_videos_by_day
@@
-211,7
+211,11
@@
foreach $ext (sort keys %videos) {
foreach $video (@{$videos{$ext}{$video}}) {
if(($save_originals) && ($video =~ /\.$originals_file_ext/)) {
print "-> Saving the original video $video\n";
foreach $video (@{$videos{$ext}{$video}}) {
if(($save_originals) && ($video =~ /\.$originals_file_ext/)) {
print "-> Saving the original video $video\n";
- print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
+ if(index($video, basename(dirname($video))) == -1) {
+ print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
+ } else {
+ print("mv $video \"$origpathname/".basename($video)."\n");
+ }
} else {
print "-> Removing the original video $video\n";
print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
} else {
print "-> Removing the original video $video\n";
print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
@@
-233,7
+237,11
@@
foreach $ext (sort keys %videos) {
foreach $srcvideo (@{$videos{$ext}{$video}}) {
if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
print "-> Saving the original video $srcvideo to $origpathname\n";
foreach $srcvideo (@{$videos{$ext}{$video}}) {
if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
print "-> Saving the original video $srcvideo to $origpathname\n";
- system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
+ if(index($srcvideo, basename(dirname($srcvideo))) == -1) {
+ system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
+ } else {
+ system("mv $srcvideo \"$origpathname/".basename($srcvideo));
+ }
} else {
print "-> Removing the original video $srcvideo\n";
system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
} else {
print "-> Removing the original video $srcvideo\n";
system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");