Merge pull request #1 from dmpas/develop

1.0.0

Author: dmpas

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.1.0-{build}
+version: 1.0.0-{build}
 before_build:
 - ps: nuget restore
 init:
@@ -7,19 +7,9 @@ init:
 - ps: Restart-Computer
 install:
 - cmd: >-
-    mkdir engine
+    choco install onescript.cli -source https://www.myget.org/F/onescript -y
 
-    cd engine
-
-    curl -o os.exe http://oscript.io/downloads/latest/exe
-
-    os.exe /silent
-
-    set PATH=%ProgramFiles(x86)%\OneScript\bin;%PATH%
-
-    cd ..
-
-    oscript -version
+    refreshenv
 
     opm install opm
 

oslib/packagedef

@@ -1,6 +1,6 @@
 Описание
 	.Имя("v8unpack")
-	.Версия("0.1.0")
+	.Версия("1.0.0")
 	.Автор("Sergey Batanov")
 	.АдресАвтора("sergey.batanov@dmpas.ru")
 	.Описание("Компонента работы с файлами формата 8")

v8unpack/File8Reader.cs

@@ -115,7 +115,7 @@ public void Extract(File8 element, string destDir, bool recursiveUnpack = false)
 
 			if (blockExtractor.IsContainer && recursiveUnpack)
 			{
-				string outputDirectory = Path.Combine(Path.GetFileName(destDir), element.Name);
+				string outputDirectory = Path.Combine(destDir, element.Name);
 				var tmpData = new MemoryStream(); // TODO: переделать MemoryStream --> FileStream
 				fileExtractor.CopyTo(tmpData);
 				tmpData.Seek(0, SeekOrigin.Begin);
@@ -127,7 +127,7 @@ public void Extract(File8 element, string destDir, bool recursiveUnpack = false)
 			}
 
 			// Просто файл
-			string outputFileName = Path.Combine(Path.GetFullPath(destDir), element.Name);
+			string outputFileName = Path.Combine(destDir, element.Name);
 			using (var outputFile = new FileStream(outputFileName, FileMode.Create))
 			{
 				fileExtractor.CopyTo(outputFile);