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

Minor Refactoring for update check notification mechanism

Browse source
This commit is contained in:
Alex Zolotarev 2011-02-19 11:15:07 +01:00 • committed by Alex Zolotarev
parent d87fba4671
commit 6d74c073e1
10 changed files with 152 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
defines.hpp
View file

@ -11,8 +11,9 @@
//#define COUNTRIES_FILE "countries_poly.txt"
// used with bucket storage engine
#define COUNTRIES_FILE "countries_poly.txt"
#define UPDATE_CHECK_FILE "maps.update"
#define UPDATE_BASE_URL "http://melnichek.ath.cx:34568/maps/"
#define DATA_UPDATE_FILE "maps.update"
#define BINARY_UPDATE_FILE "binary.update"
#define UPDATE_BASE_URL "http://data.mapswithme.com/maps/"
#define WORLD_FILE_NAME "World"

2
indexer/indexer_tool/update_generator.cpp
View file

@ -107,7 +107,7 @@ namespace update
}
}
SaveTiles(dataDir + UPDATE_CHECK_FILE, level, cellFiles, commonFiles);
SaveTiles(dataDir + DATA_UPDATE_FILE, level, cellFiles, commonFiles);
LOG_SHORT(LINFO, ("Created update file with", cellFiles.size(), "cell data files and",
commonFiles.size(), "other files"));

7
iphone/Maps/Settings/SettingsManager.mm
View file

@ -40,7 +40,7 @@ using namespace storage;
[(CountriesViewController *)g_navController.topViewController OnDownload: index withProgress: progress];
}
+ (void) OnUpdateCheck: (int64_t) size withReadme: (char const *) readme
+ (void) OnUpdateCheck: (TUpdateResult) result withText: (string const &) text
{
}
@ -65,12 +65,13 @@ using namespace storage;
SEL progressSel = @selector(OnCountryDownload:withProgress:);
TProgressFunc progressImpl = (TProgressFunc)[self methodForSelector:progressSel];
typedef void (*TUpdateFunc)(id, SEL, int64_t, char const *);
typedef void (*TUpdateFunc)(id, SEL, bool, string const &);
SEL updateSel = @selector(OnUpdateCheck:);
TUpdateFunc updateImpl = (TUpdateFunc)[self methodForSelector:updateSel];
storage.Subscribe(boost::bind(changeImpl, self, changeSel, _1),
boost::bind(progressImpl, self, progressSel, _1, _2), boost::bind(updateImpl, self, updateSel, _1, _2));
boost::bind(progressImpl, self, progressSel, _1, _2),
boost::bind(updateImpl, self, updateSel, _1, _2));
}
[parentController presentModalViewController:g_navController animated:YES];

32
qt/info_dialog.cpp
View file

@ -10,12 +10,14 @@
namespace qt
{
InfoDialog::InfoDialog(QString const & title, QString const & text, QWidget * parent)
InfoDialog::InfoDialog(QString const & title, QString const & text, QWidget * parent,
QStringList const & buttons)
: QDialog(parent)
{
QIcon icon(":logo.png");
setWindowIcon(icon);
setWindowTitle(title);
setFocus();
QVBoxLayout * vBox = new QVBoxLayout();
QLabel * label = new QLabel(text);
@ -24,8 +26,15 @@ namespace qt
// this horizontal layout is for buttons
QHBoxLayout * hBox = new QHBoxLayout();
vBox->addLayout(hBox);
hBox->addSpacing(label->width() / 4 * (3.5 - buttons.size()));
for (int i = 0; i < buttons.size(); ++i)
{
QPushButton * button = new QPushButton(buttons[i], this);
connect(button, SIGNAL(clicked()), this, SLOT(OnButtonClick()));
hBox->addWidget(button);
}
vBox->addLayout(hBox);
setLayout(vBox);
}
@ -34,23 +43,4 @@ namespace qt
// @TODO determine which button is pressed
done(0);
}
void InfoDialog::SetCustomButtons(QStringList const & buttons)
{
QLayout * hBox = layout()->layout();
// @TODO clear old buttons if any
// for (int i = 0; i < hBox->count(); ++i)
// {
// QLayoutItem * item = hBox->itemAt(i);
// hBox->removeItem(item);
// delete item;
// }
for (int i = 0; i < buttons.size(); ++i)
{
QPushButton * button = new QPushButton(buttons[i]);
connect(button, SIGNAL(clicked()), this, SLOT(OnButtonClick()));
hBox->addWidget(button);
}
}
}

