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

Try to fix conversion from uri to string path

Browse source 
'file://System/Library/Fonts/Helvetica.ttc#postscript-name=Helvetica' -> '/System/Library/Fonts/Helvetica.ttc'
This commit is contained in:
Filip Sykala - NTB T15p 2023-02-23 12:01:26 +01:00
parent 20c72c527a
commit d3e212486b
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/Utils/WxFontUtils.cpp
View file

@ -43,6 +43,20 @@ static bool is_valid_ttf(std::string_view file_path)
return true;
}
static std::string get_path_from_file_uri(const wxString &file_uri)
{
wxURI uri(file_uri);
const wxString &path = uri.GetPath();
BOOST_LOG_TRIVIAL(trace) << "input uri(" << file_uri.c_str() << ") convert to path(" << path.c_str() << ").";
std::string file_path(path.c_str());
size_t start = std::string("file://").size();
if (file_path.empty() || file_path.size() <= start)
return {};
// remove prefix file://
file_path = file_path.substr(start, file_path.size() - start);
return file_path;
}
// get filepath from wxFont on Mac OsX
static std::string get_file_path(const wxFont& font) {
const wxNativeFontInfo *info = font.GetNativeFontInfo();
@ -55,13 +69,7 @@ static std::string get_file_path(const wxFont& font) {
if (url == NULL) return {};
wxString file_uri;
wxCFTypeRef(url).GetValue(file_uri);
std::string file_path(wxURI::Unescape(file_uri).c_str());
size_t start = std::string("file://").size();
if (file_path.empty() || file_path.size() <= start)
return {};
// remove prefix file://
file_path = file_path.substr(start, file_path.size() - start);
return file_path;
return get_path_from_file_uri(file_uri);
}
#endif // __APPLE__
} // namespace