fix progress monitor in native mining

Author: ckrause

CHANGELOG.md

@@ -5,6 +5,7 @@ To install or update LODA, please follow the [installation instructions](https:/
 ### Bugfixes
 
 * Fix handling of protected programs
+* Fix progress monitor for native mining (non-BOINC)
 
 ### Enhancements
 

src/commands.cpp

@@ -203,7 +203,12 @@ void Commands::profile(const std::string& path) {
 
 void Commands::mine() {
   initLog(false);
-  Miner miner(settings);
+  std::unique_ptr<ProgressMonitor> progress_monitor;
+  if (settings.num_mine_hours > 0) {
+    const int64_t target_seconds = settings.num_mine_hours * 3600;
+    progress_monitor.reset(new ProgressMonitor(target_seconds, "", "", 0));
+  }
+  Miner miner(settings, Miner::DEFAULT_LOG_INTERVAL, progress_monitor.get());
   miner.mine();
 }
 

src/include/miner.hpp

@@ -25,8 +25,9 @@ class Miner {
     std::vector<Matcher::Config> matchers;
   };
 
-  Miner(const Settings &settings,
-        int64_t log_interval = 120,  // 2 minutes (magic number)
+  static constexpr int64_t DEFAULT_LOG_INTERVAL = 120;  // 2 minutes
+
+  Miner(const Settings &settings, int64_t log_interval = DEFAULT_LOG_INTERVAL,
         ProgressMonitor *progress_monitor = nullptr);
 
   void mine();

src/util.cpp

@@ -453,16 +453,12 @@ double ProgressMonitor::getProgress() {
 }
 
 void ProgressMonitor::writeProgress() {
-  if (progress_file.empty() || checkpoint_file.empty()) {
-    Log::get().error("Error writing progress: missing file names", false);
-    return;
-  }
-  {
+  if (!progress_file.empty()) {
     std::ofstream progress_out(progress_file);
     progress_out.precision(3);
     progress_out << std::fixed << getProgress() << std::endl;
   }
-  {
+  if (!checkpoint_file.empty()) {
     std::ofstream checkpoint_out(checkpoint_file);
     checkpoint_out << encode(getElapsedSeconds()) << std::endl;
   }