mir/MEGAcmd
2
0
Fork 0
mirror of https://github.com/meganz/MEGAcmd synced 2025-09-02 06:45:09 +00:00
Code Issues Releases Wiki Activity

Merge branch 'CMD-433-dev-runtimedirpath-posix-fix' into 'develop'

Browse Source 
CMD-433 - Fix PosixDirectory::runtimeDirPath prematurely returning a /tmp/ based path.

See merge request apps/MEGAcmd!705
This commit is contained in:
Vibhav Pant
2024-04-11 03:11:31 +12:00
parent 58a489ea58 6c37e3912d
commit db60ef033d
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/configurationmanager.cpp
View File

@@ -714,6 +714,10 @@ void ConfigurationManager::loadConfiguration(bool debug)
// Check if version has been updated. // Check if version has been updated.
stringstream versionionfile; stringstream versionionfile;
if (mConfigFolder.empty())
{
loadConfigDir();
}
versionionfile << mConfigFolder << "/" << VERSION_FILE_NAME; versionionfile << mConfigFolder << "/" << VERSION_FILE_NAME;
// Get latest version if any. // Get latest version if any.

17
src/megacmdcommonutils.cpp
View File

@@ -1566,18 +1566,21 @@ std::string PosixDirectories::homeDirPath()
std::string PosixDirectories::runtimeDirPath() std::string PosixDirectories::runtimeDirPath()
{ {
std::string dir = PosixDirectories::configDirPath(); return PosixDirectories::configDirPath();
struct stat path_stat = {};
bool exists = !stat(dir.c_str(), &path_stat) && S_ISDIR(path_stat.st_mode);
return (dir.empty() || !exists) ? std::string("/tmp/megacmd-").append(std::to_string(getuid()))
: dir;
} }
std::string PosixDirectories::configDirPath() std::string PosixDirectories::configDirPath()
{ {
std::string home = homeDirPath(); std::string home = homeDirPath();
return home.empty() ? std::string() : home.append("/.megaCmd"); if (home.empty())
{
return std::string("/tmp/megacmd-").append(std::to_string(getuid()));
}
struct stat path_stat = {};
bool exists = !stat(home.c_str(), &path_stat) && S_ISDIR(path_stat.st_mode);
return !exists ? std::string("/tmp/megacmd-").append(std::to_string(getuid())) : home.append("/.megaCmd");
} }
bool PosixDirectories::legacyConfigDirExists() bool PosixDirectories::legacyConfigDirExists()

20
tests/unit/PlatformDirectoriesTest.cpp
View File

@@ -59,8 +59,14 @@ TEST(PlatformDirectoriesTest, configDirPath)
{ {
G_SUBTEST << "Without $XDG_CONFIG_HOME"; G_SUBTEST << "Without $XDG_CONFIG_HOME";
auto guard = TestInstrumentsUnsetEnvVarGuard("XDG_CONFIG_HOME"); auto guard = TestInstrumentsUnsetEnvVarGuard("XDG_CONFIG_HOME");
auto homeGuard= TestInstrumentsEnvVarGuard("HOME", "/home/test"); {
EXPECT_EQ(dirs->configDirPath(), "/home/test/.megaCmd"); auto homeGuard = TestInstrumentsEnvVarGuard("HOME", "/tmp");
EXPECT_EQ(dirs->configDirPath(), "/tmp/.megaCmd");
}
{
auto homeGuard = TestInstrumentsEnvVarGuard("HOME", "/non-existent-dir");
EXPECT_EQ(dirs->configDirPath(), std::string("/tmp/megacmd-").append(std::to_string(getuid())));
}
} }
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
@@ -93,9 +99,15 @@ TEST(PlatformDirectoriesTest, cacheDirPath)
} }
{ {
G_SUBTEST << "Without $XDG_CACHE_HOME"; G_SUBTEST << "Without $XDG_CACHE_HOME";
auto homeGuard = TestInstrumentsEnvVarGuard("HOME", "/home/test");
auto guard = TestInstrumentsUnsetEnvVarGuard("XDG_CACHE_HOME"); auto guard = TestInstrumentsUnsetEnvVarGuard("XDG_CACHE_HOME");
EXPECT_EQ(dirs->cacheDirPath(), "/home/test/.megaCmd"); {
auto homeGuard = TestInstrumentsEnvVarGuard("HOME", "/tmp");
EXPECT_EQ(dirs->cacheDirPath(), "/tmp/.megaCmd");
}
{
auto homeGuard = TestInstrumentsEnvVarGuard("HOME", "/non-existent-dir");
EXPECT_EQ(dirs->configDirPath(), std::string("/tmp/megacmd-").append(std::to_string(getuid())));
}
} }
#endif #endif
} }