3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactoring and documentation of check_copy() and copy_file()

Browse source
This commit is contained in:
bubnikv 2019-12-22 11:11:48 +01:00
parent 305ccfd907
commit 0808c8fa3c
2 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/Utils.hpp
View file

@ -66,9 +66,12 @@ extern std::error_code rename_file(const std::string &from, const std::string &t
// Copy a file, adjust the access attributes, so that the target is writable. // Copy a file, adjust the access attributes, so that the target is writable.
int copy_file_inner(const std::string &from, const std::string &to); int copy_file_inner(const std::string &from, const std::string &to);
// Copy file to a temp file first, then rename it to the final file name.
// If with_check is true, then the content of the copied file is compared to the content
// of the source file before renaming.
extern int copy_file(const std::string &from, const std::string &to, const bool with_check = false); extern int copy_file(const std::string &from, const std::string &to, const bool with_check = false);
// Compares two files, returns 0 if identical. // Compares two files, returns 0 if identical, -1 if different.
extern int check_copy(const std::string& origin, const std::string& copy); extern int check_copy(const std::string& origin, const std::string& copy);
// Ignore system and hidden files, which may be created by the DropBox synchronisation process. // Ignore system and hidden files, which may be created by the DropBox synchronisation process.

38
src/libslic3r/utils.cpp
View file

@ -448,31 +448,45 @@ int copy_file(const std::string &from, const std::string &to, const bool with_ch
if (with_check) if (with_check)
ret_val = check_copy(from, to_temp); ret_val = check_copy(from, to_temp);
if (ret_val == 0) if (ret_val == 0 && rename_file(to_temp, to))
rename_file(to_temp, to); ret_val = -1;
} }
return ret_val; return ret_val;
} }
int check_copy(const std::string &origin, const std::string &copy) int check_copy(const std::string &origin, const std::string &copy)
{ {
std::ifstream f1(origin, std::ifstream::binary | std::ifstream::ate); std::ifstream f1(origin, std::ifstream::in | std::ifstream::binary | std::ifstream::ate);
std::ifstream f2(copy, std::ifstream::binary | std::ifstream::ate); std::ifstream f2(copy, std::ifstream::in | std::ifstream::binary | std::ifstream::ate);
if (f1.fail() || f2.fail()) { if (f1.fail() || f2.fail())
return -1; return -1;
}
if (f1.tellg() != f2.tellg()) { std::streampos fsize = f1.tellg();
if (fsize != f2.tellg())
return -1; return -1;
}
f1.seekg(0, std::ifstream::beg); f1.seekg(0, std::ifstream::beg);
f2.seekg(0, std::ifstream::beg); f2.seekg(0, std::ifstream::beg);
bool ident = std::equal(std::istreambuf_iterator<char>(f1.rdbuf()),
std::istreambuf_iterator<char>(), // Compare by reading 8 MiB buffers one at a time.
std::istreambuf_iterator<char>(f2.rdbuf())); size_t buffer_size = 8 * 1024 * 1024;
return(ident ? 0 : -1); std::vector<char> buffer_origin(buffer_size, 0);
std::vector<char> buffer_copy(buffer_size, 0);
do {
f1.read(buffer_origin.data(), buffer_size);
f2.read(buffer_copy.data(), buffer_size);
std::streampos origin_cnt = f1.gcount();
std::streampos copy_cnt = f2.gcount();
if (origin_cnt != copy_cnt ||
(origin_cnt > 0 && std::memcmp(buffer_origin.data(), buffer_copy.data(), origin_cnt) != 0))
// Files are different.
return -1;
fsize -= origin_cnt;
} while (f1.good() && f2.good());
// All data has been read and compared equal.
return (f1.eof() && f2.eof() && fsize == 0) ? 0 : -1;
} }
// Ignore system and hidden files, which may be created by the DropBox synchronisation process. // Ignore system and hidden files, which may be created by the DropBox synchronisation process.