mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: [STUDIO-4253] remove file exception in bbs_3mf 

Change-Id: Ie585c4864239e7e25176fb316b5ed2e2249c9234
Jira: STUDIO-4253
This commit is contained in:
chunmao.guo 2023-08-29 17:53:04 +08:00 committed by Lane.Wei
parent ae67715eb5
commit 0a991fa369
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libslic3r/Format/bbs_3mf.cpp
View File

@ -5350,7 +5350,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
~close_lock() { ~close_lock() {
if (filename) { if (filename) {
close_zip_writer(&archive); close_zip_writer(&archive);
boost::filesystem::remove(*filename); boost::system::error_code ec;
boost::filesystem::remove(*filename, ec);
} }
} }
} lock{archive, &filepath_tmp}; } lock{archive, &filepath_tmp};
@ -5414,8 +5415,10 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
std::string const * filename; std::string const * filename;
~close_lock() { ~close_lock() {
close_zip_writer(&archive); close_zip_writer(&archive);
if (filename) if (filename) {
boost::filesystem::remove(*filename); boost::system::error_code ec;
boost::filesystem::remove(*filename, ec);
}
} }
} lock{ archive, &filename}; } lock{ archive, &filename};
@ -5562,7 +5565,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
{ {
if (!_add_calibration_file_to_archive(archive, *calibration_data[index], index)) { if (!_add_calibration_file_to_archive(archive, *calibration_data[index], index)) {
close_zip_writer(&archive); close_zip_writer(&archive);
boost::filesystem::remove(filename);
return false; return false;
} }
} }
@ -5578,7 +5580,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
if (id_bboxes[index]->is_valid()) { if (id_bboxes[index]->is_valid()) {
if (!_add_bbox_file_to_archive(archive, *id_bboxes[index], index)) { if (!_add_bbox_file_to_archive(archive, *id_bboxes[index], index)) {
close_zip_writer(&archive); close_zip_writer(&archive);
boost::filesystem::remove(filename);
return false; return false;
} }
} }
@ -5605,7 +5606,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
// The index differes from the index of an object ID of an object instance of a 3MF file! // The index differes from the index of an object ID of an object instance of a 3MF file!
if (!_add_layer_height_profile_file_to_archive(archive, model)) { if (!_add_layer_height_profile_file_to_archive(archive, model)) {
close_zip_writer(&archive); close_zip_writer(&archive);
boost::filesystem::remove(filename);
return false; return false;
} }
@ -5622,7 +5622,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
// The index differes from the index of an object ID of an object instance of a 3MF file! // The index differes from the index of an object ID of an object instance of a 3MF file!
if (!_add_layer_config_ranges_file_to_archive(archive, model)) { if (!_add_layer_config_ranges_file_to_archive(archive, model)) {
close_zip_writer(&archive); close_zip_writer(&archive);
boost::filesystem::remove(filename);
return false; return false;
} }
@ -7781,13 +7780,15 @@ private:
break; break;
} }
case RemoveObject: { case RemoveObject: {
boost::filesystem::remove(t.path + "/mesh_" + boost::lexical_cast<std::string>(t.id) + ".xml"); boost::system::error_code ec;
boost::filesystem::remove(t.path + "/mesh_" + boost::lexical_cast<std::string>(t.id) + ".xml", ec);
t.type = None; t.type = None;
break; break;
} }
case RemoveBackup: { case RemoveBackup: {
try { try {
boost::filesystem::remove(t.path + "/.3mf"); boost::system::error_code ec;
boost::filesystem::remove(t.path + "/.3mf", ec);
// We Saved with SplitModel now, so we can safe delete these sub models. // We Saved with SplitModel now, so we can safe delete these sub models.
boost::filesystem::remove_all(t.path + "/3D/Objects"); boost::filesystem::remove_all(t.path + "/3D/Objects");
boost::filesystem::create_directory(t.path + "/3D/Objects"); boost::filesystem::create_directory(t.path + "/3D/Objects");