3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 07:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More fixes for Unicode filenames support on Windows and OS X

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-06-02 16:10:15 +02:00
parent 7b65a35519
commit 56b993bb89
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/Slic3r.pm
View file

@ -71,6 +71,7 @@ use Slic3r::Print::SupportMaterial;
use Slic3r::Surface;
our $build = eval "use Slic3r::Build; 1";
use Thread::Semaphore;
use Unicode::Normalize;
use constant SCALING_FACTOR => 0.000001;
use constant RESOLUTION => 0.0125;
@ -261,7 +262,13 @@ sub resume_all_threads {
sub encode_path {
my ($path) = @_;
utf8::downgrade($path) if $^O eq 'MSWin32';
$path = Unicode::Normalize::NFC($path);
if ($^O eq 'MSWin32') {
utf8::downgrade($path);
} else {
utf8::encode($path);
}
return $path;
}
@ -273,6 +280,12 @@ sub decode_path {
} else {
utf8::decode($path);
}
# The filesystem might force a normalization form (like HFS+ does) so
# if we rely on the filename being comparable after the open() + readdir()
# roundtrip (like when creating and then selecting a preset), we need to
# restore our normalization form.
$path = Unicode::Normalize::NFC($path);
return $path;
}