7
qt/info_dialog.hpp
View file

@ -10,11 +10,8 @@ namespace qt
Q_OBJECT
public:
/// Default constructor creates dialog without any buttons
explicit InfoDialog(QString const & title, QString const & text, QWidget * parent);
/// Sets buttons in dialog
void SetCustomButtons(QStringList const & buttons);
explicit InfoDialog(QString const & title, QString const & text,
QWidget * parent, QStringList const & buttons = QStringList());
public Q_SLOTS:
void OnButtonClick();
};

5
qt/mainwindow.cpp
View file

@ -87,10 +87,7 @@ MainWindow::MainWindow() : m_updateDialog(0)
QByteArray text = welcomeTextFile.readAll();
welcomeTextFile.close();
InfoDialog welcomeDlg(tr("Welcome to MapsWithMe!"), text, this);
QStringList buttons;
buttons << tr("Download Maps");
welcomeDlg.SetCustomButtons(buttons);
InfoDialog welcomeDlg(tr("Welcome to MapsWithMe!"), text, this, QStringList(tr("Download Maps")));
welcomeDlg.exec();
}
Settings::Set("ShowWelcome", false);

67
qt/update_dialog.cpp
View file

@ -1,4 +1,5 @@
#include "update_dialog.hpp"
#include "info_dialog.hpp"
#include "../base/assert.hpp"
@ -173,26 +174,52 @@ namespace qt
item.setTextColor(column, color);
}
void UpdateDialog::OnUpdateCheck(int64_t updateSize, char const * readme)
void UpdateDialog::OnUpdateRequest(storage::TUpdateResult res, string const & description)
{
if (updateSize < 0)
;//m_label->setText(QObject::tr("No update is available"));
else
switch (res)
{
QString title(QObject::tr("Update is available"));
QString text(readme ? readme : "");
if (updateSize / (1000 * 1000 * 1000) > 0)
text.append(QObject::tr("\n\nDo you want to perform update and download %1 GB?").arg(
uint(updateSize / (1000 * 1000 * 1000))));
else if (updateSize / (1000 * 1000) > 0)
text.append(QObject::tr("\n\nDo you want to perform update and download %1 MB?").arg(
uint(updateSize / (1000 * 1000))));
else
text.append(QObject::tr("\n\nDo you want to perform update and download %1 kB?").arg(
uint((updateSize + 999) / 1000)));
if (QMessageBox::Yes == QMessageBox::question(this, title, text, QMessageBox::Yes, QMessageBox::No))
m_storage.PerformUpdate();
case ENoAnyUpdateAvailable:
{
// @TODO do not show it for automatic update checks
InfoDialog dlg(tr("No update is available"),
tr("At this moment, no new version is available. Please, try again later or "
"visit our <a href=\"http://www.mapswithme.com\">site</a> for latest news."),
this, QStringList(tr("Ok")));
dlg.exec();
}
break;
case ENewBinaryAvailable:
{
InfoDialog dlg(tr("New version is available!"), description.c_str(), this,
QStringList(tr("Postpone update")));
dlg.exec();
}
break;
case storage::EBinaryCheckFailed:
{
InfoDialog dlg(tr("Update check failed"), description.c_str(), this, QStringList(tr("Ok")));
dlg.exec();
}
break;
}
// if (updateSize < 0)
// ;//m_label->setText(QObject::tr("No update is available"));
// else
// {
// QString title(QObject::tr("Update is available"));
// QString text(readme ? readme : "");
// if (updateSize / (1000 * 1000 * 1000) > 0)
// text.append(QObject::tr("\n\nDo you want to perform update and download %1 GB?").arg(
// uint(updateSize / (1000 * 1000 * 1000))));
// else if (updateSize / (1000 * 1000) > 0)
// text.append(QObject::tr("\n\nDo you want to perform update and download %1 MB?").arg(
// uint(updateSize / (1000 * 1000))));
// else
// text.append(QObject::tr("\n\nDo you want to perform update and download %1 kB?").arg(
// uint((updateSize + 999) / 1000)));
// if (QMessageBox::Yes == QMessageBox::question(this, title, text, QMessageBox::Yes, QMessageBox::No))
// m_storage.PerformUpdate();
// }
m_updateButton->setText(CHECK_FOR_UPDATE);
m_updateButton->setDisabled(false);
}
@ -319,9 +346,9 @@ namespace qt
void UpdateDialog::ShowDialog()
{
// we want to receive all download progress and result events
m_storage.Subscribe(boost::bind(&UpdateDialog::OnCountryChanged, this, _1),
boost::bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2),
boost::bind(&UpdateDialog::OnUpdateCheck, this, _1, _2));
m_storage.Subscribe(bind(&UpdateDialog::OnCountryChanged, this, _1),
bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2),
bind(&UpdateDialog::OnUpdateRequest, this, _1, _2));
// if called for first time
if (!m_tree->topLevelItemCount())
FillTree();

