Update file uses build timestamp inside base url

storage/country.cpp

@@ -2,13 +2,14 @@
 
 #include "../base/logging.hpp"
 
-
 #include "../base/std_serialization.hpp"
 
 #include "../coding/streams_sink.hpp"
 #include "../coding/file_reader.hpp"
 #include "../coding/file_writer.hpp"
 
+#include "../version/version.hpp"
+
 #include "../platform/platform.hpp"
 
 #include "../indexer/data_header.hpp"
@@ -152,13 +153,13 @@ namespace storage
   {
     FileWriter writer(file);
     stream::SinkWriterStream<Writer> wStream(writer);
-    wStream << MAPS_MAJOR_VERSION_BINARY_FORMAT;
+    wStream << static_cast<uint32_t>(Version::BUILD);
     wStream << level;
     wStream << cellFiles;
     wStream << commonFiles;
   }
 
-  bool LoadTiles(TTilesContainer & tiles, string const & tilesFile)
+  bool LoadTiles(TTilesContainer & tiles, string const & tilesFile, uint32_t & dataVersion)
   {
     tiles.clear();
 
@@ -171,11 +172,8 @@ namespace storage
       TDataFiles dataFiles;
       TCommonFiles commonFiles;
 
-      uint32_t version = 0;
       int32_t level = -1;
-      stream >> version;
-      if (version > MAPS_MAJOR_VERSION_BINARY_FORMAT)
-        return false;
+      stream >> dataVersion;
       stream >> level;
       stream >> dataFiles;
       stream >> commonFiles;

storage/country.hpp

@@ -72,6 +72,6 @@ namespace storage
                      TCountriesContainer & countries);
   void SaveTiles(string const & file, int32_t level, TDataFiles const & cellFiles,
                  TCommonFiles const & commonFiles);
-  bool LoadTiles(TTilesContainer & tiles, string const & tilesFile);
+  bool LoadTiles(TTilesContainer & tiles, string const & tilesFile, uint32_t & dataVersion);
 //  void SaveCountries(TCountriesContainer const & countries, Writer & writer);
 }

storage/defines.hpp

@@ -4,9 +4,6 @@
 
 #include "../std/string.hpp"
 
-/// Should be incremented when binary format changes
-uint32_t const MAPS_MAJOR_VERSION_BINARY_FORMAT = 1;
-
 #define DATA_FILE_EXTENSION ".dat"
 #define GEOMETRY_FILE_EXTENSION ".geom"
 #define TRIANGLES_FILE_EXTENSION ".trg"
@@ -17,4 +14,3 @@ uint32_t const MAPS_MAJOR_VERSION_BINARY_FORMAT = 1;
 #define COUNTRIES_FILE  "countries.txt"
 #define UPDATE_CHECK_FILE "maps.update"
 #define UPDATE_BASE_URL "http://melnichek.ath.cx:34568/maps/"
-#define UPDATE_FULL_URL UPDATE_BASE_URL UPDATE_CHECK_FILE

storage/storage.cpp

@@ -1,10 +1,13 @@
 #include "storage.hpp"
 
 #include "../base/logging.hpp"
+#include "../base/string_utils.hpp"
 
 #include "../coding/file_writer.hpp"
 #include "../coding/file_reader.hpp"
 
+#include "../version/version.hpp"
+
 #include "../std/set.hpp"
 #include "../std/algorithm.hpp"
 
