viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Delete existing vendors before importing newer vendors, as the existing

Browse Source 
vendors may not be referenced by newer PrusaSlicer.ini imported.
This commit is contained in:
Vojtech Bubnik
2021-12-15 13:43:30 +01:00
parent 303cf8c38f
commit 97a7dd975c
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libslic3r/PresetBundle.cpp
View File

@ -209,9 +209,16 @@ static void copy_dir(const boost::filesystem::path& from_dir, const boost::files
}
}
void PresetBundle::copy_files(const std::string& from)
// Import newer configuration from alternate PrusaSlicer configuration directory.
// AppConfig from the alternate location is already loaded.
// User profiles are being merged (old files are not being deleted),
// while old system bundles are being deleted before newer are copied.
void PresetBundle::import_newer_configs(const std::string& from)
{
boost::filesystem::path data_dir = boost::filesystem::path(Slic3r::data_dir());
// Clean-up vendors from the target directory, as the existing vendors will not be referenced
// by the copied PrusaSlicer.ini
boost::filesystem::remove_all(data_dir / "vendor");
// list of searched paths based on current directory system in setup_directories()
// do not copy cache and snapshots
boost::filesystem::path from_data_dir = boost::filesystem::path(from);
@ -220,7 +227,6 @@ void PresetBundle::copy_files(const std::string& from)
from_data_dir / "shapes",
#ifdef SLIC3R_PROFILE_USE_PRESETS_SUBDIR
// Store the print/filament/printer presets into a "presets" directory.
data_dir / "presets",
data_dir / "presets" / "print",
data_dir / "presets" / "filament",
data_dir / "presets" / "sla_print",
@ -1235,11 +1241,13 @@ std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_configbundle(
// 1) Read the complete config file into a boost::property_tree.
namespace pt = boost::property_tree;
pt::ptree tree;
boost::nowide::ifstream ifs(path);
try {
pt::read_ini(ifs, tree);
} catch (const boost::property_tree::ini_parser::ini_parser_error &err) {
throw Slic3r::RuntimeError(format("Failed loading config bundle \"%1%\"\nError: \"%2%\" at line %3%", path, err.message(), err.line()).c_str());
{
boost::nowide::ifstream ifs(path);
try {
pt::read_ini(ifs, tree);
} catch (const boost::property_tree::ini_parser::ini_parser_error &err) {
throw Slic3r::RuntimeError(format("Failed loading config bundle \"%1%\"\nError: \"%2%\" at line %3%", path, err.message(), err.line()).c_str());
}
}
const VendorProfile *vendor_profile = nullptr;