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

aditional information to FAIL_COPY_FILE error message and changed bools controlling Export finished notification

Browse source
This commit is contained in:
David Kocik 2020-10-23 10:18:10 +02:00
parent a623630614
commit 115cbd4650
4 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libslic3r/utils.cpp
View file

@ -417,7 +417,7 @@ std::error_code rename_file(const std::string &from, const std::string &to)
#endif
}
CopyFileResult copy_file_inner(const std::string& from, const std::string& to)
CopyFileResult copy_file_inner(const std::string& from, const std::string& to, boost::system::error_code &error_code)
{
const boost::filesystem::path source(from);
const boost::filesystem::path target(to);
@ -429,20 +429,30 @@ CopyFileResult copy_file_inner(const std::string& from, const std::string& to)
// the copy_file() function will fail appropriately and we don't want the permission()
// calls to cause needless failures on permissionless filesystems (ie. FATs on SD cards etc.)
// or when the target file doesn't exist.
//This error code is ignored
boost::system::error_code ec;
boost::filesystem::permissions(target, perms, ec);
boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, ec);
if (ec) {
boost::filesystem::permissions(target, perms, error_code);
if (ec)
BOOST_LOG_TRIVIAL(error) << "Copy file permisions before copy error message: " << ec.message();
// This error code is passed up
error_code.clear();
boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, error_code);
if (error_code) {
return FAIL_COPY_FILE;
}
boost::filesystem::permissions(target, perms, ec);
ec.clear();
boost::filesystem::permissions(target, perms, error_code);
if (ec)
BOOST_LOG_TRIVIAL(error) << "Copy file permisions after copy error message: " << ec.message();
return SUCCESS;
}
CopyFileResult copy_file(const std::string &from, const std::string &to, const bool with_check)
CopyFileResult copy_file(const std::string &from, const std::string &to, boost::system::error_code &error_code, const bool with_check)
{
std::string to_temp = to + ".tmp";
CopyFileResult ret_val = copy_file_inner(from,to_temp);
CopyFileResult ret_val = copy_file_inner(from, to_temp, error_code);
if(ret_val == SUCCESS)
{
if (with_check)