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

Added function to remove non empty directories

Browse source
This commit is contained in:
Constantin Shalnev 2016-01-20 12:55:48 +03:00
parent 058fab23b1
commit 6c99fe9dd6
3 changed files with 82 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
platform/platform.cpp
View file

@ -3,6 +3,7 @@
#include "coding/base64.hpp"
#include "coding/file_name_utils.hpp"
#include "coding/internal/file_data.hpp"
#include "coding/sha2.hpp"
#include "coding/writer.hpp"
@ -15,6 +16,14 @@
#include <errno.h>
namespace
{
bool IsSpecialDirName(string const & dirName)
{
return dirName == "." || dirName == "..";
}
} // namespace
// static
Platform::EError Platform::ErrnoToError()
{
@ -33,6 +42,38 @@ Platform::EError Platform::ErrnoToError()
}
}
// static
bool Platform::RmDirRecursively(string const & dirName)
{
if (dirName.empty() || IsSpecialDirName(dirName))
return false;
bool res = true;
TFilesWithType fwts;
GetFilesByType(dirName, FILE_TYPE_REGULAR | FILE_TYPE_DIRECTORY, fwts);
for (auto const & fwt : fwts)
{
string const & name = fwt.first;
EFileType const type = fwt.second;
if (type == FILE_TYPE_REGULAR)
{
if (!my::DeleteFileX(my::JoinFoldersToPath(dirName, name)))
res = false;
}
else if (type == FILE_TYPE_DIRECTORY && !IsSpecialDirName(name))
{
if (!RmDirRecursively(my::JoinFoldersToPath(dirName, name)))
res = false;
}
}
if (RmDir(dirName) != ERR_OK)
res = false;
return res;
}
string Platform::ReadPathForFile(string const & file, string searchScope) const
{
if (searchScope.empty())

5
platform/platform.hpp
View file

@ -106,6 +106,11 @@ public:
/// Removes empty directory from the filesystem.
static EError RmDir(string const & dirName);
/// Removes directory from the filesystem.
/// @note Directory can be non empty.
/// @note If function fails, directory can be partially removed.
static bool RmDirRecursively(string const & dirName);
/// @TODO create join method for string concatenation
/// @return path for directory with temporary files with slash at the end

36
platform/platform_tests/platform_test.cpp
View file

@ -212,3 +212,39 @@ UNIT_TEST(GetWritableStorageStatus)
TEST_EQUAL(Platform::STORAGE_OK, GetPlatform().GetWritableStorageStatus(100000), ());
TEST_EQUAL(Platform::NOT_ENOUGH_SPACE, GetPlatform().GetWritableStorageStatus(uint64_t(-1)), ());
}
UNIT_TEST(RmDirRecursively)
{
Platform & platform = GetPlatform();
string const testDir1 = my::JoinFoldersToPath(platform.WritableDir(), "test_dir1");
TEST_EQUAL(platform.MkDir(testDir1), Platform::ERR_OK, ());
MY_SCOPE_GUARD(removeTestDir1, bind(&Platform::RmDir, testDir1));
string const testDir2 = my::JoinFoldersToPath(testDir1, "test_dir2");
TEST_EQUAL(platform.MkDir(testDir2), Platform::ERR_OK, ());
MY_SCOPE_GUARD(removeTestDir2, bind(&Platform::RmDir, testDir2));
string const filePath = my::JoinFoldersToPath(testDir2, "test_file");
{
FileWriter testFile(filePath);
testFile.Write("HOHOHO", 6);
}
MY_SCOPE_GUARD(removeTestFile, bind(&my::DeleteFileX, filePath));
TEST(Platform::IsFileExistsByFullPath(filePath), ());
TEST(Platform::IsFileExistsByFullPath(testDir1), ());
TEST(Platform::IsFileExistsByFullPath(testDir2), ());
TEST_EQUAL(Platform::ERR_DIRECTORY_NOT_EMPTY, Platform::RmDir(testDir1), ());
TEST(Platform::IsFileExistsByFullPath(filePath), ());
TEST(Platform::IsFileExistsByFullPath(testDir1), ());
TEST(Platform::IsFileExistsByFullPath(testDir2), ());
TEST(Platform::RmDirRecursively(testDir1), ());
TEST(!Platform::IsFileExistsByFullPath(filePath), ());
TEST(!Platform::IsFileExistsByFullPath(testDir1), ());
TEST(!Platform::IsFileExistsByFullPath(testDir2), ());
}