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

[platform, linux] Fixed coding style of a linux Platform.

Browse source
This commit is contained in:
Yuri Gorshenin 2015-10-21 18:01:14 +03:00
parent 8ba49e5c95
commit c211e3adc0
1 changed files with 55 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
platform/platform_linux.cpp
View file

@ -1,10 +1,11 @@
#include "platform/platform.hpp"
#include "coding/file_reader.hpp"
#include "coding/file_name_utils.hpp"
#include "base/logging.hpp"
#include "base/scope_guard.hpp"
#include "coding/file_reader.hpp"
#include "std/bind.hpp"
#include <stdlib.h>
@ -21,69 +22,84 @@ namespace
{
// Web service ip to check internet connection. Now it's a mail.ru ip.
char constexpr kSomeWorkingWebServer[] = "217.69.139.202";
} // namespace
/// @return directory where binary resides, including slash at the end
static bool GetBinaryFolder(string & outPath)
// Returns directory where binary resides, including slash at the end.
bool GetBinaryDir(string & outPath)
{
char path[4096] = {0};
if (0 < ::readlink("/proc/self/exe", path, ARRAY_SIZE(path)))
{
outPath = path;
outPath.erase(outPath.find_last_of('/') + 1);
return true;
}
return false;
char path[4096] = {};
if (::readlink("/proc/self/exe", path, ARRAY_SIZE(path)) <= 0)
return false;
outPath = path;
outPath.erase(outPath.find_last_of('/') + 1);
return true;
}
// Returns true if EULA file exists in directory.
bool IsEulaExist(string const & directory)
{
return Platform::IsFileExistsByFullPath(my::JoinFoldersToPath(directory, "eula.html"));
}
} // namespace
Platform::Platform()
{
// init directories
// Init directories.
string path;
CHECK(GetBinaryFolder(path), ("Can't retrieve path to executable"));
CHECK(GetBinaryDir(path), ("Can't retrieve path to executable"));
char const * homePath = ::getenv("HOME");
string const home(homePath ? homePath : "");
m_settingsDir = home + "/.config/MapsWithMe";
m_settingsDir = my::JoinFoldersToPath({home, ".config"}, "MapsWithMe");
if (!IsFileExistsByFullPath(m_settingsDir + SETTINGS_FILE_NAME))
if (!IsFileExistsByFullPath(my::JoinFoldersToPath(m_settingsDir, SETTINGS_FILE_NAME)))
{
mkdir((home + "/.config/").c_str(), 0755);
mkdir(m_settingsDir.c_str(), 0755);
MkDir(my::JoinFoldersToPath(home, ".config"));
MkDir(m_settingsDir.c_str());
}
m_writableDir = home + "/.local/share/MapsWithMe";
mkdir((home + "/.local/").c_str(), 0755);
mkdir((home + "/.local/share/").c_str(), 0755);
mkdir(m_writableDir.c_str(), 0755);
m_writableDir = my::JoinFoldersToPath({home, ".local", "share"}, "MapsWithMe");
MkDir(my::JoinFoldersToPath(home, ".local"));
MkDir(my::JoinFoldersToPath({home, ".local"}, "share"));
MkDir(m_writableDir);
char const * resDir = ::getenv("MWM_RESOURCES_DIR");
if (resDir)
{
m_resourcesDir = resDir;
}
else
{
// developer builds with symlink
if (IsFileExistsByFullPath(path + "../../data/eula.html"))
string const devBuildWithSymlink = my::JoinFoldersToPath({path, "..", ".."}, "data");
string const devBuildWithoutSymlink =
my::JoinFoldersToPath({path, "..", "..", "..", "omim"}, "data");
string const installedVersionWithPackages = my::JoinFoldersToPath({path, ".."}, "share");
string const installedVersionWithoutPackages =
my::JoinFoldersToPath({path, ".."}, "MapsWithMe");
string const customInstall = path;
if (IsEulaExist(devBuildWithSymlink))
{
m_resourcesDir = path + "../../data";
m_resourcesDir = devBuildWithSymlink;
m_writableDir = m_resourcesDir;
}
// developer builds without symlink
else if (IsFileExistsByFullPath(path + "../../../omim/data/eula.html"))
else if (IsEulaExist(devBuildWithoutSymlink))
{
m_resourcesDir = path + "../../../omim/data";
m_resourcesDir = devBuildWithoutSymlink;
m_writableDir = m_resourcesDir;
}
// installed version - /opt/MapsWithMe and unpacked packages
else if (IsFileExistsByFullPath(path + "../share/eula.html"))
m_resourcesDir = path + "../share";
// installed version
else if (IsFileExistsByFullPath(path + "../share/MapsWithMe/eula.html"))
m_resourcesDir = path + "../share/MapsWithMe";
// all-nearby installs
else if (IsFileExistsByFullPath(path + "/eula.html"))
else if (IsEulaExist(installedVersionWithPackages))
{
m_resourcesDir = installedVersionWithPackages;
}
else if (IsEulaExist(installedVersionWithoutPackages))
{
m_resourcesDir = installedVersionWithoutPackages;
}
else if (IsEulaExist(customInstall))
{
m_resourcesDir = path;
}
}
m_resourcesDir += '/';
m_settingsDir += '/';
@ -115,8 +131,8 @@ string Platform::UniqueClientId() const
FileReader(machineFile).ReadAsString(content);
return content.substr(0, 32);
}
else
return "n0dbus0n0lsb00000000000000000000";
return "n0dbus0n0lsb00000000000000000000";
}
void Platform::RunOnGuiThread(TFunctor const & fn)