Capture the start time earlier.

weetmuts · Aug 25, 2023 · d2e7fc0 · d2e7fc0
1 parent 81ed5be
commit d2e7fc0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/backup.cc b/src/backup.cc
@@ -71,11 +71,6 @@ RecurseOption Backup::addTarEntry(Path *abspath, FileStat *st)
     if(S_ISSOCK(st->st_mode)) { return RecurseContinue; }
     #endif
 
-    if (isInTheFuture(&st->st_mtim)) {
-        warning(BACKUP, "Found future dated file %s\n", path->c_str());
-        found_future_dated_file_ = true;
-    }
-
     // Ignore any directory that has a subdir named .beak
     if(S_ISDIR(st->st_mode) && abspath->depth() > root_dir_path->depth())
     {
@@ -98,6 +93,12 @@ RecurseOption Backup::addTarEntry(Path *abspath, FileStat *st)
     // the configured beak source dir that we are scanning.
     if (abspath->name()->str() == ".beak") return RecurseSkipSubTree;
 
+    // Check if the files is in the future....
+    if (isInTheFuture(&st->st_mtim)) {
+        warning(BACKUP, "Found future dated file >%s<\n", abspath->c_str());
+        found_future_dated_file_ = true;
+    }
+
     size_t len = strlen(path->c_str());
     char name[len+2];
     strcpy(name, path->c_str());

diff --git a/src/beak.h b/src/beak.h
@@ -57,7 +57,6 @@ void findAndSetLogging(int argc, char **argv);
 
 struct Beak
 {
-    virtual void captureStartTime() = 0;
     virtual Command parseCommandLine(int argc, char **argv, Settings *settings) = 0;
 
     virtual RC store(Settings *settings, Monitor *monitor) = 0;

diff --git a/src/beak_implementation.h b/src/beak_implementation.h
@@ -65,7 +65,6 @@ struct BeakImplementation : Beak
     void printCommands(bool verbose, bool has_media);
     void printSettings(bool verbose, Command cmd, bool has_media);
 
-    void captureStartTime() {  ::captureStartTime(); }
     Command parseCommandLine(int argc, char **argv, Settings *settings);
 
     void printHelp(bool verbose, Command cmd, bool has_media);

diff --git a/src/main.cc b/src/main.cc
@@ -77,6 +77,8 @@ int run(int argc, char *argv[])
 
     setStackSize();
 
+    ::captureStartTime();
+
     // First create the OS interface to invoke external commands like rclone and rsync.
     auto sys = newSystem();
     // Next create the interface to the local file system where we find:
@@ -102,8 +104,6 @@ int run(int argc, char *argv[])
     // Now create the beak backup software.
     auto beak = newBeak(configuration, sys, local_fs, storage_tool, origin_tool);
 
-    beak->captureStartTime();
-
     // Configure the settings by parsing the command line and extract the command.
     Settings settings;
     Command cmd = beak->parseCommandLine(argc, argv, &settings);