4
qt/update_dialog.hpp
View file

@ -23,9 +23,7 @@ namespace qt
void OnCountryChanged(storage::TIndex const & index);
void OnCountryDownloadProgress(storage::TIndex const & index,
TDownloadProgress const & progress);
/// @param updateSize if -1 then no update is available
/// @param readme optional, can be NULL
void OnUpdateCheck(int64_t updateSize, char const * readme);
void OnUpdateRequest(storage::TUpdateResult result, string const & description);
//@}
void ShowDialog();

82
storage/storage.cpp
View file

@ -18,6 +18,30 @@
namespace storage
{
static string ErrorString(DownloadResult res)
{
switch (res)
{
case EHttpDownloadCantCreateFile:
return "File can't be created. Probably, you have no disk space available or "
"using read-only file system.";
case EHttpDownloadFailed:
return "Download failed due to missing or poor connection. "
"Please, try again later.";
case EHttpDownloadFileIsLocked:
return "Download can't be finished because file is locked. "
"Please, try again after restarting application.";
case EHttpDownloadFileNotFound:
return "Requested file is absent on the server.";
case EHttpDownloadNoConnectionAvailable:
return "No network connection is available.";
case EHttpDownloadOk:
return "Download finished successfully.";
}
return "Unknown error";
}
////////////////////////////////////////////////////////////////////////////
void Storage::Init(TAddMapFunction addFunc, TRemoveMapFunction removeFunc)
{
m_currentVersion = static_cast<uint32_t>(Version::BUILD);
@ -250,7 +274,7 @@ namespace storage
if (m_countries.SiblingsCount() == 0)
{
TTilesContainer tiles;
if (LoadTiles(tiles, GetPlatform().ReadPathForFile(UPDATE_CHECK_FILE), m_currentVersion))
if (LoadTiles(tiles, GetPlatform().ReadPathForFile(DATA_UPDATE_FILE), m_currentVersion))
{
if (!LoadCountries(GetPlatform().ReadPathForFile(COUNTRIES_FILE), tiles, m_countries))
{
@ -259,17 +283,17 @@ namespace storage
}
else
{
LOG(LWARNING, ("Can't load update file", UPDATE_CHECK_FILE));
LOG(LWARNING, ("Can't load update file", DATA_UPDATE_FILE));
}
}
}
void Storage::Subscribe(TObserverChangeCountryFunction change, TObserverProgressFunction progress,
TUpdateCheckFunction check)
TUpdateRequestFunction updateRequest)
{
m_observerChange = change;
m_observerProgress = progress;
m_observerUpdateCheck = check;
m_observerUpdateRequest = updateRequest;
ReInitCountries(false);
}
@ -278,7 +302,7 @@ namespace storage
{
m_observerChange.clear();
m_observerProgress.clear();
m_observerUpdateCheck.clear();
m_observerUpdateRequest.clear();
}
string FileFromUrl(string const & url)
@ -331,32 +355,31 @@ namespace storage
void Storage::CheckForUpdate()
{
string const update = UpdateBaseUrl() + UPDATE_CHECK_FILE;
// at this moment we support only binary update checks
string const update = UpdateBaseUrl() + BINARY_UPDATE_FILE/*DATA_UPDATE_FILE*/;
GetDownloadManager().CancelDownload(update.c_str());
GetDownloadManager().DownloadFile(
update.c_str(),
(GetPlatform().WritablePathForFile(UPDATE_CHECK_FILE)).c_str(),
bind(&Storage::OnDataUpdateCheckFinished, this, _1, _2),
(GetPlatform().WritablePathForFile(DATA_UPDATE_FILE)).c_str(),
bind(&Storage::OnBinaryUpdateCheckFinished, this, _1, _2),
TDownloadProgressFunction(), false);
}
void Storage::OnUpdateDownloadFinished(char const * url, DownloadResult result)
void Storage::OnDataUpdateCheckFinished(char const * url, DownloadResult result)
{
if (result != EHttpDownloadOk)
{
LOG(LWARNING, ("Update check failed for url:", url));
if (m_observerUpdateCheck)
m_observerUpdateCheck(-1, NULL);
if (m_observerUpdateRequest)
m_observerUpdateRequest(EDataCheckFailed, ErrorString(result));
}
else
{ // @TODO parse update file and notify GUI
if (m_observerUpdateCheck)
m_observerUpdateCheck(666000, "Arbaiten, Zmagary! Tasks for release:\n\n0. Fast YG\n1. Simplificator tuning\n2. Updater\n3. World map");
}
// parse update file
// TCountriesContainer tempCountries;
// if (!LoadCountries(tempCountries, GetPlatform().WritablePathForFile(UPDATE_CHECK_FILE)))
// if (!LoadCountries(tempCountries, GetPlatform().WritablePathForFile(DATA_UPDATE_FILE)))
// {
// LOG(LWARNING, ("New application version should be downloaded, "
// "update file format can't be parsed"));
@ -374,8 +397,35 @@ namespace storage
// LOG(LINFO, ("Update check complete"));
}
void Storage::PerformUpdate()
void Storage::OnBinaryUpdateCheckFinished(char const * url, DownloadResult result)
{
// @TODO:
if (result == EHttpDownloadFileNotFound)
{ // no binary update is available
if (m_observerUpdateRequest)
m_observerUpdateRequest(ENoAnyUpdateAvailable, "No update is available");
}
else if (result == EHttpDownloadOk)
{ // update is available!
try
{
if (m_observerUpdateRequest)
{
string const updateTextFilePath = GetPlatform().ReadPathForFile(FileFromUrl(url));
FileReader file(updateTextFilePath);
m_observerUpdateRequest(ENewBinaryAvailable, file.ReadAsText());
}
}
catch (std::exception const & e)
{
if (m_observerUpdateRequest)
m_observerUpdateRequest(EBinaryCheckFailed,
string("Error loading b-update text file ") + e.what());
}
}
else
{ // connection error
if (m_observerUpdateRequest)
m_observerUpdateRequest(EBinaryCheckFailed, ErrorString(result));
}
}
}

