RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

marketing events

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-08-22 15:01:26 +03:00 • committed by Vladimir Byko-Ianko
parent 1eb176f6fe
commit ab79980e3d
6 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/local_country_file_utils.cpp
View file

@ -152,8 +152,7 @@ void FindAllDiffsInDirectory(string const & dir, vector<LocalCountryFile> & diff
auto const isDiffReady =
strings::EndsWith(name, strings::to_string(DIFF_FILE_EXTENSION) + READY_FILE_EXTENSION);
auto const isDiff =
strings::EndsWith(name, DIFF_FILE_EXTENSION);
auto const isDiff = strings::EndsWith(name, DIFF_FILE_EXTENSION);
if (!isDiff && !isDiffReady)
continue;

2
platform/marketing_service.cpp
View file

@ -28,6 +28,8 @@ char const * const kBookmarksBookmarkAction = "Bookmarks_Bookmark_action";
char const * const kPlacepageHotelBook = "Placepage_Hotel_book";
char const * const kEditorAddStart = "EditorAdd_start";
char const * const kEditorEditStart = "EditorEdit_start";
char const * const kDiffSchemeFallback = "Downloader_DiffScheme_OnStart_fallback";
char const * const kDiffSchemeError = "Downloader_DiffScheme_error";
// Settings.
char const * const kFrom = "utm_source";

2
platform/marketing_service.hpp
View file

@ -33,6 +33,8 @@ extern char const * const kBookmarksBookmarkAction;
extern char const * const kPlacepageHotelBook;
extern char const * const kEditorAddStart;
extern char const * const kEditorEditStart;
extern char const * const kDiffSchemeFallback;
extern char const * const kDiffSchemeError;
// Settings.
extern char const * const kFrom;

17
storage/diff_scheme/diff_manager.cpp
View file

@ -31,7 +31,8 @@ void Manager::Load(LocalMapsInfo && info)
if (diffs.empty())
{
m_status = Status::NotAvailable;
// TODO: Log fall back to the old scheme (Downloader_DiffScheme_OnStart_fallback (Aloha)).
GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kDiffSchemeFallback, {});
}
else
{
@ -40,8 +41,7 @@ void Manager::Load(LocalMapsInfo && info)
auto & observers = m_observers;
auto status = m_status;
GetPlatform().RunOnGuiThread([observers, status]() mutable
{
GetPlatform().RunOnGuiThread([observers, status]() mutable {
observers.ForEach(&Observer::OnDiffStatusReceived, status);
});
});
@ -62,13 +62,14 @@ void Manager::ApplyDiff(ApplyDiffParams && p, std::function<void(bool const resu
diffFile->SyncWithDisk();
auto const isOnDisk = diffFile->OnDisk(MapOptions::Diff);
auto const isFilePrepared = isOnDisk || my::RenameFileX(diffReadyPath, diffPath);
if (isOnDisk || my::RenameFileX(diffReadyPath, diffPath))
if (isFilePrepared)
{
// Sync with disk after renaming.
if (!isOnDisk)
diffFile->SyncWithDisk();
string const oldMwmPath = p.m_oldMwmFile->GetPath(MapOptions::Map);
string const newMwmPath = diffFile->GetPath(MapOptions::Map);
result = generator::mwm_diff::ApplyDiff(oldMwmPath, newMwmPath, diffPath);
@ -87,7 +88,11 @@ void Manager::ApplyDiff(ApplyDiffParams && p, std::function<void(bool const resu
{
std::lock_guard<std::mutex> lock(m_mutex);
m_status = Status::NotAvailable;
// TODO: Log the diff applying error (Downloader_DiffScheme_error (Aloha)).
GetPlatform().GetMarketingService().SendMarketingEvent(
marketing::kDiffSchemeError,
{{"type", "patching"},
{"error", !isFilePrepared ? "Cannot to prepare file" : "Cannot to apply diff"}});
}
task(result);

9
storage/diff_scheme/diff_scheme_checker.cpp
View file

@ -6,6 +6,7 @@
#include "base/logging.hpp"
#include <memory>
#include <sstream>
#include <string>
#include <unordered_map>
#include <utility>
@ -125,8 +126,12 @@ NameFileInfoMap Checker::Check(LocalMapsInfo const & info)
}
else
{
LOG(LINFO, ("Request to diffs server failed. Code =", request.ErrorCode(),
", Redirection =", request.WasRedirected()));
ostringstream ost;
ost << "Request to diffs server failed. Code = " << request.ErrorCode()
<< ", redirection = " << request.WasRedirected();
LOG(LINFO, (ost.str()));
GetPlatform().GetMarketingService().SendMarketingEvent(
marketing::kDiffSchemeError, {{"type", "network"}, {"error", ost.str()}});
}
return diffs;

2
storage/storage.cpp
View file

@ -276,7 +276,7 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs)
i = j;
}
FindAllDiffs(m_dataDir, m_notAppliedDiffs);
if (enableDiffs)
LoadDiffScheme();