Updated for Ubuntu 22.04. Also fixed merge videos cmin check

[videoscripts/.git] / organize_videos

diff --git a/organize_videos b/organize_videos
index d62af19c673c5f2f518001164ba3d11319d00eb2..a037d75abb7888e3b3345fb936372a3e64110867 100755 (executable)
--- a/organize_videos
+++ b/organize_videos
@@ -127,10 +127,9 @@ if(defined $opt_p) {
 $video_files_found=`$find_cmd_with_mkv`;
 if(!$video_files_found) { exit 0; }
 
-# Only proceed if no files have changed in the past $cmin minutes
-if(! $opt_f) { 
-  $changed_files_found=`$find_changed_cmd`;
-  if($changed_files_found) { exit 0; }
+# Only proceed if we are skipping this check or if the $srcpathname dir hasn't been modified in the last $minage minutes
+if(! $opt_f && ((time - (stat("$srcpathname"))->mtime) < ($minage * 60))) {
+  exit 0;
 }
 
 # Only one instance of this script running at a time
@@ -264,7 +263,7 @@ foreach $file (`$find_mkv`) {
        if(is_folder_empty($srcdir)) { 
            print "-> Subdir detected for videos ($srcdir != $srcpathname)\n" if($opt_v);
            if(! defined $opt_t) { 
-               $tmpdir=`tempfile`;
+               $tmpdir=`mktemp`;
                system("rm $tmpdir");
                system("cp -R \"$srcdir\" $tmpdir > /dev/null 2>/dev/null");
                system("rm -rf \"$srcdir\"");