21
storage/storage.hpp
View file

@ -27,6 +27,17 @@ namespace storage
EUnknown
};
enum TUpdateResult
{
ENoAnyUpdateAvailable = 0,
ENewBinaryAvailable = 0x01,
EBinaryCheckFailed = 0x02,
EBinaryUpdateFailed = 0x04,
ENewDataAvailable = 0x08,
EDataCheckFailed = 0x10,
EDataUpdateFailed = 0x20
};
struct TIndex
{
int m_group;
@ -69,10 +80,10 @@ namespace storage
//@{
typedef boost::function<void (TIndex const &)> TObserverChangeCountryFunction;
typedef boost::function<void (TIndex const &, TDownloadProgress const &)> TObserverProgressFunction;
typedef boost::function<void (int64_t, char const *)> TUpdateCheckFunction;
typedef boost::function<void (TUpdateResult, string const &)> TUpdateRequestFunction;
TObserverChangeCountryFunction m_observerChange;
TObserverProgressFunction m_observerProgress;
TUpdateCheckFunction m_observerUpdateCheck;
TUpdateRequestFunction m_observerUpdateRequest;
//@}
/// @name Communicate with Framework
@ -98,14 +109,15 @@ namespace storage
//@{
void OnMapDownloadFinished(char const * url, DownloadResult result);
void OnMapDownloadProgress(char const * url, TDownloadProgress progress);
void OnUpdateDownloadFinished(char const * url, DownloadResult result);
void OnDataUpdateCheckFinished(char const * url, DownloadResult result);
void OnBinaryUpdateCheckFinished(char const * url, DownloadResult result);
//@}
/// @name Current impl supports only one observer
//@{
void Subscribe(TObserverChangeCountryFunction change,
TObserverProgressFunction progress,
TUpdateCheckFunction check);
TUpdateRequestFunction dataCheck);
void Unsubscribe();
//@}
@ -118,6 +130,5 @@ namespace storage
void DeleteCountry(TIndex const & index);
void CheckForUpdate();
void PerformUpdate();
};
}