@@ -16,6 +19,8 @@ namespace storage
 {
   void Storage::Init(TAddMapFunction addFunc, TRemoveMapFunction removeFunc)
   {
+    m_currentVersion = static_cast<uint32_t>(Version::BUILD);
+
     m_addMap = addFunc;
     m_removeMap = removeFunc;
 
@@ -27,15 +32,20 @@ namespace storage
       m_addMap(dataPath + *it, dataPath + *it + INDEX_FILE_EXTENSION);
   }
 
-//  bool Storage::UpdateCheck()
-//  {
-//    GetDownloadManager().DownloadFile(
-//        UPDATE_FULL_URL,
-//		(GetPlatform().WritablePathForFile(UPDATE_CHECK_FILE)).c_str(),
-//        boost::bind(&Storage::OnUpdateDownloadFinished, this, _1, _2),
-//        TDownloadProgressFunction(), false);
-//    return true;
-//  }
+  string Storage::UpdateBaseUrl() const
+  {
+    return UPDATE_BASE_URL + utils::to_string(m_currentVersion) + "/";
+  }
+
+  bool Storage::UpdateCheck()
+  {
+    GetDownloadManager().DownloadFile(
+        (UpdateBaseUrl() + UPDATE_CHECK_FILE).c_str(),
+        (GetPlatform().WritablePathForFile(UPDATE_CHECK_FILE)).c_str(),
+        boost::bind(&Storage::OnUpdateDownloadFinished, this, _1, _2),
+        TDownloadProgressFunction(), false);
+    return true;
+  }
 
   TCountriesContainer const & NodeFromIndex(TCountriesContainer const & root, TIndex const & index)
   {
@@ -86,7 +96,12 @@ namespace storage
 
     TLocalAndRemoteSize size = CountryByIndex(index).Size();
     if (size.first == size.second)
-      return EOnDisk;
+    {
+      if (size.second == 0)
+        return EUnknown;
+      else
+        return EOnDisk;
+    }
 
     return ENotDownloaded;
   }
@@ -169,17 +184,14 @@ namespace storage
 
   struct CancelDownloading
   {
+    string const m_baseUrl;
+    CancelDownloading(string const & baseUrl) : m_baseUrl(baseUrl) {}
     void operator()(TTile const & tile)
     {
-      GetDownloadManager().CancelDownload((UPDATE_BASE_URL + tile.first).c_str());
+      GetDownloadManager().CancelDownload((m_baseUrl + tile.first).c_str());
     }
   };
 
-  void CancelCountryDownload(Country const & country)
-  {
-    for_each(country.Tiles().begin(), country.Tiles().end(), CancelDownloading());
-  }
-
   class DeleteMap
   {
     string m_workingDir;
@@ -214,7 +226,7 @@ namespace storage
     {
       if (found == m_queue.begin())
       { // stop download
-        CancelCountryDownload(country);
+        for_each(country.Tiles().begin(), country.Tiles().end(), CancelDownloading(UpdateBaseUrl()));
         // remove from the queue
         m_queue.erase(found);
         // start another download if the queue is not empty
@@ -238,7 +250,7 @@ namespace storage
     m_observerProgress = progress;
 
     TTilesContainer tiles;
-    if (LoadTiles(tiles, GetPlatform().WritablePathForFile(UPDATE_CHECK_FILE)))
+    if (LoadTiles(tiles, GetPlatform().WritablePathForFile(UPDATE_CHECK_FILE), m_currentVersion))
     {
       if (!LoadCountries(GetPlatform().WritablePathForFile(COUNTRIES_FILE), tiles, m_countries))
         LOG(LWARNING, ("Can't load countries file", COUNTRIES_FILE));

storage/storage.hpp

@@ -22,7 +22,8 @@ namespace storage
     ENotDownloaded,
     EDownloadFailed,
     EDownloading,
-    EInQueue
+    EInQueue,
+    EUnknown
   };
 
   struct TIndex
@@ -41,6 +42,9 @@ namespace storage
   /// Can be used to store local maps and/or maps available for download
   class Storage
   {
+    /// stores timestamp for update checks
+    uint32_t m_currentVersion;
+
     TCountriesContainer m_countries;
 
     typedef list<TIndex> TQueue;
@@ -66,7 +70,8 @@ namespace storage
 
     void DownloadNextCountryFromQueue();
     Country const & CountryByIndex(TIndex const & index) const;
-//    bool UpdateCheck();
+    bool UpdateCheck();
+    string UpdateBaseUrl() const;
 
   public:
     Storage() {}

storage/storage_tests/country_test.cpp

@@ -2,6 +2,8 @@
 
 #include "../country.hpp"
 
+#include "../../version/version.hpp"
+
 #include "../../coding/file_writer.hpp"
 #include "../../coding/file_reader.hpp"
 
@@ -63,8 +65,13 @@ UNIT_TEST(TilesSerialization)
   }
 
   {
+    uint32_t version;
+
     TTilesContainer tiles;
-    TEST( LoadTiles(tiles, FILE), ());
+    TEST( LoadTiles(tiles, FILE, version), ());
+
+    TEST_EQUAL(version, Version::BUILD, ());
+
     TEST_EQUAL( tiles.size(), 5, ());
     TEST_EQUAL( tiles[0], TTilesContainer::value_type(
         CountryCellId::FromBitsAndLevel(5, level).ToString(), 5), ());