Always open ZIP file in UTF-8.

This commit is contained in:
2017-05-15 13:13:35 +01:00
parent aa54dd929f
commit 6674640d2d

View File

@@ -1151,7 +1151,7 @@ namespace osrepodbmgr.Core
if(ZipFile.IsZipFile(Context.path)) if(ZipFile.IsZipFile(Context.path))
{ {
Context.unzipWithUnAr = true; Context.unzipWithUnAr = true;
ZipFile zf = ZipFile.Read(Context.path); ZipFile zf = ZipFile.Read(Context.path, new ReadOptions { Encoding = Encoding.UTF8 });
foreach(ZipEntry ze in zf) foreach(ZipEntry ze in zf)
{ {
// ZIP created with Mac OS X, need to be extracted with The UnArchiver to get correct ResourceFork structure // ZIP created with Mac OS X, need to be extracted with The UnArchiver to get correct ResourceFork structure
@@ -1219,7 +1219,7 @@ namespace osrepodbmgr.Core
{ {
try try
{ {
ZipFile zf = ZipFile.Read(Context.path); ZipFile zf = ZipFile.Read(Context.path, new ReadOptions { Encoding = Encoding.UTF8 });
zf.ExtractExistingFile = ExtractExistingFileAction.OverwriteSilently; zf.ExtractExistingFile = ExtractExistingFileAction.OverwriteSilently;
zf.ExtractProgress += Zf_ExtractProgress; zf.ExtractProgress += Zf_ExtractProgress;
zipCounter = 0; zipCounter = 0;