Support floating point number of days to wait for next "check updates"

VN0 · Feb 28, 2015 · 6c826a6 · 6c826a6
1 parent bf27db1
commit 6c826a6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/src/app/check_update.cpp b/src/app/check_update.cpp
@@ -89,14 +89,14 @@ CheckUpdateThreadLauncher::CheckUpdateThreadLauncher(CheckUpdateDelegate* delega
   , m_timer(kMonitoringPeriod, NULL)
 {
   // Get how many days we have to wait for the next "check for update"
-  int waitDays = get_config_int("Updater", "WaitDays", 0);
-  if (waitDays > 0) {
+  double waitDays = get_config_double("Updater", "WaitDays", 0.0);
+  if (waitDays > 0.0) {
     // Get the date of the last "check for updates"
     time_t lastCheck = (time_t)get_config_int("Updater", "LastCheck", 0);
     time_t now = std::time(NULL);
 
     // Verify if we are in the "WaitDays" period...
-    if (now < lastCheck+60*60*24*waitDays &&
+    if (now < lastCheck+int(double(60*60*24*waitDays)) &&
         now > lastCheck) {                               // <- Avoid broken clocks
       // So we do not check for updates.
       m_doCheck = false;
@@ -181,7 +181,7 @@ void CheckUpdateThreadLauncher::onMonitoringTick()
 
   // Set the date of the last "check for updates" and the "WaitDays" parameter.
   set_config_int("Updater", "LastCheck", (int)std::time(NULL));
-  set_config_int("Updater", "WaitDays", m_response.getWaitDays());
+  set_config_double("Updater", "WaitDays", m_response.getWaitDays());
 
   // Save the config file right now
   flush_config_file();

diff --git a/src/base/convert_to.cpp b/src/base/convert_to.cpp
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2013 David Capello
+// Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -28,6 +28,18 @@ template<> std::string convert_to(const int& from)
   return buf;
 }
 
+template<> double convert_to(const std::string& from)
+{
+  return std::strtod(from.c_str(), NULL);
+}
+
+template<> std::string convert_to(const double& from)
+{
+  char buf[32];
+  std::sprintf(buf, "%g", from);
+  return buf;
+}
+
 template<> Sha1 convert_to(const std::string& from)
 {
   std::vector<uint8_t> digest(Sha1::HashSize);

diff --git a/src/base/convert_to.h b/src/base/convert_to.h
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2013 David Capello
+// Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -24,6 +24,9 @@ namespace base {
   template<> int convert_to(const std::string& from);
   template<> std::string convert_to(const int& from);
 
+  template<> double convert_to(const std::string& from);
+  template<> std::string convert_to(const double& from);
+
   template<> Sha1 convert_to(const std::string& from);
   template<> std::string convert_to(const Sha1& from);
 

diff --git a/src/updater/check_update.cpp b/src/updater/check_update.cpp
@@ -26,21 +26,21 @@ namespace updater {
 
 CheckUpdateResponse::CheckUpdateResponse()
   : m_type(Unknown)
-  , m_waitDays(0)
+  , m_waitDays(0.0)
 {
 }
 
 CheckUpdateResponse::CheckUpdateResponse(const CheckUpdateResponse& other)
   : m_type(other.m_type)
   , m_version(other.m_version)
   , m_url(other.m_url)
-  , m_waitDays(0)
+  , m_waitDays(0.0)
 {
 }
 
 CheckUpdateResponse::CheckUpdateResponse(const std::string& responseBody)
   : m_type(Unknown)
-  , m_waitDays(0)
+  , m_waitDays(0.0)
 {
   TiXmlDocument doc;
   doc.Parse(responseBody.c_str());
@@ -79,7 +79,7 @@ CheckUpdateResponse::CheckUpdateResponse(const std::string& responseBody)
     m_uuid = uuid_attr;
 
   if (waitdays_attr)
-    m_waitDays = base::convert_to<int>(std::string(waitdays_attr));
+    m_waitDays = base::convert_to<double>(std::string(waitdays_attr));
 }
 
 class CheckUpdate::CheckUpdateImpl

diff --git a/src/updater/check_update.h b/src/updater/check_update.h
@@ -46,14 +46,14 @@ namespace updater {
 
     // Returns the number of days that this client should wait for the
     // next "check for updates".
-    int getWaitDays() const { return m_waitDays; }
+    double getWaitDays() const { return m_waitDays; }
 
   private:
     Type m_type;
     base::Version m_version;
     std::string m_url;
     Uuid m_uuid;
-    int m_waitDays;
+    double m_waitDays;
   };
 
   // Delegate called by CheckUpdate when the request to the server is