Merge branch 'feature/fix-329' into develop

Author: EvilBeaver

src/ScriptEngine.HostedScript/Library/Zip/FileNamesEncodingInZipFile.cs

@@ -0,0 +1,22 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the 
+Mozilla Public License, v.2.0. If a copy of the MPL 
+was not distributed with this file, You can obtain one 
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+namespace ScriptEngine.HostedScript.Library.Zip
+{
+    [EnumerationType("КодировкаИменФайловВZipФайле","FileNamesEncodingInZipFile")]
+    public enum FileNamesEncodingInZipFile
+    {
+        [EnumItem("Авто")]
+        Auto,
+        
+        [EnumItem("UTF8")]
+        Utf8,
+        
+        [EnumItem("КодировкаОСДополнительноUTF8","OSEncodingWithUTF8")]
+        OsEncodingWithUtf8
+    }
+}

src/ScriptEngine.HostedScript/Library/Zip/ZipReader.cs

@@ -44,13 +44,22 @@ private void CheckIfOpened()
         /// <param name="filename">Имя ZIP файла, который требуется открыть для чтения.</param>
         /// <param name="password">Пароль к файлу, если он зашифрован.</param>
         [ContextMethod("Открыть","Open")]
-        public void Open(string filename, string password = null)
+        public void Open(string filename, string password = null, FileNamesEncodingInZipFile encoding = FileNamesEncodingInZipFile.Auto)
         {
+            ZipFile.DefaultEncoding = Encoding.GetEncoding(866);
             // fuck non-russian encodings on non-ascii files
-            _zip = ZipFile.Read(filename, new ReadOptions() { Encoding = Encoding.GetEncoding(866) });
+            _zip = ZipFile.Read(filename, new ReadOptions() { Encoding = ChooseEncoding(encoding) });
             _zip.Password = password;
         }
 
+        private Encoding ChooseEncoding(FileNamesEncodingInZipFile encoding)
+        {
+            if(encoding != FileNamesEncodingInZipFile.OsEncodingWithUtf8)
+                return Encoding.UTF8;
+
+            return null;
+        }
+
 
         /// <summary>
         /// Извлечение всех файлов из архива