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

Find a kml file in the kmz archive after downloading.

Browse source
This commit is contained in:
Daria Volvenkova 2018-04-09 20:21:41 +03:00 • committed by Roman Kuznetsov
parent 82051a7928
commit 1d1094a268
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
map/bookmark_manager.cpp
View file

@ -122,8 +122,7 @@ BookmarkManager::SharingResult GetFileForSharing(kml::MarkGroupId categoryId, st
"Bookmarks file does not exist.");
}
auto ext = my::GetFileExtension(filePath);
strings::AsciiToLower(ext);
auto const ext = GetFileExt(filePath);
std::string fileName = my::GetNameFromFullPathWithoutExt(filePath);
auto const tmpFilePath = my::JoinPath(GetPlatform().TmpDir(), fileName + kKmzExtension);
if (ext == kKmzExtension)
@ -167,9 +166,18 @@ bool ConvertAfterDownloading(std::string const & filePath, std::string const & c
if (files.empty())
return false;
auto fileName = files.front().first;
for (auto const & file : files)
{
if (GetFileExt(file.first) == kKmlExtension)
{
fileName = file.first;
break;
}
}
std::string const unarchievedPath = filePath + ".raw";
MY_SCOPE_GUARD(fileGuard, bind(&FileWriter::DeleteFileX, unarchievedPath));
ZipFileReader::UnzipFile(filePath, files.front().first, unarchievedPath);
ZipFileReader::UnzipFile(filePath, fileName, unarchievedPath);
if (!GetPlatform().IsFileExistsByFullPath(unarchievedPath))
return false;