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

More fixes for Unicode path handling (thanks @josefprusa for Czech test VM)

Browse Source
This commit is contained in:
Alessandro Ranellucci 2015-06-13 11:41:55 +02:00
parent 4a91ea817a
commit 552430db67
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build.PL
View File

@ -7,6 +7,8 @@ use Config;
use File::Spec; use File::Spec;
my %prereqs = qw( my %prereqs = qw(
Encode 0
Encode::Locale 1.05
ExtUtils::MakeMaker 6.80 ExtUtils::MakeMaker 6.80
ExtUtils::ParseXS 3.22 ExtUtils::ParseXS 3.22
File::Basename 0 File::Basename 0

18
lib/Slic3r.pm
View File

@ -30,7 +30,7 @@ warn "Running Slic3r under Perl 5.16 is not supported nor recommended\n"
if $^V == v5.16; if $^V == v5.16;
use FindBin; use FindBin;
our $var = "$FindBin::Bin/var"; our $var = decode_path($FindBin::Bin) . "/var";
use Moo 1.003001; use Moo 1.003001;
@ -71,6 +71,8 @@ use Slic3r::Print::SupportMaterial;
use Slic3r::Surface; use Slic3r::Surface;
our $build = eval "use Slic3r::Build; 1"; our $build = eval "use Slic3r::Build; 1";
use Thread::Semaphore; use Thread::Semaphore;
use Encode::Locale 1.05;
use Encode;
use Unicode::Normalize; use Unicode::Normalize;
use constant SCALING_FACTOR => 0.000001; use constant SCALING_FACTOR => 0.000001;
@ -263,11 +265,7 @@ sub encode_path {
my ($path) = @_; my ($path) = @_;
$path = Unicode::Normalize::NFC($path); $path = Unicode::Normalize::NFC($path);
if ($^O eq 'MSWin32') { $path = Encode::encode(locale_fs => $path);
utf8::downgrade($path);
} else {
utf8::encode($path);
}
return $path; return $path;
} }
@ -275,17 +273,15 @@ sub encode_path {
sub decode_path { sub decode_path {
my ($path) = @_; my ($path) = @_;
if ($^O eq 'MSWin32') { $path = Encode::decode(locale_fs => $path)
utf8::upgrade($path); unless utf8::is_utf8($path);
} else {
utf8::decode($path);
}
# The filesystem might force a normalization form (like HFS+ does) so # The filesystem might force a normalization form (like HFS+ does) so
# if we rely on the filename being comparable after the open() + readdir() # if we rely on the filename being comparable after the open() + readdir()
# roundtrip (like when creating and then selecting a preset), we need to # roundtrip (like when creating and then selecting a preset), we need to
# restore our normalization form. # restore our normalization form.
$path = Unicode::Normalize::NFC($path); $path = Unicode::Normalize::NFC($path);
return $path; return $path;
} }