Merge pull request #280 from dpaulat/hotfix/refresh-failed-placefiles

Automatically Refresh Failed Placfiles
dpaulat · Oct 6, 2024 · 411c570 · 411c570
2 parents d92f6c7 + 621cbb3
commit 411c570
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
@@ -105,6 +105,8 @@ class PlacefileManager::Impl::PlacefileRecord
 
    void CancelRefresh();
    void ScheduleRefresh();
+   void ScheduleRefresh(
+      const std::chrono::system_clock::duration timeUntilNextUpdate);
    void Update();
    void UpdateAsync();
 
@@ -150,6 +152,8 @@ class PlacefileManager::Impl::PlacefileRecord
 
    std::string                           lastRadarSite_ {};
    std::chrono::system_clock::time_point lastUpdateTime_ {};
+
+   std::size_t failureCount_ {};
 };
 
 PlacefileManager::PlacefileManager() : p(std::make_unique<Impl>(this))
@@ -344,8 +348,8 @@ PlacefileManager::Impl::PlacefileRecord::refresh_time() const
 
    if (refresh_enabled())
    {
-      // Don't refresh more often than every 15 seconds
-      return std::max(placefile_->refresh(), 15s);
+      // Don't refresh more often than every 1 second
+      return std::max(placefile_->refresh(), 1s);
    }
 
    return -1s;
@@ -542,6 +546,11 @@ void PlacefileManager::Impl::PlacefileRecord::Update()
    if (url.isLocalFile())
    {
       updatedPlacefile = gr::Placefile::Load(name);
+
+      if (updatedPlacefile == nullptr)
+      {
+         logger_->error("Local placefile not found: {}", name);
+      }
    }
    else
    {
@@ -625,6 +634,7 @@ void PlacefileManager::Impl::PlacefileRecord::Update()
          placefile_      = updatedPlacefile;
          title_          = placefile_->title();
          lastUpdateTime_ = std::chrono::system_clock::now();
+         failureCount_   = 0;
 
          // Update font resources
          {
@@ -645,10 +655,30 @@ void PlacefileManager::Impl::PlacefileRecord::Update()
          // Notify slots of the placefile update
          Q_EMIT p->self_->PlacefileUpdated(name);
       }
+
+      // Update refresh timer
+      ScheduleRefresh();
    }
+   else if (enabled_)
+   {
+      using namespace std::chrono_literals;
 
-   // Update refresh timer
-   ScheduleRefresh();
+      ++failureCount_;
+
+      // Update refresh timer if the file failed to load, in case it is able to
+      // be resolved later
+      if (url.isLocalFile())
+      {
+         ScheduleRefresh(10s);
+      }
+      else
+      {
+         // Start attempting to refresh at 15 seconds, and start backing off
+         // until retrying every 60 seconds
+         ScheduleRefresh(
+            std::min<std::chrono::seconds>(15s * failureCount_, 60s));
+      }
+   }
 }
 
 void PlacefileManager::Impl::PlacefileRecord::ScheduleRefresh()
@@ -666,6 +696,12 @@ void PlacefileManager::Impl::PlacefileRecord::ScheduleRefresh()
    auto nextUpdateTime      = lastUpdateTime_ + refresh_time();
    auto timeUntilNextUpdate = nextUpdateTime - std::chrono::system_clock::now();
 
+   ScheduleRefresh(timeUntilNextUpdate);
+}
+
+void PlacefileManager::Impl::PlacefileRecord::ScheduleRefresh(
+   const std::chrono::system_clock::duration timeUntilNextUpdate)
+{
    logger_->debug(
       "Scheduled refresh in {:%M:%S} ({})",
       std::chrono::duration_cast<std::chrono::seconds>(timeUntilNextUpdate),

diff --git a/wxdata/source/scwx/gr/placefile.cpp b/wxdata/source/scwx/gr/placefile.cpp
@@ -154,9 +154,17 @@ std::shared_ptr<Placefile::Font> Placefile::font(std::size_t i)
 
 std::shared_ptr<Placefile> Placefile::Load(const std::string& filename)
 {
+   std::shared_ptr<Placefile> placefile = nullptr;
+
    logger_->debug("Loading placefile: {}", filename);
    std::ifstream f(filename, std::ios_base::in);
-   return Load(filename, f);
+
+   if (f.is_open())
+   {
+      placefile = Load(filename, f);
+   }
+
+   return placefile;
 }
 
 std::shared_ptr<Placefile> Placefile::Load(const std::string& name,