StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

test and fix zip_file::extract

Browse Source
This commit is contained in:
Thomas Fussell 2016-07-19 21:17:31 -04:00
parent 336014aca8
commit a99feb4e57
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/packaging/zip_file.cpp
View File

@ -26,8 +26,15 @@
#include <cstring> #include <cstring>
#include <fstream> #include <fstream>
#include <iterator> #include <iterator>
#include <miniz.h> #include <miniz.h>
#include <unistd.h>
#ifdef _WIN32
#include <direct.h>
#else
#include <sys/types.h>
#include <sys/stat.h>
#endif
#include <detail/include_windows.hpp> #include <detail/include_windows.hpp>
#include <xlnt/packaging/zip_file.hpp> #include <xlnt/packaging/zip_file.hpp>
@ -42,7 +49,9 @@ std::string get_working_directory()
std::basic_string<TCHAR> working_directory(buffer); std::basic_string<TCHAR> working_directory(buffer);
return std::string(working_directory.begin(), working_directory.end()); return std::string(working_directory.begin(), working_directory.end());
#else #else
return ""; char buffer[2048];
getcwd(buffer, 2048);
return std::string(buffer);
#endif #endif
} }
@ -64,7 +73,7 @@ std::string join_path(const std::vector<std::string> &parts)
if (i++ != parts.size() - 1) if (i++ != parts.size() - 1)
{ {
joined.append(1, '/'); joined.append(1, directory_separator);
} }
} }
return joined; return joined;
@ -105,6 +114,33 @@ std::vector<std::string> split_path(const std::string &path, char delim = direct
return split; return split;
} }
bool directory_exists(const std::string path)
{
struct stat info;
return stat(path.c_str(), &info) == 0 && (info.st_mode & S_IFDIR);
}
void mkdir_recursive(const std::string path)
{
if (directory_exists(path)) return;
auto split = split_path(path);
auto last = split.back();
split.pop_back();
if (!split.empty())
{
auto parent = join_path(split);
mkdir_recursive(parent);
}
#ifdef _WIN32
_mkdir(path.c_str());
#else
mkdir(path.c_str(), 0755);
#endif
}
uint32_t crc32buf(const char *buf, std::size_t len) uint32_t crc32buf(const char *buf, std::size_t len)
{ {
uint32_t oldcrc32 = 0xFFFFFFFF; uint32_t oldcrc32 = 0xFFFFFFFF;
@ -651,7 +687,12 @@ void zip_file::extract(const std::string &member)
void zip_file::extract(const std::string &member, const std::string &path) void zip_file::extract(const std::string &member, const std::string &path)
{ {
std::fstream stream(join_path({ path, member }), std::ios::binary | std::ios::out); auto fullpath = join_path({ path, member });
auto split = split_path(fullpath);
split.pop_back();
mkdir_recursive(join_path(split));
std::fstream stream(fullpath, std::ios::binary | std::ios::out);
stream << open(member).rdbuf(); stream << open(member).rdbuf();
} }

19
source/utils/tests/test_zip_file.hpp
View File

@ -274,6 +274,25 @@ public:
remove_temp_file(); remove_temp_file();
} }
void test_extract()
{
xlnt::zip_file f;
f.load(PathHelper::GetDataDirectory("/genuine/empty.xlsx"));
auto expected = PathHelper::GetExecutableDirectory() + "xl/styles.xml";
TS_ASSERT(!PathHelper::FileExists(expected));
f.extract("xl/styles.xml");
TS_ASSERT(PathHelper::FileExists(expected));
PathHelper::DeleteFile(expected);
auto info = f.getinfo("xl/styles.xml");
TS_ASSERT(!PathHelper::FileExists(expected));
f.extract(info);
TS_ASSERT(PathHelper::FileExists(expected));
PathHelper::DeleteFile(expected);
}
private: private:
TemporaryFile temp_file; TemporaryFile temp_file;
std::string existing_file; std::string existing_file;