GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-13 04:58:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

AMF I/O - Automatic detection if open file is zip archive or xml format

Browse Source
This commit is contained in:
Enrico Turri 2018-05-24 09:57:12 +02:00
parent a4261b11d4
commit 157a34bcd9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xs/src/libslic3r/Format/AMF.cpp
View File

@ -13,6 +13,9 @@
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
//############################################################################################################################################
#include <boost/nowide/fstream.hpp>
//############################################################################################################################################
#include <miniz/miniz_zip.h> #include <miniz/miniz_zip.h>
#if 0 #if 0
@ -666,10 +669,21 @@ bool load_amf_archive(const char *path, PresetBundle* bundle, Model *model)
// If bundle is not a null pointer, updates it if the amf file/archive contains config data // If bundle is not a null pointer, updates it if the amf file/archive contains config data
bool load_amf(const char *path, PresetBundle* bundle, Model *model) bool load_amf(const char *path, PresetBundle* bundle, Model *model)
{ {
if (boost::iends_with(path, ".zip.amf")) if (boost::iends_with(path, ".amf.xml"))
return load_amf_archive(path, bundle, model); // backward compatibility with older slic3r output
else if (boost::iends_with(path, ".amf") || boost::iends_with(path, ".amf.xml"))
return load_amf_file(path, bundle, model); return load_amf_file(path, bundle, model);
else if (boost::iends_with(path, ".amf"))
{
boost::nowide::ifstream file(path, boost::nowide::ifstream::binary);
if (!file.good())
return false;
std::string zip_mask(2, '\0');
file.read(const_cast<char*>(zip_mask.data()), 2);
file.close();
return (zip_mask == "PK") ? load_amf_archive(path, bundle, model) : load_amf_file(path, bundle, model);
}
else else
return false; return false;
} }