Merge remote-tracking branch 'origin/develop'

Author: dmpas

appveyor.yml

@@ -1,4 +1,5 @@
-version: 1.0.2-{build}
+image: Visual Studio 2017
+version: 1.0.3-{build}
 before_build:
 - ps: nuget restore
 init:

oslib/packagedef

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

v8unpack/File8Reader.cs

@@ -8,7 +8,7 @@ This Source Code Form is subject to the terms of the
 	Author:			disa_da
 	E-mail:			disa_da2@mail.ru
 /**
-	2014-2017       dmpas           sergey(dot)batanov(at)dmpas(dot)ru
+	2014-2018       dmpas           sergey(dot)batanov(at)dmpas(dot)ru
 */
 
 using System;
@@ -100,30 +100,39 @@ public void Extract(File8 element, string destDir, bool recursiveUnpack = false)
 				Directory.CreateDirectory(destDir);
 			}
 
-			_reader.Seek(element.DataOffset, SeekOrigin.Begin);
-
 			Stream fileExtractor;
-			var blockExtractor = new BlockReaderStream(_reader);
-			if (blockExtractor.IsPacked && _dataPacked)
+
+			if (element.DataOffset == FileFormat.V8_FF_SIGNATURE)
 			{
-				fileExtractor = new DeflateStream(blockExtractor, CompressionMode.Decompress);
+				// Файл есть, но пуст
+				fileExtractor = new MemoryStream();
 			}
 			else
 			{
-				fileExtractor = blockExtractor;
-			}
+				_reader.Seek(element.DataOffset, SeekOrigin.Begin);
 
-			if (blockExtractor.IsContainer && recursiveUnpack)
-			{
-				string outputDirectory = Path.Combine(destDir, element.Name);
-				var tmpData = new MemoryStream(); // TODO: переделать MemoryStream --> FileStream
-				fileExtractor.CopyTo(tmpData);
-				tmpData.Seek(0, SeekOrigin.Begin);
+				var blockExtractor = new BlockReaderStream(_reader);
+				if (blockExtractor.IsPacked && _dataPacked)
+				{
+					fileExtractor = new DeflateStream(blockExtractor, CompressionMode.Decompress);
+				}
+				else
+				{
+					fileExtractor = blockExtractor;
+				}
 
-				var internalContainer = new File8Reader(tmpData, dataPacked: false);
-				internalContainer.ExtractAll(outputDirectory, recursiveUnpack);
+				if (blockExtractor.IsContainer && recursiveUnpack)
+				{
+					string outputDirectory = Path.Combine(destDir, element.Name);
+					var tmpData = new MemoryStream(); // TODO: переделать MemoryStream --> FileStream
+					fileExtractor.CopyTo(tmpData);
+					tmpData.Seek(0, SeekOrigin.Begin);
 
-				return;
+					var internalContainer = new File8Reader(tmpData, dataPacked: false);
+					internalContainer.ExtractAll(outputDirectory, recursiveUnpack);
+
+					return;
+				}
 			}
 
 			// Просто файл

v8unpack/FileFormat/BlockReaderStream.cs

@@ -8,7 +8,7 @@ This Source Code Form is subject to the terms of the
 	Author:			disa_da
 	E-mail:			disa_da2@mail.ru
 /**
-	2014-2017       dmpas           sergey(dot)batanov(at)dmpas(dot)ru
+	2014-2018       dmpas           sergey(dot)batanov(at)dmpas(dot)ru
 */
 using System;
 using System.IO;
@@ -75,65 +75,23 @@ private void MoveNextBlock()
 			ReadPage();
 		}
 
-		public bool IsPacked
-		{
-			get
-			{
-				return _isPacked;
-			}
-		}
+		public bool IsPacked => _isPacked;
 
-		public bool IsContainer
-		{
-			get
-			{
-				return _isContainer;
-			}
-		}
+		public bool IsContainer => _isContainer;
 
-		public override bool CanRead
-		{
-			get
-			{
-				return true;
-			}
-		}
+		public override bool CanRead => true;
 
-		public override bool CanSeek
-		{
-			get
-			{
-				return false;
-			}
-		}
+		public override bool CanSeek => false;
 
-		public override bool CanWrite
-		{
-			get
-			{
-				return false;
-			}
-		}
+		public override bool CanWrite => false;
 
-		public override long Length
-		{
-			get
-			{
-				return _dataSize;
-			}
-		}
+		public override long Length => _dataSize;
 
 		public override long Position
 		{
-			get
-			{
-				throw new NotSupportedException();
-			}
+			get => throw new NotSupportedException();
 
-			set
-			{
-				throw new NotSupportedException();
-			}
+			set => throw new NotSupportedException();
 		}
 
 		public override void Flush()

v8unpack/v8unpack.csproj

@@ -29,7 +29,7 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ScriptEngine, Version=1.0.19.104, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="ScriptEngine, Version=1.0.19.105, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\packages\OneScript.1.0.19\lib\net452\ScriptEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />