3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable loading profiles in config wizard from vendor folder.

Browse Source 
This is for 3rd party profiles that are not downloaded from our servers.
#10606
This commit is contained in:
David Kocik 2023-05-22 11:10:36 +02:00
parent b0a1093047
commit 80b88c542a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -153,15 +153,22 @@ BundleMap BundleMap::load()
if (res.find(id) != res.end()) { continue; } if (res.find(id) != res.end()) { continue; }
// Fresh index should be in archive_dir, otherwise look for it in cache // Fresh index should be in archive_dir, otherwise look for it in cache
// Then if not in archive or cache - it could be 3rd party profile that user just copied to vendor folder (both ini and cache)
fs::path idx_path (archive_dir / (id + ".idx")); fs::path idx_path (archive_dir / (id + ".idx"));
if (!boost::filesystem::exists(idx_path)) { if (!boost::filesystem::exists(idx_path)) {
BOOST_LOG_TRIVIAL(warning) << format("Missing index %1% when loading bundle %2%.", idx_path.string(), id); BOOST_LOG_TRIVIAL(error) << format("Missing index %1% when loading bundle %2%. Going to search for it in cache folder.", idx_path.string(), id);
idx_path = fs::path(cache_dir / (id + ".idx")); idx_path = fs::path(cache_dir / (id + ".idx"));
} }
if (!boost::filesystem::exists(idx_path)) {
BOOST_LOG_TRIVIAL(error) << format("Missing index %1% when loading bundle %2%. Going to search for it in vendor folder. Is it a 3rd party profile?", idx_path.string(), id);
idx_path = fs::path(vendor_dir / (id + ".idx"));
}
if (!boost::filesystem::exists(idx_path)) { if (!boost::filesystem::exists(idx_path)) {
BOOST_LOG_TRIVIAL(error) << format("Could not load bundle %1% due to missing index %2%.", id, idx_path.string()); BOOST_LOG_TRIVIAL(error) << format("Could not load bundle %1% due to missing index %2%.", id, idx_path.string());
continue; continue;
} }
Slic3r::GUI::Config::Index index; Slic3r::GUI::Config::Index index;
try { try {
index.load(idx_path); index.load(idx_path);