First WinRT project

.gitignore

@@ -6,6 +6,3 @@ bin/
 *.user
 TestArchives/Scratch/
 TestArchives/Scratch2/
-TestResults/
-*.nupkg
-packages/*/

LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014  Adam Hathcock
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

NuGet/sharpcompress.nuspec

@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>sharpcompress</id>
-        <version>0.11.2</version>
-        <title>SharpCompress - Pure C# Decompression/Compression</title>
-        <authors>Adam Hathcock</authors>
-        <owners>Adam Hathcock</owners>
-        <licenseUrl>https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt</licenseUrl>
-        <projectUrl>https://github.com/adamhathcock/sharpcompress</projectUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>SharpCompress is a compression library for .NET/Mono/Silverlight/WP7/WindowsStore that can unrar, decompress 7zip, zip/unzip, tar/untar bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</description>
-        <releaseNotes />
-        <language>en-US</language>
-        <tags>rar unrar zip unzip bzip2 gzip tar 7zip</tags>
-        <dependencies>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="..\bin\Full\SharpCompress.dll" target="lib\net40\SharpCompress.dll" />
-        <file src="..\bin\WindowsStore\SharpCompress.dll" target="lib\netcore45\SharpCompress.dll" />
-        <file src="..\bin\Portable\SharpCompress.dll" target="lib\portable-net4+sl5+wp8+win8\SharpCompress.dll" />
-    </files>
+  <metadata>
+    <version>0.8.2</version>
+    <authors>Adam Hathcock</authors>
+    <owners>Adam Hathcock</owners>
+    <licenseUrl>http://sharpcompress.codeplex.com/license</licenseUrl>
+    <projectUrl>http://sharpcompress.codeplex.com/</projectUrl>
+    <id>sharpcompress</id>
+    <title>SharpCompress - Pure C# Decompression/Compression</title>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>SharpCompress is a compression library for .NET/Mono/Silverlight/WP7 that can unrar, decompress 7zip, zip/unzip, tar/untar bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</description>
+    <releaseNotes />
+    <language>en-US</language>
+    <tags>rar unrar zip unzip bzip2 gzip tar 7zip .net40 .net35 sl4</tags>
+  </metadata>
+  <files>
+    <file src="..\bin\SharpCompress.3.5.dll" target="lib\net35\SharpCompress.3.5.dll" />
+    <file src="..\bin\SharpCompress.dll" target="lib\net40\SharpCompress.dll" />
+    <file src="..\bin\SharpCompress.WP7.dll" target="lib\sl3-wp\SharpCompress.WP7.dll" />
+    <file src="..\bin\SharpCompress.Silverlight.dll" target="lib\sl50\SharpCompress.Silverlight.dll" />
+  </files>
 </package>

README.md

@@ -3,7 +3,7 @@ SharpCompress
 
 Github mirror of http://sharpcompress.codeplex.com
 
-SharpCompress is a compression library for .NET/Mono/Silverlight/WP7 that can unrar, un7zip, unzip, untar unbzip2 and ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip are implemented.
+SharpCompress is a compression library for .NET/Mono/Silverlight/WP7 that can unrar, un7zip, unzip, untar unbzip2 and ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.
 
 The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream). 
 
@@ -16,55 +16,9 @@ Want to contribute?
 I'm always looking for help or ideas. Please submit code or email with ideas. Unfortunately, just letting me know you'd like to help is not enough because I really have no overall plan of what needs to be done. I'll definitely accept code submissions and add you as a member of the project!
 
 TODOs (always lots):
-* RAR 5 support
 * 7Zip writing
+* RAR Decryption
 * Zip64
 * Multi-volume Zip support.
 
-Version 0.11.1:
-==============
-- Added Cancel on IReader
-- Removed .NET 2.0 support and LinqBridge dependency
-
-Version 0.11:
-==============
-- Been over a year, contains mainly fixes from contributors!  
-- Possible breaking change: ArchiveEncoding is UTF8 by default now.
-- TAR supports writing long names using longlink
-- RAR Protect Header added
-
-Version 0.10.3:
-==============
-- Finally fixed Disposal issue when creating a new archive with the Archive API
-
-Version 0.10.2:
-==============
-- Fixed Rar Header reading for invalid extended time headers.
-- Windows Store assembly is now strong named
-- Known issues with Long Tar names being worked on
-- Updated to VS2013
-	- Portable targets SL5 and Windows Phone 8 (up from SL4 and WP7)
-
-Version 0.10.1:
-==============
-- Fixed 7Zip extraction performance problem
-
-Version 0.10:
-==============
-- Added support for RAR Decryption (thanks to https://github.com/hrasyid)
-- Embedded some BouncyCastle crypto classes to allow RAR Decryption and Winzip AES Decryption in Portable and Windows Store DLLs
-- Built in Release (I think)
-
-Some Help/Discussion:
-https://sharpcompress.codeplex.com/discussions
-
-7Zip implementation based on: https://code.google.com/p/managed-lzma/
-
-LICENSE
-Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+7Zip implementation based on: https://code.google.com/p/managed-lzma/

SharpCompress.Test/ArchiveTests.cs

@@ -120,60 +120,11 @@ namespace SharpCompress.Test
         void archive_EntryExtractionBegin(object sender, ArchiveExtractionEventArgs<IArchiveEntry> e)
         {
             this.entryTotal = e.Item.Size;
-            Console.WriteLine("Initializing File Entry Extraction: " + e.Item.Key);
+            Console.WriteLine("Initializing File Entry Extraction: " + e.Item.FilePath);
         }
 
         private long? entryTotal;
         private long partTotal;
-        private long totalSize;
-
-        protected void ArchiveFileReadEx(string testArchive)
-        {
-            testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive);
-            ArchiveFileReadEx(testArchive.AsEnumerable());
-        }
-        
-        /// <summary>
-        /// Demonstrate the TotalUncompressSize property, and the ExtractOptions.PreserveFileTime and ExtractOptions.PreserveAttributes extract options
-        /// </summary>
-        protected void ArchiveFileReadEx(IEnumerable<string> testArchives)
-        {
-            foreach (var path in testArchives)
-            {
-                ResetScratch();
-                using (var archive = ArchiveFactory.Open(path))
-                {
-                    this.totalSize = archive.TotalUncompressSize;
-                    archive.EntryExtractionBegin += Archive_EntryExtractionBeginEx;
-                    archive.EntryExtractionEnd += Archive_EntryExtractionEndEx;
-                    archive.CompressedBytesRead += Archive_CompressedBytesReadEx;
-
-                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                    {
-                        entry.WriteToDirectory(SCRATCH_FILES_PATH,
-                                               ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite | ExtractOptions.PreserveFileTime | ExtractOptions.PreserveAttributes);
-                    }
-                }
-                VerifyFilesEx();
-            }
-        }
-
-        private void Archive_EntryExtractionEndEx(object sender, ArchiveExtractionEventArgs<IArchiveEntry> e)
-        {
-            this.partTotal += e.Item.Size;
-        }
-
-        private void Archive_CompressedBytesReadEx(object sender, CompressedBytesReadEventArgs e)
-        {
-            string percentage = this.entryTotal.HasValue ? this.CreatePercentage(e.CompressedBytesRead, this.entryTotal.Value).ToString() : "-";
-            string tortalPercentage = this.CreatePercentage(this.partTotal + e.CompressedBytesRead, this.totalSize).ToString();
-            Console.WriteLine(@"Read Compressed File Progress: {0}% Total Progress {1}%", percentage, tortalPercentage);
-        }
-
-        private void Archive_EntryExtractionBeginEx(object sender, ArchiveExtractionEventArgs<IArchiveEntry> e)
-        {
-            this.entryTotal = e.Item.Size;
-        }
 
         private int CreatePercentage(long n, long d)
         {

SharpCompress.Test/GZip/GZipArchiveTests.cs

@@ -23,7 +23,7 @@ namespace SharpCompress.Test
             using (var archive = ArchiveFactory.Open(stream))
             {
                 var entry = archive.Entries.First();
-                entry.WriteToFile(Path.Combine(SCRATCH_FILES_PATH, entry.Key));
+                entry.WriteToFile(Path.Combine(SCRATCH_FILES_PATH, entry.FilePath));
             }
             CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"),
                 Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
@@ -37,7 +37,7 @@ namespace SharpCompress.Test
             using (var archive = GZipArchive.Open(stream))
             {
                 var entry = archive.Entries.First();
-                entry.WriteToFile(Path.Combine(SCRATCH_FILES_PATH, entry.Key));
+                entry.WriteToFile(Path.Combine(SCRATCH_FILES_PATH, entry.FilePath));
             }
             CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"),
                 Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));

SharpCompress.Test/Rar/RarArchiveTests.cs

@@ -10,93 +10,17 @@ namespace SharpCompress.Test
     [TestClass]
     public class RarArchiveTests : ArchiveTests
     {
-        [TestMethod]
-        public void Rar_EncryptedFileAndHeader_Archive()
-        {
-            ReadRarPassword("Rar.encrypted_filesAndHeader.rar", "test");
-
-        }
-
-        [TestMethod]
-        public void Rar_EncryptedFileOnly_Archive()
-        {
-            ReadRarPassword("Rar.encrypted_filesOnly.rar", "test");
-
-        }
-
-        [TestMethod]
-        public void Rar_Encrypted_Archive()
-        {
-            ReadRarPassword("Encrypted.rar", "test");
-        }
-
-        private void ReadRarPassword(string testArchive, string password)
-        {
-            ResetScratch();
-            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, testArchive)))
-            using (var archive = RarArchive.Open(stream, Options.KeepStreamsOpen, password))
-            {
-                foreach (var entry in archive.Entries)
-                {
-                    if (!entry.IsDirectory)
-                    {
-                        Assert.AreEqual(entry.CompressionType, CompressionType.Rar);
-                        entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                    }
-                }
-            }
-            VerifyFiles();
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(InvalidFormatException))]
-        public void Rar_Multi_Archive_Encrypted()
-        {
-            ArchiveFileReadPassword("EncryptedParts.part01.rar", "test");
-        }
-
-        protected void ArchiveFileReadPassword(string archiveName, string password)
-        {
-            ResetScratch();
-            using (var archive = RarArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, archiveName), Options.None, password))
-            {
-                foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                {
-                    entry.WriteToDirectory(SCRATCH_FILES_PATH,
-                                            ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                }
-            }
-            VerifyFiles();
-        }
-
         [TestMethod]
         public void Rar_None_ArchiveStreamRead()
         {
             ArchiveStreamRead("Rar.none.rar");
         }
-
         [TestMethod]
         public void Rar_ArchiveStreamRead()
         {
             ArchiveStreamRead("Rar.rar");
         }
 
-        [TestMethod]
-        public void Rar_test_invalid_exttime_ArchiveStreamRead()
-        {
-            ResetScratch();
-            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "test_invalid_exttime.rar")))
-            {
-                using (var archive = ArchiveFactory.Open(stream))
-                {
-                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                    {
-                        entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                    }
-                }
-            }
-        }
-
         [TestMethod]
         public void Rar_Jpg_ArchiveStreamRead()
         {
@@ -123,7 +47,7 @@ namespace SharpCompress.Test
             {
                 using (var archive = RarArchive.Open(stream))
                 {
-                    Assert.IsFalse(archive.IsSolid);
+                    Assert.IsFalse(archive.IsSolidArchive());
                     foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
                     {
                         entry.WriteToDirectory(SCRATCH_FILES_PATH,
@@ -190,7 +114,7 @@ namespace SharpCompress.Test
             {
                 using (var archive = RarArchive.Open(stream))
                 {
-                    Assert.IsFalse(archive.IsSolid);
+                    Assert.IsFalse(archive.IsSolidArchive());
                     Assert.IsTrue(archive.Entries.Any(entry => entry.IsDirectory));
                 }
             }

SharpCompress.Test/Rar/RarHeaderFactoryTest.cs

@@ -1,60 +0,0 @@
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SharpCompress.Common;
-using SharpCompress.Common.Rar.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Test.Rar
-{
-    /// <summary>
-    /// Summary description for RarFactoryReaderTest
-    /// </summary>
-    [TestClass]
-    public class RarHeaderFactoryTest : TestBase
-    {
-        private RarHeaderFactory rarHeaderFactory;
-
-        [TestInitialize]
-        public void Initialize()
-        {
-            ResetScratch();
-            rarHeaderFactory = new RarHeaderFactory(StreamingMode.Seekable, Options.KeepStreamsOpen);
-        }
-
-
-        [TestMethod]
-        public void ReadHeaders_RecognizeEncryptedFlag()
-        {
-
-            ReadEncryptedFlag("Rar.Encrypted_filesAndHeader.rar", true);
-
-
-
-        }
-
-        private void ReadEncryptedFlag(string testArchive, bool isEncrypted)
-        {
-            using (var stream = GetReaderStream(testArchive))
-                foreach (var header in rarHeaderFactory.ReadHeaders(stream))
-                {
-                    if (header.HeaderType == HeaderType.ArchiveHeader)
-                    {
-                        Assert.AreEqual(isEncrypted, rarHeaderFactory.IsEncrypted);
-                        break;
-                    }
-                }
-        }
-
-        [TestMethod]
-        public void ReadHeaders_RecognizeNoEncryptedFlag()
-        {
-            ReadEncryptedFlag("Rar.rar", false);
-        }
-
-        private FileStream GetReaderStream(string testArchive)
-        {
-            return new FileStream(Path.Combine(TEST_ARCHIVES_PATH, testArchive),
-                                  FileMode.Open);
-        }
-    }
-}

SharpCompress.Test/Rar/RarReaderTests.cs

@@ -33,33 +33,10 @@ namespace SharpCompress.Test
             VerifyFiles();
         }
 
-        //[TestMethod]
-        public void Rar_Multi_Reader_Encrypted()
-        {
-            var testArchives = new string[] { "EncryptedParts.part01.rar",
-                "EncryptedParts.part02.rar",
-                "EncryptedParts.part03.rar",
-                "EncryptedParts.part04.rar",
-                "EncryptedParts.part05.rar",
-                "EncryptedParts.part06.rar"};
-
-
-            ResetScratch();
-            using (var reader = RarReader.Open(testArchives.Select(s => Path.Combine(TEST_ARCHIVES_PATH, s))
-                .Select(p => File.OpenRead(p))))
-            {
-                while (reader.MoveToNextEntry())
-                {
-                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                }
-            }
-            VerifyFiles();
-        }
-
         [TestMethod]
         public void Rar_Multi_Reader_Delete_Files()
         {
-            var testArchives = new string[] { "Rar.multi.part01.rar",
+           var testArchives = new string[] { "Rar.multi.part01.rar",
                 "Rar.multi.part02.rar",
                 "Rar.multi.part03.rar",
                 "Rar.multi.part04.rar",
@@ -67,30 +44,27 @@ namespace SharpCompress.Test
                 "Rar.multi.part06.rar"};
 
 
-            ResetScratch();
+           ResetScratch();
 
-            foreach (var file in testArchives)
-            {
-                File.Copy(Path.Combine(TEST_ARCHIVES_PATH, file), Path.Combine(SCRATCH2_FILES_PATH, file));
-            }
-            var streams = testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)).Select(File.OpenRead).ToList();
-            using (var reader = RarReader.Open(streams))
-            {
-                while (reader.MoveToNextEntry())
-                {
-                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                }
-            }
-            foreach (var stream in streams)
-            {
-                stream.Dispose();
-            }
-            VerifyFiles();
+           foreach (var file in testArchives)
+           {
+              File.Copy(Path.Combine(TEST_ARCHIVES_PATH, file), Path.Combine(SCRATCH2_FILES_PATH, file));
+           }
 
-            foreach (var file in testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)))
-            {
-                File.Delete(file);
-            }
+           using (var reader = RarReader.Open(testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s))
+               .Select(p => File.OpenRead(p)), Options.None))
+           {
+              while (reader.MoveToNextEntry())
+              {
+                 reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+              }
+           }
+           VerifyFiles();
+
+           foreach (var file in testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)))
+           {
+              File.Delete(file);
+           }
         }
 
         [TestMethod]
@@ -105,44 +79,6 @@ namespace SharpCompress.Test
             Read("Rar.rar", CompressionType.Rar);
         }
 
-        [TestMethod]
-        public void Rar_EncryptedFileAndHeader_Reader()
-        {
-            ReadRar("Rar.encrypted_filesAndHeader.rar", "test");
-
-        }
-
-        [TestMethod]
-        public void Rar_EncryptedFileOnly_Reader()
-        {
-            ReadRar("Rar.encrypted_filesOnly.rar", "test");
-
-        }
-
-        [TestMethod]
-        public void Rar_Encrypted_Reader()
-        {
-            ReadRar("Encrypted.rar", "test");
-        }
-
-        private void ReadRar(string testArchive, string password)
-        {
-            ResetScratch();
-            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, testArchive)))
-            using (var reader = RarReader.Open(stream, password))
-            {
-                while (reader.MoveToNextEntry())
-                {
-                    if (!reader.Entry.IsDirectory)
-                    {
-                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
-                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                    }
-                }
-            }
-            VerifyFiles();
-        }
-
         [TestMethod]
         public void Rar_Entry_Stream()
         {
@@ -157,8 +93,8 @@ namespace SharpCompress.Test
                         Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
                         using (var entryStream = reader.OpenEntryStream())
                         {
-                            string file = Path.GetFileName(reader.Entry.Key);
-                            string folder = Path.GetDirectoryName(reader.Entry.Key);
+                            string file = Path.GetFileName(reader.Entry.FilePath);
+                            string folder = Path.GetDirectoryName(reader.Entry.FilePath);
                             string destdir = Path.Combine(SCRATCH_FILES_PATH, folder);
                             if (!Directory.Exists(destdir))
                             {
@@ -225,7 +161,7 @@ namespace SharpCompress.Test
             {
                 while (reader.MoveToNextEntry())
                 {
-                    if (reader.Entry.Key.Contains("jpg"))
+                    if (reader.Entry.FilePath.Contains("jpg"))
                     {
                         Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
                         reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
@@ -243,7 +179,7 @@ namespace SharpCompress.Test
             {
                 while (reader.MoveToNextEntry())
                 {
-                    if (reader.Entry.Key.Contains("jpg"))
+                    if (reader.Entry.FilePath.Contains("jpg"))
                     {
                         Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
                         reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);

SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs

@@ -61,11 +61,6 @@ namespace SharpCompress.Test
             ArchiveFileRead("7Zip.BZip2.7z");
         }
 
-        [TestMethod]
-        public void SevenZipArchive_LZMA_Time_Attributes_PathRead()
-        {
-            ArchiveFileReadEx("7Zip.LZMA.7z");
-        }
 
         [TestMethod]
         [ExpectedException(typeof(IndexOutOfRangeException))]

SharpCompress.Test/SharpCompress.Test.Portable.csproj

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E9C3C94B-FB27-4B4F-B225-57513C254D37}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress.Test</RootNamespace>
-    <AssemblyName>SharpCompress.Test.Portable</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\DebugPortable\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\SharpCompress\SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ArchiveTests.cs" />
-    <Compile Include="GZip\GZipWriterTests.cs" />
-    <Compile Include="GZip\GZipArchiveTests.cs" />
-    <Compile Include="Rar\RarHeaderFactoryTest.cs" />
-    <Compile Include="SevenZip\SevenZipArchiveTests.cs" />
-    <Compile Include="Streams\StreamTests.cs" />
-    <Compile Include="Tar\TarWriterTests.cs" />
-    <Compile Include="Tar\TarReaderTests.cs" />
-    <Compile Include="Zip\ZipWriterTests.cs" />
-    <Compile Include="WriterTests.cs" />
-    <Compile Include="Rar\RarReaderTests.cs" />
-    <Compile Include="ReaderTests.cs" />
-    <Compile Include="Tar\TarArchiveTests.cs" />
-    <Compile Include="Zip\ZipArchiveTests.cs" />
-    <Compile Include="Rar\RarArchiveTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RewindableStreamTest.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="TestStream.cs" />
-    <Compile Include="Zip\ZipReaderTests.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="..\SharpCompress\SharpCompress.pfx">
-      <Link>SharpCompress.pfx</Link>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SharpCompress\SharpCompress.PortableTest.csproj">
-      <Project>{efdcaf57-fd4d-4e5d-a3d5-f26b875817ed}</Project>
-      <Name>SharpCompress.PortableTest</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress.Test/SharpCompress.Test.csproj

@@ -42,7 +42,7 @@
     </StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\SharpCompress\SharpCompress.pfx</AssemblyOriginatorKeyFile>
@@ -56,7 +56,6 @@
     <Compile Include="ArchiveTests.cs" />
     <Compile Include="GZip\GZipWriterTests.cs" />
     <Compile Include="GZip\GZipArchiveTests.cs" />
-    <Compile Include="Rar\RarHeaderFactoryTest.cs" />
     <Compile Include="SevenZip\SevenZipArchiveTests.cs" />
     <Compile Include="Streams\StreamTests.cs" />
     <Compile Include="Tar\TarWriterTests.cs" />
@@ -97,9 +96,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SharpCompress\SharpCompress.Unsigned.csproj">
-      <Project>{27d535cb-2fd3-4621-8c9a-46161fc77a5d}</Project>
-      <Name>SharpCompress.Unsigned</Name>
+    <ProjectReference Include="..\SharpCompress\SharpCompress.csproj">
+      <Project>{10A689CF-76A2-4A4F-96E4-553C33398438}</Project>
+      <Name>SharpCompress</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

SharpCompress.Test/Tar/TarArchiveTests.cs

@@ -30,71 +30,13 @@ namespace SharpCompress.Test
 
 
         [TestMethod]
-        public void Tar_NonUstarArchiveWithLongNameDoesNotSkipEntriesAfterTheLongOne()
+        public void TarArchivePathReadLongName()
         {
             string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar");
             using (var archive = TarArchive.Open(unmodified))
             {
-                Assert.AreEqual(5, archive.Entries.Count);
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "very long filename/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 1.txt"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 2.txt"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 3.txt"));
-            }
-        }
-
-        [TestMethod]
-        public void Tar_VeryLongFilepathReadback()
-        {
-            string archive = "Tar_VeryLongFilepathReadback.tar";
-
-            ResetScratch();
-
-            // create a very long filename
-            string longFilename = "";
-            for (int i = 0; i < 600; i = longFilename.Length)
-                longFilename += i.ToString("D10") + "-";
-            longFilename += ".txt";
-
-            // Step 1: create a tar file containing a file with a long name
-            using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH2_FILES_PATH, archive)))
-            using (var writer = SharpCompress.Writer.WriterFactory.Open(stream, ArchiveType.Tar, CompressionType.None))
-            using (Stream inputStream = new MemoryStream())
-            {
-                StreamWriter sw = new StreamWriter(inputStream);
-                sw.Write("dummy filecontent");
-                sw.Flush();
-
-                inputStream.Position = 0;
-                writer.Write(longFilename, inputStream, null);
-            }
-
-            // Step 2: check if the written tar file can be read correctly
-            string unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive);
-            using (var archive2 = TarArchive.Open(unmodified))
-            {
-                Assert.AreEqual(1, archive2.Entries.Count);
-                Assert.IsTrue(archive2.Entries.Any(entry => entry.Key == longFilename));
-
-                foreach (var entry in archive2.Entries)
-                    Assert.AreEqual("dummy filecontent", new StreamReader(entry.OpenEntryStream()).ReadLine());
-            }
-        }
-
-        [TestMethod]
-        public void Tar_UstarArchivePathReadLongName()
-        {
-            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "ustar with long names.tar");
-            using(var archive = TarArchive.Open(unmodified))
-            {
-                Assert.AreEqual(6, archive.Entries.Count);
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Some file with veeeeeeeeeery loooooooooong name"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/Some file with veeeeeeeeeery loooooooooong name"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/Directory with veeeeeeeeeery loooooooooong name/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/Directory with veeeeeeeeeery loooooooooong name/Some file with veeeeeeeeeery loooooooooong name"));
+                Assert.AreEqual(2, archive.Entries.Count);
+                Assert.AreEqual(archive.Entries.Last().FilePath, @"very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg");
             }
         }
 
@@ -139,7 +81,7 @@ namespace SharpCompress.Test
             base.ResetScratch();
             using (var archive = TarArchive.Open(unmodified))
             {
-                var entry = archive.Entries.Where(x => x.Key.EndsWith("jpg")).Single();
+                var entry = archive.Entries.Where(x => x.FilePath.EndsWith("jpg")).Single();
                 archive.RemoveEntry(entry);
                 archive.SaveTo(scratchPath, CompressionType.None);
             }

SharpCompress.Test/Tar/TarReaderTests.cs

@@ -46,8 +46,8 @@ namespace SharpCompress.Test
                         Assert.AreEqual(reader.Entry.CompressionType, CompressionType.BZip2);
                         using (var entryStream = reader.OpenEntryStream())
                         {
-                            string file = Path.GetFileName(reader.Entry.Key);
-                            string folder = Path.GetDirectoryName(reader.Entry.Key);
+                            string file = Path.GetFileName(reader.Entry.FilePath);
+                            string folder = Path.GetDirectoryName(reader.Entry.FilePath);
                             string destdir = Path.Combine(SCRATCH_FILES_PATH, folder);
                             if (!Directory.Exists(destdir))
                             {
@@ -81,7 +81,7 @@ namespace SharpCompress.Test
                         using (var entryStream = reader.OpenEntryStream())
                         {
                             entryStream.SkipEntry();
-                            names.Add(reader.Entry.Key);
+                            names.Add(reader.Entry.FilePath);
                         }
                     }
                 }

SharpCompress.Test/TestBase.cs

@@ -1,23 +1,21 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharpCompress.Common;
 using SharpCompress.Reader;
 
 namespace SharpCompress.Test
 {
-    [TestClass]
     public class TestBase
     {
-        protected static string SOLUTION_BASE_PATH=null;
-        protected static string TEST_ARCHIVES_PATH;
-        protected static string ORIGINAL_FILES_PATH;
-        protected static string MISC_TEST_FILES_PATH;
-        protected static string SCRATCH_FILES_PATH;
-        protected static string SCRATCH2_FILES_PATH;
+        protected const string TEST_BASE_PATH = @"C:\Git\sharpcompress";
+        protected static readonly string TEST_ARCHIVES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Archives");
+        protected static readonly string ORIGINAL_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Original");
+        protected static readonly string MISC_TEST_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "MiscTest");
+        protected static readonly string SCRATCH_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Scratch");
+        protected static readonly string SCRATCH2_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Scratch2");
+
         protected static IEnumerable<string> GetRarArchives()
         {
             yield return Path.Combine(TEST_ARCHIVES_PATH, "Rar.none.rar");
@@ -78,21 +76,6 @@ namespace SharpCompress.Test
             }
         }
 
-        /// <summary>
-        /// Verifies the files also check modified time and attributes.
-        /// </summary>
-        public void VerifyFilesEx()
-        {
-            if (UseExtensionInsteadOfNameToVerify)
-            {
-                VerifyFilesByExtensionEx();
-            }
-            else
-            {
-                VerifyFilesByNameEx();
-            }
-        }
-
         protected void VerifyFilesByName()
         {
             var extracted =
@@ -112,52 +95,6 @@ namespace SharpCompress.Test
             }
         }
 
-        /// <summary>
-        /// Verifies the files by name also check modified time and attributes.
-        /// </summary>
-        protected void VerifyFilesByNameEx()
-        {
-            var extracted =
-                Directory.EnumerateFiles(SCRATCH_FILES_PATH, "*.*", SearchOption.AllDirectories)
-                .ToLookup(path => path.Substring(SCRATCH_FILES_PATH.Length));
-            var original =
-                Directory.EnumerateFiles(ORIGINAL_FILES_PATH, "*.*", SearchOption.AllDirectories)
-                .ToLookup(path => path.Substring(ORIGINAL_FILES_PATH.Length));
-
-            Assert.AreEqual(extracted.Count, original.Count);
-
-            foreach (var orig in original)
-            {
-                Assert.IsTrue(extracted.Contains(orig.Key));
-
-                CompareFilesByPath(orig.Single(), extracted[orig.Key].Single());
-                CompareFilesByTimeAndAttribut(orig.Single(), extracted[orig.Key].Single());
-            }
-        }
-
-        /// <summary>
-        /// Verifies the files by extension also check modified time and attributes.
-        /// </summary>
-        protected void VerifyFilesByExtensionEx()
-        {
-            var extracted =
-                Directory.EnumerateFiles(SCRATCH_FILES_PATH, "*.*", SearchOption.AllDirectories)
-                .ToLookup(path => Path.GetExtension(path));
-            var original =
-                Directory.EnumerateFiles(ORIGINAL_FILES_PATH, "*.*", SearchOption.AllDirectories)
-                .ToLookup(path => Path.GetExtension(path));
-
-            Assert.AreEqual(extracted.Count, original.Count);
-
-            foreach (var orig in original)
-            {
-                Assert.IsTrue(extracted.Contains(orig.Key));
-
-                CompareFilesByPath(orig.Single(), extracted[orig.Key].Single());
-                CompareFilesByTimeAndAttribut(orig.Single(), extracted[orig.Key].Single());
-            }
-        }
-
         protected bool UseExtensionInsteadOfNameToVerify { get; set; }
 
         protected void VerifyFilesByExtension()
@@ -185,27 +122,18 @@ namespace SharpCompress.Test
             using (var file2Stream = File.OpenRead(file2))
             {
                 Assert.AreEqual(file1Stream.Length, file2Stream.Length);
+
                 int byte1 = 0;
                 int byte2 = 0;
-                for (int counter = 0; byte1 != -1; counter++)
+                while (byte1 != -1)
                 {
                     byte1 = file1Stream.ReadByte();
                     byte2 = file2Stream.ReadByte();
-                    if (byte1 != byte2)
-                        Assert.AreEqual(byte1, byte2, string.Format("Byte {0} differ between {1} and {2}",
-                            counter, file1, file2));
+                    Assert.AreEqual(byte1, byte2);
                 }
             }
         }
 
-        protected void CompareFilesByTimeAndAttribut(string file1, string file2)
-        {
-            FileInfo fi1 = new FileInfo(file1);
-            FileInfo fi2 = new FileInfo(file2);
-            Assert.AreNotEqual(fi1.LastWriteTime, fi2.LastWriteTime);
-            Assert.AreEqual(fi1.Attributes, fi2.Attributes);
-        }
-
         protected void CompareArchivesByPath(string file1, string file2)
         {
             using (var archive1 = ReaderFactory.Open(File.OpenRead(file1), Options.None))
@@ -214,23 +142,10 @@ namespace SharpCompress.Test
                 while (archive1.MoveToNextEntry())
                 {
                     Assert.IsTrue(archive2.MoveToNextEntry());
-                    Assert.AreEqual(archive1.Entry.Key, archive2.Entry.Key);
+                    Assert.AreEqual(archive1.Entry.FilePath, archive2.Entry.FilePath);
                 }
                 Assert.IsFalse(archive2.MoveToNextEntry());
             }
         }
-
-        private static readonly object testLock = new object();
-
-        [AssemblyInitialize]
-        public static void InitializePaths(TestContext ctx)
-        {
-            SOLUTION_BASE_PATH = Path.GetDirectoryName(Path.GetDirectoryName(ctx.TestDir));
-            TEST_ARCHIVES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Archives");
-            ORIGINAL_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Original");
-            MISC_TEST_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "MiscTest");
-            SCRATCH_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Scratch");
-            SCRATCH2_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Scratch2");
-        }
     }
 }

SharpCompress.Test/Zip/ZipArchiveTests.cs

@@ -1,8 +1,6 @@
 
-using System;
 using System.IO;
 using System.Linq;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharpCompress.Archive;
 using SharpCompress.Archive.Zip;
@@ -140,7 +138,26 @@ namespace SharpCompress.Test
             base.ResetScratch();
             using (var archive = ZipArchive.Open(unmodified))
             {
-                var entry = archive.Entries.Single(x => x.Key.EndsWith("jpg"));
+                var entry = archive.Entries.Where(x => x.FilePath.EndsWith("jpg")).Single();
+                archive.RemoveEntry(entry);
+                archive.SaveTo(scratchPath, CompressionType.Deflate);
+            }
+            CompareArchivesByPath(modified, scratchPath);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(ArchiveException))]
+        public void Zip_Random_Write_Remove_Fail()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
+            string modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip");
+
+            base.ResetScratch();
+            using (var stream = File.OpenRead(unmodified))
+            using (var archive = ZipArchive.Open(stream))
+            {
+                var entry = archive.Entries.Where(x => x.FilePath.EndsWith("jpg")).Single();
                 archive.RemoveEntry(entry);
                 archive.SaveTo(scratchPath, CompressionType.Deflate);
             }
@@ -164,133 +181,19 @@ namespace SharpCompress.Test
             CompareArchivesByPath(modified, scratchPath);
         }
 
-        [TestMethod]
-        public void Zip_Save_Twice()
-        {
-            string scratchPath1 = Path.Combine(SCRATCH_FILES_PATH, "a.zip");
-            string scratchPath2 = Path.Combine(SCRATCH_FILES_PATH, "b.zip");
-
-            ResetScratch();
-            using (var arc = ZipArchive.Create())
-            {
-                string str = "test.txt";
-                var source = new MemoryStream(Encoding.UTF8.GetBytes(str));
-                arc.AddEntry("test.txt", source, true, source.Length);
-                arc.SaveTo(scratchPath1, CompressionType.Deflate);
-                arc.SaveTo(scratchPath2, CompressionType.Deflate);
-            }
-
-            Assert.AreEqual(new FileInfo(scratchPath1).Length, new FileInfo(scratchPath2).Length);
-        }
-
-        [TestMethod]
-        public void Zip_Removal_Poly()
-        {
-            ResetScratch();
-
-            string scratchPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
-
-
-
-            using (ZipArchive vfs = (ZipArchive)ArchiveFactory.Open(scratchPath))
-            {
-                var e = vfs.Entries.First(v => v.Key.EndsWith("jpg"));
-                vfs.RemoveEntry(e);
-                Assert.IsNull(vfs.Entries.FirstOrDefault(v => v.Key.EndsWith("jpg")));
-                Assert.IsNull(((IArchive)vfs).Entries.FirstOrDefault(v => v.Key.EndsWith("jpg")));
-            }
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(ArchiveException))]
-        public void Zip_Create_NoDups()
-        {
-            using (var arc = ZipArchive.Create())
-            {
-                arc.AddEntry("1.txt", new MemoryStream());
-                arc.AddEntry("\\1.txt", new MemoryStream());
-            }
-        }
-
-        [TestMethod]
-        public void Zip_Create_Same_Stream()
-        {
-            string scratchPath1 = Path.Combine(SCRATCH_FILES_PATH, "a.zip");
-            string scratchPath2 = Path.Combine(SCRATCH_FILES_PATH, "b.zip");
-
-            using (var arc = ZipArchive.Create())
-            {
-                using (var stream = new MemoryStream(Encoding.UTF8.GetBytes("qwert")))
-                {
-                    arc.AddEntry("1.txt", stream, false, stream.Length);
-                    arc.AddEntry("2.txt", stream, false, stream.Length);
-                    arc.SaveTo(scratchPath1, CompressionType.Deflate);
-                    arc.SaveTo(scratchPath2, CompressionType.Deflate);
-                }
-            }
-
-            Assert.AreEqual(new FileInfo(scratchPath1).Length, new FileInfo(scratchPath2).Length);
-        }
-
         [TestMethod]
         public void Zip_Create_New()
         {
-            base.ResetScratch();
-            foreach (var file in Directory.EnumerateFiles(ORIGINAL_FILES_PATH, "*.*", SearchOption.AllDirectories))
-            {
-                var newFileName = file.Substring(ORIGINAL_FILES_PATH.Length);
-                if (newFileName.StartsWith(Path.DirectorySeparatorChar.ToString()))
-                {
-                    newFileName = newFileName.Substring(1);
-                }
-                newFileName = Path.Combine(SCRATCH_FILES_PATH, newFileName);
-                var newDir = Path.GetDirectoryName(newFileName);
-                if (!Directory.Exists(newDir))
-                {
-                    Directory.CreateDirectory(newDir);
-                }
-                File.Copy(file, newFileName);
-            }
-            string scratchPath = Path.Combine(SCRATCH2_FILES_PATH, "Zip.deflate.noEmptyDirs.zip");
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.noEmptyDirs.zip");
             string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
 
+            base.ResetScratch();
             using (var archive = ZipArchive.Create())
             {
-                archive.AddAllFromDirectory(SCRATCH_FILES_PATH);
+                archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);
                 archive.SaveTo(scratchPath, CompressionType.Deflate);
             }
             CompareArchivesByPath(unmodified, scratchPath);
-            Directory.Delete(SCRATCH_FILES_PATH, true);
-        }
-
-        [TestMethod]
-        public void Zip_Create_New_Add_Remove()
-        {
-            base.ResetScratch();
-            foreach (var file in Directory.EnumerateFiles(ORIGINAL_FILES_PATH, "*.*", SearchOption.AllDirectories))
-            {
-                var newFileName = file.Substring(ORIGINAL_FILES_PATH.Length);
-                if (newFileName.StartsWith(Path.DirectorySeparatorChar.ToString()))
-                {
-                    newFileName = newFileName.Substring(1);
-                }
-                newFileName = Path.Combine(SCRATCH_FILES_PATH, newFileName);
-                var newDir = Path.GetDirectoryName(newFileName);
-                if (!Directory.Exists(newDir))
-                {
-                    Directory.CreateDirectory(newDir);
-                }
-                File.Copy(file, newFileName);
-            }
-            string scratchPath = Path.Combine(SCRATCH2_FILES_PATH, "Zip.deflate.noEmptyDirs.zip");
-
-            using (var archive = ZipArchive.Create())
-            {
-                archive.AddAllFromDirectory(SCRATCH_FILES_PATH);
-                archive.RemoveEntry(archive.Entries.Single(x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)));
-                Assert.IsFalse(archive.Entries.Any(x => x.Key.EndsWith("jpg")));
-            }
-            Directory.Delete(SCRATCH_FILES_PATH, true);
         }
 
         [TestMethod]
@@ -389,7 +292,7 @@ namespace SharpCompress.Test
 
             using (var zipArchive = ZipArchive.Open(stream))
             {
-                foreach (var entry in zipArchive.Entries)
+                foreach(var entry in zipArchive.Entries)
                 {
                     using (var entryStream = entry.OpenEntryStream())
                     {

SharpCompress.sln

@@ -1,15 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet\sharpcompress.nuspec = NuGet\sharpcompress.nuspec
-	EndProjectSection
-EndProject
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress", "SharpCompress\SharpCompress.csproj", "{10A689CF-76A2-4A4F-96E4-553C33398438}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test", "SharpCompress.Test\SharpCompress.Test.csproj", "{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}"
@@ -18,54 +9,84 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Portable", "S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.WindowsStore", "SharpCompress\SharpCompress.WindowsStore.csproj", "{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.PortableTest", "SharpCompress\SharpCompress.PortableTest.csproj", "{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test.Portable", "SharpCompress.Test\SharpCompress.Test.Portable.csproj", "{E9C3C94B-FB27-4B4F-B225-57513C254D37}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Unsigned", "SharpCompress\SharpCompress.Unsigned.csproj", "{27D535CB-2FD3-4621-8C9A-46161FC77A5D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.WinRT", "SharpCompress\SharpCompress.WinRT.csproj", "{90F0D086-689E-470D-A72C-2FA01779FF90}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|ARM.ActiveCfg = Release|Any CPU
+		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|x64.ActiveCfg = Release|Any CPU
+		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|x86.ActiveCfg = Release|Any CPU
 		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|x64.ActiveCfg = Release|Any CPU
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|x86.ActiveCfg = Release|Any CPU
 		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|x64.ActiveCfg = Release|Any CPU
+		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|x86.ActiveCfg = Release|Any CPU
 		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|ARM.ActiveCfg = Debug|ARM
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|ARM.Build.0 = Debug|ARM
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x64.ActiveCfg = Debug|x64
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x64.Build.0 = Debug|x64
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x86.ActiveCfg = Debug|x86
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x86.Build.0 = Debug|x86
 		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|ARM.ActiveCfg = Release|ARM
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|ARM.Build.0 = Release|ARM
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x64.ActiveCfg = Release|x64
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x64.Build.0 = Release|x64
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x86.ActiveCfg = Release|x86
+		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x86.Build.0 = Release|x86
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|ARM.ActiveCfg = Debug|ARM
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|ARM.Build.0 = Debug|ARM
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|x64.ActiveCfg = Debug|x64
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|x64.Build.0 = Debug|x64
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|x86.ActiveCfg = Debug|x86
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Debug|x86.Build.0 = Debug|x86
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|ARM.ActiveCfg = Release|ARM
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|ARM.Build.0 = Release|ARM
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|x64.ActiveCfg = Release|x64
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|x64.Build.0 = Release|x64
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|x86.ActiveCfg = Release|x86
+		{90F0D086-689E-470D-A72C-2FA01779FF90}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-	EndGlobalSection
 EndGlobal

SharpCompress.sln.DotSettings

@@ -1,6 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=181069325DAB1C4287CD564D6CDDEDB3/AbsolutePath/@EntryValue">D:\Git\sharpcompress\SharpCompress\sharpcompress.DotSettings</s:String>
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=181069325DAB1C4287CD564D6CDDEDB3/RelativePath/@EntryValue">..\SharpCompress\sharpcompress.DotSettings</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=181069325DAB1C4287CD564D6CDDEDB3/@KeyIndexDefined">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File181069325DAB1C4287CD564D6CDDEDB3/@KeyIndexDefined">True</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File181069325DAB1C4287CD564D6CDDEDB3/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>

SharpCompress/Archive/AbstractArchive.cs

@@ -7,7 +7,7 @@ using SharpCompress.Reader;
 
 namespace SharpCompress.Archive
 {
-    public abstract class AbstractArchive<TEntry, TVolume> : IArchive, IArchiveExtractionListener
+    public abstract class AbstractArchive<TEntry, TVolume> : IArchive, IStreamListener
         where TEntry : IArchiveEntry
         where TVolume : IVolume
     {
@@ -20,13 +20,10 @@ namespace SharpCompress.Archive
         public event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
         public event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
 
-        protected string Password { get; private set; }
-
 #if !PORTABLE && !NETFX_CORE
-        internal AbstractArchive(ArchiveType type, FileInfo fileInfo, Options options, string password)
+        internal AbstractArchive(ArchiveType type, FileInfo fileInfo, Options options)
         {
-            Type = type;
-            Password = password;
+            this.Type = type;
             if (!fileInfo.Exists)
             {
                 throw new ArgumentException("File does not exist: " + fileInfo.FullName);
@@ -40,23 +37,22 @@ namespace SharpCompress.Archive
         protected abstract IEnumerable<TVolume> LoadVolumes(FileInfo file, Options options);
 #endif
 
-        internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, Options options, string password)
+        internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, Options options)
         {
-            Type = type;
-            Password = password;
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams), options));
+            this.Type = type;
+            lazyVolumes =
+                new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select<Stream, Stream>(CheckStreams), options));
             lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
         }
 
         internal AbstractArchive(ArchiveType type)
         {
-            Type = type;
+            this.Type = type;
             lazyVolumes = new LazyReadOnlyCollection<TVolume>(Enumerable.Empty<TVolume>());
             lazyEntries = new LazyReadOnlyCollection<TEntry>(Enumerable.Empty<TEntry>());
         }
-        public ArchiveType Type { get; private set; }
 
-        void IArchiveExtractionListener.FireEntryExtractionBegin(IArchiveEntry entry)
+        internal void FireEntryExtractionBegin(IArchiveEntry entry)
         {
             if (EntryExtractionBegin != null)
             {
@@ -64,7 +60,7 @@ namespace SharpCompress.Archive
             }
         }
 
-        void IArchiveExtractionListener.FireEntryExtractionEnd(IArchiveEntry entry)
+        internal void FireEntryExtractionEnd(IArchiveEntry entry)
         {
             if (EntryExtractionEnd != null)
             {
@@ -84,6 +80,7 @@ namespace SharpCompress.Archive
         /// <summary>
         /// Returns an ReadOnlyCollection of all the RarArchiveEntries across the one or many parts of the RarArchive.
         /// </summary>
+        /// <returns></returns>
         public virtual ICollection<TEntry> Entries
         {
             get { return lazyEntries; }
@@ -92,6 +89,7 @@ namespace SharpCompress.Archive
         /// <summary>
         /// Returns an ReadOnlyCollection of all the RarArchiveVolumes across the one or many parts of the RarArchive.
         /// </summary>
+        /// <returns></returns>
         public ICollection<TVolume> Volumes
         {
             get { return lazyVolumes; }
@@ -100,25 +98,17 @@ namespace SharpCompress.Archive
         /// <summary>
         /// The total size of the files compressed in the archive.
         /// </summary>
-        public virtual long TotalSize
+        public long TotalSize
         {
             get { return Entries.Aggregate(0L, (total, cf) => total + cf.CompressedSize); }
         }
 
-        /// <summary>
-        /// The total size of the files as uncompressed in the archive.
-        /// </summary>
-        public virtual long TotalUncompressSize
-        {
-            get { return Entries.Aggregate(0L, (total, cf) => total + cf.Size); }
-        }
-
         protected abstract IEnumerable<TVolume> LoadVolumes(IEnumerable<Stream> streams, Options options);
         protected abstract IEnumerable<TEntry> LoadEntries(IEnumerable<TVolume> volumes);
 
         IEnumerable<IArchiveEntry> IArchive.Entries
         {
-            get { return Entries.Cast<IArchiveEntry>(); }
+            get { return lazyEntries.Cast<IArchiveEntry>(); }
         }
 
         IEnumerable<IVolume> IArchive.Volumes
@@ -128,7 +118,7 @@ namespace SharpCompress.Archive
 
         private bool disposed;
 
-        public virtual void Dispose()
+        public void Dispose()
         {
             if (!disposed)
             {
@@ -138,13 +128,16 @@ namespace SharpCompress.Archive
             }
         }
 
-        void IArchiveExtractionListener.EnsureEntriesLoaded()
+        internal void EnsureEntriesLoaded()
         {
             lazyEntries.EnsureFullyLoaded();
             lazyVolumes.EnsureFullyLoaded();
         }
 
-        void IExtractionListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
+
+        public ArchiveType Type { get; private set; }
+
+        void IStreamListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
         {
             if (CompressedBytesRead != null)
             {
@@ -156,7 +149,7 @@ namespace SharpCompress.Archive
             }
         }
 
-        void IExtractionListener.FireFilePartExtractionBegin(string name, long size, long compressedSize)
+        void IStreamListener.FireFilePartExtractionBegin(string name, long size, long compressedSize)
         {
             if (FilePartExtractionBegin != null)
             {
@@ -182,7 +175,7 @@ namespace SharpCompress.Archive
         /// <returns></returns>
         public IReader ExtractAllEntries()
         {
-            ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
+            EnsureEntriesLoaded();
             return CreateReaderForSolidExtraction();
         }
 
@@ -204,7 +197,7 @@ namespace SharpCompress.Archive
         {
             get
             {
-                ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
+                EnsureEntriesLoaded();
                 return Entries.All(x => x.IsComplete);
             }
         }

SharpCompress/Archive/AbstractWritableArchive.Extensions.cs

@@ -1,84 +1,85 @@
-using System;
-using System.IO;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public static class IWritableArchiveExtensions
-    {
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   Stream stream, CompressionType compressionType)
-        {
-            writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
-        }
-
-#if !PORTABLE && !NETFX_CORE
-
-        public static void AddEntry(this IWritableArchive writableArchive,
-                                                     string entryPath, string filePath)
-        {
-            var fileInfo = new FileInfo(filePath);
-            if (!fileInfo.Exists)
-            {
-                throw new FileNotFoundException("Could not AddEntry: " + filePath);
-            }
-            writableArchive.AddEntry(entryPath, new FileInfo(filePath).OpenRead(), true, fileInfo.Length,
-                                     fileInfo.LastWriteTime);
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   string filePath, CompressionType compressionType)
-        {
-            writableArchive.SaveTo(new FileInfo(filePath), new CompressionInfo {Type = compressionType});
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   FileInfo fileInfo, CompressionType compressionType)
-        {
-            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
-            {
-                writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
-            }
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   string filePath, CompressionInfo compressionInfo)
-        {
-            writableArchive.SaveTo(new FileInfo(filePath), compressionInfo);
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   FileInfo fileInfo, CompressionInfo compressionInfo)
-        {
-            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
-            {
-                writableArchive.SaveTo(stream, compressionInfo);
-            }
-        }
-
-        public static void AddAllFromDirectory(
-            this IWritableArchive writableArchive,
-            string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
-        {
-#if NET2
-            foreach (var path in Directory.GetFiles(filePath, searchPattern, searchOption))
-#else
-            foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))
-#endif
-            {
-                var fileInfo = new FileInfo(path);
-                writableArchive.AddEntry(path.Substring(filePath.Length), fileInfo.OpenRead(), true, fileInfo.Length,
-                                         fileInfo.LastWriteTime);
-            }
-        }
-        public static IArchiveEntry AddEntry(this IWritableArchive writableArchive, string key, FileInfo fileInfo)
-        {
-            if (!fileInfo.Exists)
-            {
-                throw new ArgumentException("FileInfo does not exist.");
-            }
-            return writableArchive.AddEntry(key, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
-        }
-#endif
-    }
+using System.IO;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public static class AbstractWritableArchiveExtensions
+    {
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   Stream stream, CompressionType compressionType)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
+        }
+
+#if !PORTABLE && !NETFX_CORE
+
+        public static void AddEntry<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                     string entryPath, string filePath)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            var fileInfo = new FileInfo(filePath);
+            if (!fileInfo.Exists)
+            {
+                throw new FileNotFoundException("Could not AddEntry: " + filePath);
+            }
+            writableArchive.AddEntry(entryPath, new FileInfo(filePath).OpenRead(), true, fileInfo.Length,
+                                     fileInfo.LastWriteTime);
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   string filePath, CompressionType compressionType)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            writableArchive.SaveTo(new FileInfo(filePath), new CompressionInfo {Type = compressionType});
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   FileInfo fileInfo, CompressionType compressionType)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+            {
+                writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
+            }
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   string filePath, CompressionInfo compressionInfo)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            writableArchive.SaveTo(new FileInfo(filePath), compressionInfo);
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   FileInfo fileInfo, CompressionInfo compressionInfo)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+            {
+                writableArchive.SaveTo(stream, compressionInfo);
+            }
+        }
+
+        public static void AddAllFromDirectory<TEntry, TVolume>(
+            this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+            string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))
+            {
+                var fileInfo = new FileInfo(path);
+                writableArchive.AddEntry(path.Substring(filePath.Length), fileInfo.OpenRead(), true, fileInfo.Length,
+                                         fileInfo.LastWriteTime);
+            }
+        }
+#endif
+    }
 }

SharpCompress/Archive/AbstractWritableArchive.cs

@@ -6,7 +6,7 @@ using SharpCompress.Common;
 
 namespace SharpCompress.Archive
 {
-    public abstract class AbstractWritableArchive<TEntry, TVolume> : AbstractArchive<TEntry, TVolume>, IWritableArchive
+    public abstract class AbstractWritableArchive<TEntry, TVolume> : AbstractArchive<TEntry, TVolume>
         where TEntry : IArchiveEntry
         where TVolume : IVolume
     {
@@ -15,24 +15,37 @@ namespace SharpCompress.Archive
 
         private readonly List<TEntry> modifiedEntries = new List<TEntry>();
         private bool hasModifications;
+        private readonly bool anyNotWritable;
 
         internal AbstractWritableArchive(ArchiveType type)
             : base(type)
         {
         }
 
-        internal AbstractWritableArchive(ArchiveType type, Stream stream, Options options)
-            : base(type, stream.AsEnumerable(), options, null)
+        internal AbstractWritableArchive(ArchiveType type, IEnumerable<Stream> streams, Options options)
+            : base(type, streams, options)
         {
+            if (streams.Any(x => !x.CanWrite))
+            {
+                anyNotWritable = true;
+            }
         }
 
 #if !PORTABLE && !NETFX_CORE
         internal AbstractWritableArchive(ArchiveType type, FileInfo fileInfo, Options options)
-            : base(type, fileInfo, options, null)
+            : base(type, fileInfo, options)
         {
         }
 #endif
 
+        private void CheckWritable()
+        {
+            if (anyNotWritable)
+            {
+                throw new ArchiveException("All Archive streams must be Writable to use Archive writing functionality.");
+            }
+        }
+
         public override ICollection<TEntry> Entries
         {
             get
@@ -48,7 +61,6 @@ namespace SharpCompress.Archive
         private void RebuildModifiedCollection()
         {
             hasModifications = true;
-            newEntries.RemoveAll(v => removedEntries.Contains(v));
             modifiedEntries.Clear();
             modifiedEntries.AddRange(OldEntries.Concat(newEntries));
         }
@@ -60,90 +72,50 @@ namespace SharpCompress.Archive
 
         public void RemoveEntry(TEntry entry)
         {
+            CheckWritable();
             if (!removedEntries.Contains(entry))
             {
                 removedEntries.Add(entry);
                 RebuildModifiedCollection();
             }
         }
-        void IWritableArchive.RemoveEntry(IArchiveEntry entry)
-        {
-            RemoveEntry((TEntry)entry);
-        }
 
-        public TEntry AddEntry(string key, Stream source,
+        public void AddEntry(string filePath, Stream source,
                              long size = 0, DateTime? modified = null)
         {
-            return AddEntry(key, source, false, size, modified);
-        }
-
-
-        IArchiveEntry IWritableArchive.AddEntry(string key, Stream source, bool closeStream, long size, DateTime? modified)
-        {
-            return AddEntry(key, source, closeStream, size, modified);
-        }
-
-        public TEntry AddEntry(string key, Stream source, bool closeStream,
-                             long size = 0, DateTime? modified = null)
-        {
-            if (key.StartsWith("/")
-                || key.StartsWith("\\"))
-            {
-                key = key.Substring(1);
-            }
-            if (DoesKeyMatchExisting(key))
-            {
-                throw new ArchiveException("Cannot add entry with duplicate key: " + key);
-            }
-            var entry = CreateEntry(key, source, size, modified, closeStream);
-            newEntries.Add(entry);
+            CheckWritable();
+            newEntries.Add(CreateEntry(filePath, source, size, modified, false));
             RebuildModifiedCollection();
-            return entry;
         }
 
-        private bool DoesKeyMatchExisting(string key)
+        public void AddEntry(string filePath, Stream source, bool closeStream,
+                             long size = 0, DateTime? modified = null)
         {
-            foreach (var path in Entries.Select(x => x.Key))
-            {
-                var p = path.Replace('/','\\');
-                if (p.StartsWith("\\"))
-                {
-                    p = p.Substring(1);
-                }
-                return string.Equals(p, key, StringComparison.OrdinalIgnoreCase);
-            }
-            return false;
+            CheckWritable();
+            newEntries.Add(CreateEntry(filePath, source, size, modified, closeStream));
+            RebuildModifiedCollection();
         }
 
+#if !PORTABLE && !NETFX_CORE
+        public void AddEntry(string filePath, FileInfo fileInfo)
+        {
+            if (!fileInfo.Exists)
+            {
+                throw new ArgumentException("FileInfo does not exist.");
+            }
+            AddEntry(filePath, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
+        }
+#endif
+
         public void SaveTo(Stream stream, CompressionInfo compressionType)
         {
-            //reset streams of new entries
-            newEntries.Cast<IWritableArchiveEntry>().ForEach(x => x.Stream.Seek(0, SeekOrigin.Begin));
             SaveTo(stream, compressionType, OldEntries, newEntries);
         }
 
-        protected TEntry CreateEntry(string key, Stream source, long size, DateTime? modified,
-            bool closeStream)
-        {
-            if (!source.CanRead || !source.CanSeek)
-            {
-                throw new ArgumentException("Streams must be readable and seekable to use the Writing Archive API");
-            }
-            return CreateEntryInternal(key, source, size, modified, closeStream);
-        }
-
-        protected abstract TEntry CreateEntryInternal(string key, Stream source, long size, DateTime? modified,
+        protected abstract TEntry CreateEntry(string filePath, Stream source, long size, DateTime? modified,
                                               bool closeStream);
 
         protected abstract void SaveTo(Stream stream, CompressionInfo compressionType,
                                        IEnumerable<TEntry> oldEntries, IEnumerable<TEntry> newEntries);
-
-        public override void Dispose()
-        {
-            base.Dispose();
-            newEntries.Cast<Entry>().ForEach(x => x.Close());
-            removedEntries.Cast<Entry>().ForEach(x => x.Close());
-            modifiedEntries.Cast<Entry>().ForEach(x => x.Close());
-        }
     }
 }

SharpCompress/Archive/ArchiveFactory.cs

@@ -31,6 +31,12 @@ namespace SharpCompress.Archive
                 return ZipArchive.Open(stream, options, null);
             }
             stream.Seek(0, SeekOrigin.Begin);
+            if (RarArchive.IsRarFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return RarArchive.Open(stream, options);
+            }
+            stream.Seek(0, SeekOrigin.Begin);
             if (TarArchive.IsTarFile(stream))
             {
                 stream.Seek(0, SeekOrigin.Begin);
@@ -48,16 +54,10 @@ namespace SharpCompress.Archive
                 stream.Seek(0, SeekOrigin.Begin);
                 return GZipArchive.Open(stream, options);
             }
-            stream.Seek(0, SeekOrigin.Begin);
-            if(RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
-            {
-               stream.Seek(0, SeekOrigin.Begin);
-               return RarArchive.Open(stream, options);
-            }
-            throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
+            throw new InvalidOperationException("Cannot determine compressed stream type.");
         }
 
-        public static IWritableArchive Create(ArchiveType type)
+        public static IArchive Create(ArchiveType type)
         {
             switch (type)
             {
@@ -69,10 +69,6 @@ namespace SharpCompress.Archive
                     {
                         return TarArchive.Create();
                     }
-                case ArchiveType.GZip:
-                    {
-                        return GZipArchive.Create();
-                    }
                 default:
                     {
                         throw new NotSupportedException("Cannot create Archives of type: " + type);
@@ -126,6 +122,12 @@ namespace SharpCompress.Archive
                     return ZipArchive.Open(fileInfo, options, null);
                 }
                 stream.Seek(0, SeekOrigin.Begin);
+                if (RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
+                {
+                    stream.Dispose();
+                    return RarArchive.Open(fileInfo, options);
+                }
+                stream.Seek(0, SeekOrigin.Begin);
                 if (TarArchive.IsTarFile(stream))
                 {
                     stream.Dispose();
@@ -143,13 +145,7 @@ namespace SharpCompress.Archive
                     stream.Dispose();
                     return GZipArchive.Open(fileInfo, options);
                 }
-                stream.Seek(0, SeekOrigin.Begin);
-                if(RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
-                {
-                   stream.Dispose();
-                   return RarArchive.Open(fileInfo, options);
-                }
-                throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
+                throw new InvalidOperationException("Cannot determine compressed stream type.");
             }
         }
 

SharpCompress/Archive/GZip/GZipArchive.cs

@@ -75,11 +75,6 @@ namespace SharpCompress.Archive.GZip
             return new GZipArchive(stream, options);
         }
 
-        public static GZipArchive Create()
-        {
-            return new GZipArchive();
-        }
-
 #if !PORTABLE && !NETFX_CORE
         /// <summary>
         /// Constructor with a FileInfo object to an existing file.
@@ -152,7 +147,7 @@ namespace SharpCompress.Archive.GZip
         /// <param name="stream"></param>
         /// <param name="options"></param>
         internal GZipArchive(Stream stream, Options options)
-            : base(ArchiveType.GZip, stream, options)
+            : base(ArchiveType.GZip, stream.AsEnumerable(), options)
         {
         }
 
@@ -163,10 +158,10 @@ namespace SharpCompress.Archive.GZip
 
         public void SaveTo(Stream stream)
         {
-            SaveTo(stream, CompressionType.GZip);
+            this.SaveTo(stream, CompressionType.GZip);
         }
 
-        protected override GZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
+        protected override GZipArchiveEntry CreateEntry(string filePath, Stream source, long size, DateTime? modified,
                                                         bool closeStream)
         {
             if (Entries.Any())
@@ -191,7 +186,7 @@ namespace SharpCompress.Archive.GZip
                 {
                     using (var entryStream = entry.OpenEntryStream())
                     {
-                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime);
+                        writer.Write(entry.FilePath, entryStream, entry.LastModifiedTime);
                     }
                 }
             }

SharpCompress/Archive/GZip/GZipArchiveEntry.cs

@@ -1,16 +1,18 @@
 using System.IO;
 using System.Linq;
+using SharpCompress.Common;
 using SharpCompress.Common.GZip;
 
 namespace SharpCompress.Archive.GZip
 {
     public class GZipArchiveEntry : GZipEntry, IArchiveEntry
     {
+        private GZipArchive archive;
 
         internal GZipArchiveEntry(GZipArchive archive, GZipFilePart part)
             : base(part)
         {
-            Archive = archive;
+            this.archive = archive;
         }
 
         public virtual Stream OpenEntryStream()
@@ -19,7 +21,15 @@ namespace SharpCompress.Archive.GZip
         }
 
         #region IArchiveEntry Members
-        public IArchive Archive { get; private set; }
+
+        public void WriteTo(Stream streamToWriteTo)
+        {
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(archive, streamToWriteTo);
+        }
 
         public bool IsComplete
         {

SharpCompress/Archive/GZip/GZipWritableArchiveEntry.cs

@@ -6,31 +6,30 @@ using SharpCompress.IO;
 
 namespace SharpCompress.Archive.GZip
 {
-    internal class GZipWritableArchiveEntry : GZipArchiveEntry, IWritableArchiveEntry
+    internal class GZipWritableArchiveEntry : GZipArchiveEntry
     {
-        private readonly string path;
-        private readonly long size;
-        private readonly DateTime? lastModified;
-        private readonly bool closeStream;
-        private readonly Stream stream;
+        private string path;
+        private long size;
+        private DateTime? lastModified;
+        private bool closeStream;
 
         internal GZipWritableArchiveEntry(GZipArchive archive, Stream stream,
                                           string path, long size, DateTime? lastModified, bool closeStream)
             : base(archive, null)
         {
-            this.stream = stream;
+            this.Stream = stream;
             this.path = path;
             this.size = size;
             this.lastModified = lastModified;
             this.closeStream = closeStream;
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return 0; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return path; }
         }
@@ -85,26 +84,18 @@ namespace SharpCompress.Archive.GZip
             get { throw new NotImplementedException(); }
         }
 
-        Stream IWritableArchiveEntry.Stream
-        {
-            get
-            {
-                return stream;
-            }
-        }
+        internal Stream Stream { get; private set; }
 
         public override Stream OpenEntryStream()
         {
-            //ensure new stream is at the start, this could be reset
-            stream.Seek(0, SeekOrigin.Begin);
-            return new NonDisposingStream(stream);
+            return new NonDisposingStream(Stream);
         }
 
         internal override void Close()
         {
             if (closeStream)
             {
-                stream.Dispose();
+                Stream.Dispose();
             }
         }
     }

SharpCompress/Archive/IArchive.cs

@@ -14,6 +14,7 @@ namespace SharpCompress.Archive
         event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
 
         IEnumerable<IArchiveEntry> Entries { get; }
+        long TotalSize { get; }
         IEnumerable<IVolume> Volumes { get; }
 
         ArchiveType Type { get; }
@@ -23,6 +24,7 @@ namespace SharpCompress.Archive
         /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be 
         /// extracted sequentially for the best performance.
         /// </summary>
+        /// <returns></returns>
         IReader ExtractAllEntries();
 
         /// <summary>
@@ -35,15 +37,5 @@ namespace SharpCompress.Archive
         /// This checks to see if all the known entries have IsComplete = true
         /// </summary>
         bool IsComplete { get; }
-
-        /// <summary>
-        /// The total size of the files compressed in the archive.
-        /// </summary>
-        long TotalSize { get; }
-
-        /// <summary>
-        /// The total size of the files as uncompressed in the archive.
-        /// </summary>
-        long TotalUncompressSize { get; }
     }
 }

SharpCompress/Archive/IArchiveEntry.Extensions.cs

@@ -1,40 +1,10 @@
 using System.IO;
 using SharpCompress.Common;
-using SharpCompress.IO;
 
 namespace SharpCompress.Archive
 {
     public static class IArchiveEntryExtensions
     {
-        public static void WriteTo(this IArchiveEntry archiveEntry, Stream streamToWriteTo)
-        {
-            if (archiveEntry.Archive.Type == ArchiveType.Rar && archiveEntry.Archive.IsSolid)
-            {
-                throw new InvalidFormatException("Cannot use Archive random access on SOLID Rar files.");
-            }
-
-            if (archiveEntry.IsDirectory)
-            {
-                throw new ExtractionException("Entry is a file directory and cannot be extracted.");
-            }
-
-            var streamListener = archiveEntry.Archive as IArchiveExtractionListener;
-            streamListener.EnsureEntriesLoaded();
-            streamListener.FireEntryExtractionBegin(archiveEntry);
-            streamListener.FireFilePartExtractionBegin(archiveEntry.Key, archiveEntry.Size, archiveEntry.CompressedSize);
-            var entryStream = archiveEntry.OpenEntryStream();
-            if (entryStream == null)
-            {
-                return;
-            }
-            using(entryStream)
-            using (Stream s = new ListeningStream(streamListener, entryStream))
-            {
-                s.TransferTo(streamToWriteTo);
-            }
-            streamListener.FireEntryExtractionEnd(archiveEntry);
-        }
-
 #if !PORTABLE && !NETFX_CORE
         /// <summary>
         /// Extract to specific directory, retaining filename
@@ -42,13 +12,13 @@ namespace SharpCompress.Archive
         public static void WriteToDirectory(this IArchiveEntry entry, string destinationDirectory,
                                             ExtractOptions options = ExtractOptions.Overwrite)
         {
-            string destinationFileName;
-            string file = Path.GetFileName(entry.Key);
+            string destinationFileName = string.Empty;
+            string file = Path.GetFileName(entry.FilePath);
 
 
             if (options.HasFlag(ExtractOptions.ExtractFullPath))
             {
-                string folder = Path.GetDirectoryName(entry.Key);
+                string folder = Path.GetDirectoryName(entry.FilePath);
                 string destdir = Path.Combine(destinationDirectory, folder);
                 if (!Directory.Exists(destdir))
                 {
@@ -80,43 +50,11 @@ namespace SharpCompress.Archive
                 fm = FileMode.CreateNew;
             }
             using (FileStream fs = File.Open(destinationFileName, fm))
+//            using (Stream entryStream = entry.OpenEntryStream())
             {
+                //entryStream.TransferTo(fs);
                 entry.WriteTo(fs);
             }
-
-            if (options.HasFlag(ExtractOptions.PreserveFileTime) || options.HasFlag(ExtractOptions.PreserveAttributes))
-            {
-                // update file time to original packed time
-                FileInfo nf = new FileInfo(destinationFileName);
-                if (nf.Exists)
-                {
-                    if (options.HasFlag(ExtractOptions.PreserveFileTime))
-                    {
-                        if (entry.CreatedTime.HasValue)
-                        {
-                            nf.CreationTime = entry.CreatedTime.Value;
-                        }
-
-                        if (entry.LastModifiedTime.HasValue)
-                        {
-                            nf.LastWriteTime = entry.LastModifiedTime.Value;
-                        }
-
-                        if (entry.LastAccessedTime.HasValue)
-                        {
-                            nf.LastAccessTime = entry.CreatedTime.Value;
-                        }
-                    }
-
-                    if (options.HasFlag(ExtractOptions.PreserveAttributes))
-                    {
-                        if (entry.Attrib.HasValue)
-                        {
-                            nf.Attributes = (FileAttributes)System.Enum.ToObject(typeof(FileAttributes), entry.Attrib.Value);
-                        }
-                    }
-                }
-            }
         }
 #endif
     }

SharpCompress/Archive/IArchiveEntry.cs

@@ -11,14 +11,11 @@ namespace SharpCompress.Archive
         /// </summary>
         Stream OpenEntryStream();
 
+        void WriteTo(Stream stream);
+
         /// <summary>
         /// The archive can find all the parts of the archive needed to extract this entry.
         /// </summary>
         bool IsComplete { get; }
-
-        /// <summary>
-        /// The archive instance this entry belongs to
-        /// </summary>
-        IArchive Archive { get; }
     }
 }

SharpCompress/Archive/IArchiveExtractionListener.cs

@@ -1,11 +0,0 @@
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    internal interface IArchiveExtractionListener : IExtractionListener
-    {
-        void EnsureEntriesLoaded();
-        void FireEntryExtractionBegin(IArchiveEntry entry);
-        void FireEntryExtractionEnd(IArchiveEntry entry);
-    }
-}

SharpCompress/Archive/IWritableArchive.cs

@@ -1,15 +0,0 @@
-using System;
-using System.IO;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public interface IWritableArchive : IArchive
-    {
-        void RemoveEntry(IArchiveEntry entry);
-
-        IArchiveEntry AddEntry(string key, Stream source, bool closeStream, long size = 0, DateTime? modified = null);
-
-        void SaveTo(Stream stream, CompressionInfo compressionType);
-    }
-}

SharpCompress/Archive/IWritableArchiveEntry.cs

@@ -1,9 +0,0 @@
-using System.IO;
-
-namespace SharpCompress.Archive
-{
-    internal interface IWritableArchiveEntry
-    {
-        Stream Stream { get; }
-    }
-}

SharpCompress/Archive/Rar/FileInfoRarArchiveVolume.cs

@@ -12,8 +12,8 @@ namespace SharpCompress.Archive.Rar
     /// </summary>
     internal class FileInfoRarArchiveVolume : RarVolume
     {
-        internal FileInfoRarArchiveVolume(FileInfo fileInfo, string password, Options options)
-            : base(StreamingMode.Seekable, fileInfo.OpenRead(), password, FixOptions(options))
+        internal FileInfoRarArchiveVolume(FileInfo fileInfo, Options options)
+            : base(StreamingMode.Seekable, fileInfo.OpenRead(), FixOptions(options))
         {
             FileInfo = fileInfo;
             FileParts = base.GetVolumeFileParts().ToReadOnly();
@@ -42,5 +42,10 @@ namespace SharpCompress.Archive.Rar
         {
             return FileParts;
         }
+
+        public override FileInfo VolumeFile
+        {
+            get { return FileInfo; }
+        }
     }
 }

SharpCompress/Archive/Rar/FileInfoRarFilePart.cs

@@ -4,12 +4,12 @@ using SharpCompress.Common.Rar.Headers;
 
 namespace SharpCompress.Archive.Rar
 {
-    internal class FileInfoRarFilePart : SeekableFilePart
+    internal class FileInfoRarFilePart : RarFilePart
     {
-        private readonly FileInfoRarArchiveVolume volume;
+        private FileInfoRarArchiveVolume volume;
 
         internal FileInfoRarFilePart(FileInfoRarArchiveVolume volume, MarkHeader mh, FileHeader fh, FileInfo fi)
-            : base(mh, fh, volume.Stream, volume.Password)
+            : base(mh, fh)
         {
             this.volume = volume;
             FileInfo = fi;
@@ -17,6 +17,13 @@ namespace SharpCompress.Archive.Rar
 
         internal FileInfo FileInfo { get; private set; }
 
+        internal override Stream GetCompressedStream()
+        {
+            var stream = volume.Stream;
+            stream.Position = FileHeader.DataStartPosition;
+            return stream;
+        }
+
         internal override string FilePartName
         {
             get

SharpCompress/Archive/Rar/RarArchive.Extensions.cs

@@ -19,5 +19,13 @@ namespace SharpCompress.Archive.Rar
         {
             return archive.Volumes.First().IsMultiVolume;
         }
+
+        /// <summary>
+        /// RarArchive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
+        /// </summary>
+        public static bool IsSolidArchive(this RarArchive archive)
+        {
+            return archive.IsSolid;
+        }
     }
 }

SharpCompress/Archive/Rar/RarArchive.cs

@@ -27,15 +27,14 @@ namespace SharpCompress.Archive.Rar
         /// </summary>
         /// <param name="fileInfo"></param>
         /// <param name="options"></param>
-        /// <param name="password"></param>
-        internal RarArchive(FileInfo fileInfo, Options options, string password)
-            : base(ArchiveType.Rar, fileInfo, options, password)
+        internal RarArchive(FileInfo fileInfo, Options options)
+            : base(ArchiveType.Rar, fileInfo, options)
         {
         }
 
         protected override IEnumerable<RarVolume> LoadVolumes(FileInfo file, Options options)
         {
-            return RarArchiveVolumeFactory.GetParts(file, Password, options);
+            return RarArchiveVolumeFactory.GetParts(file, options);
         }
 #endif
 
@@ -44,9 +43,8 @@ namespace SharpCompress.Archive.Rar
         /// </summary>
         /// <param name="streams"></param>
         /// <param name="options"></param>
-        /// <param name="password"></param>
-        internal RarArchive(IEnumerable<Stream> streams, Options options, string password)
-            : base(ArchiveType.Rar, streams, options, password)
+        internal RarArchive(IEnumerable<Stream> streams, Options options)
+            : base(ArchiveType.Rar, streams, options)
         {
         }
 
@@ -57,7 +55,7 @@ namespace SharpCompress.Archive.Rar
 
         protected override IEnumerable<RarVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
         {
-            return RarArchiveVolumeFactory.GetParts(streams, Password, options);
+            return RarArchiveVolumeFactory.GetParts(streams, options);
         }
 
         protected override IReader CreateReaderForSolidExtraction()
@@ -75,16 +73,33 @@ namespace SharpCompress.Archive.Rar
         #region Creation
 
 #if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public static RarArchive Open(string filePath)
+        {
+            return Open(filePath, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        public static RarArchive Open(FileInfo fileInfo)
+        {
+            return Open(fileInfo, Options.None);
+        }
+
         /// <summary>
         /// Constructor expects a filepath to an existing file.
         /// </summary>
         /// <param name="filePath"></param>
         /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(string filePath, Options options = Options.None, string password = null)
+        public static RarArchive Open(string filePath, Options options)
         {
             filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options, password);
+            return Open(new FileInfo(filePath), options);
         }
 
         /// <summary>
@@ -92,23 +107,42 @@ namespace SharpCompress.Archive.Rar
         /// </summary>
         /// <param name="fileInfo"></param>
         /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(FileInfo fileInfo, Options options = Options.None, string password = null)
+        public static RarArchive Open(FileInfo fileInfo, Options options)
         {
             fileInfo.CheckNotNull("fileInfo");
-            return new RarArchive(fileInfo, options, password);
+            return new RarArchive(fileInfo, options);
         }
 #endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        public static RarArchive Open(Stream stream)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream.AsEnumerable());
+        }
+
         /// <summary>
         /// Takes a seekable Stream as a source
         /// </summary>
         /// <param name="stream"></param>
         /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(Stream stream, Options options = Options.KeepStreamsOpen, string password = null)
+        public static RarArchive Open(Stream stream, Options options)
         {
             stream.CheckNotNull("stream");
-            return Open(stream.AsEnumerable(), options, password);
+            return Open(stream.AsEnumerable(), options);
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="streams"></param>
+        public static RarArchive Open(IEnumerable<Stream> streams)
+        {
+            streams.CheckNotNull("streams");
+            return new RarArchive(streams, Options.KeepStreamsOpen);
         }
 
         /// <summary>
@@ -116,11 +150,10 @@ namespace SharpCompress.Archive.Rar
         /// </summary>
         /// <param name="streams"></param>
         /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(IEnumerable<Stream> streams, Options options = Options.KeepStreamsOpen, string password = null)
+        public static RarArchive Open(IEnumerable<Stream> streams, Options options)
         {
             streams.CheckNotNull("streams");
-            return new RarArchive(streams, options, password);
+            return new RarArchive(streams, options);
         }
 
 #if !PORTABLE && !NETFX_CORE

SharpCompress/Archive/Rar/RarArchiveEntry.cs

@@ -11,12 +11,11 @@ namespace SharpCompress.Archive.Rar
     public class RarArchiveEntry : RarEntry, IArchiveEntry
     {
         private readonly ICollection<RarFilePart> parts;
-        private readonly RarArchive archive;
 
         internal RarArchiveEntry(RarArchive archive, IEnumerable<RarFilePart> parts)
         {
             this.parts = parts.ToList();
-            this.archive = archive;
+            Archive = archive;
         }
 
         public override CompressionType CompressionType
@@ -24,13 +23,7 @@ namespace SharpCompress.Archive.Rar
             get { return CompressionType.Rar; }
         }
 
-        public IArchive Archive
-        {
-            get
-            {
-                return archive;
-            }
-        }
+        private RarArchive Archive { get; set; }
 
         internal override IEnumerable<FilePart> Parts
         {
@@ -42,13 +35,14 @@ namespace SharpCompress.Archive.Rar
             get { return parts.First().FileHeader; }
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get
             {
                 CheckIncomplete();
                 return parts.Select(fp => fp.FileHeader)
-                    .Single(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER)).FileCRC;
+                            .Where(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER))
+                            .Single().FileCRC;
             }
         }
 
@@ -73,8 +67,22 @@ namespace SharpCompress.Archive.Rar
 
         public Stream OpenEntryStream()
         {
-            return new RarStream(archive.Unpack, FileHeader,
-                                 new MultiVolumeReadOnlyStream(Parts.Cast<RarFilePart>(), archive));
+            return new RarStream(Archive.Unpack, FileHeader,
+                                 new MultiVolumeReadOnlyStream(Parts.Cast<RarFilePart>(), Archive));
+        }
+
+        public void WriteTo(Stream streamToWriteTo)
+        {
+            CheckIncomplete();
+            if (Archive.IsSolidArchive())
+            {
+                throw new InvalidFormatException("Cannot use Archive random access on SOLID Rar files.");
+            }
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(Archive, streamToWriteTo);
         }
 
         public bool IsComplete
@@ -89,5 +97,9 @@ namespace SharpCompress.Archive.Rar
                 throw new IncompleteArchiveException("ArchiveEntry is incomplete and cannot perform this operation.");
             }
         }
+
+        internal override void Close()
+        {
+        }
     }
 }

SharpCompress/Archive/Rar/RarArchiveVolumeFactory.cs

@@ -13,7 +13,7 @@ namespace SharpCompress.Archive.Rar
 {
     internal static class RarArchiveVolumeFactory
     {
-        internal static IEnumerable<RarVolume> GetParts(IEnumerable<Stream> streams, string password, Options options)
+        internal static IEnumerable<RarVolume> GetParts(IEnumerable<Stream> streams, Options options)
         {
             foreach (Stream s in streams)
             {
@@ -21,15 +21,15 @@ namespace SharpCompress.Archive.Rar
                 {
                     throw new ArgumentException("Stream is not readable and seekable");
                 }
-                StreamRarArchiveVolume part = new StreamRarArchiveVolume(s, password, options);
+                StreamRarArchiveVolume part = new StreamRarArchiveVolume(s, options);
                 yield return part;
             }
         }
 
 #if !PORTABLE && !NETFX_CORE
-        internal static IEnumerable<RarVolume> GetParts(FileInfo fileInfo, string password, Options options)
+        internal static IEnumerable<RarVolume> GetParts(FileInfo fileInfo, Options options)
         {
-            FileInfoRarArchiveVolume part = new FileInfoRarArchiveVolume(fileInfo, password, options);
+            FileInfoRarArchiveVolume part = new FileInfoRarArchiveVolume(fileInfo, options);
             yield return part;
 
             if (!part.ArchiveHeader.ArchiveHeaderFlags.HasFlag(ArchiveFlags.VOLUME))
@@ -41,7 +41,7 @@ namespace SharpCompress.Archive.Rar
             //we use fileinfo because rar is dumb and looks at file names rather than archive info for another volume
             while (fileInfo != null && fileInfo.Exists)
             {
-                part = new FileInfoRarArchiveVolume(fileInfo, password, options);
+                part = new FileInfoRarArchiveVolume(fileInfo, options);
 
                 fileInfo = GetNextFileInfo(ah, part.FileParts.FirstOrDefault() as FileInfoRarFilePart);
                 yield return part;

SharpCompress/Archive/Rar/SeekableFilePart.cs

@@ -1,39 +0,0 @@
-using System;
-using System.IO;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-
-namespace SharpCompress.Archive.Rar
-{
-    internal class SeekableFilePart : RarFilePart
-    {
-        private readonly Stream stream;
-        private readonly string password;
-
-        internal SeekableFilePart(MarkHeader mh, FileHeader fh, Stream stream, string password)
-            : base(mh, fh)
-        {
-            this.stream = stream;
-            this.password = password;
-        }
-
-        internal override Stream GetCompressedStream()
-        {
-            stream.Position = FileHeader.DataStartPosition;
-            if (FileHeader.Salt != null)
-            {
-#if PORTABLE
-                throw new NotSupportedException("Encrypted Rar files aren't supported in portable distro.");
-#else
-                return new RarCryptoWrapper(stream, password, FileHeader.Salt);
-#endif
-            }
-            return stream;
-        }
-
-        internal override string FilePartName
-        {
-            get { return "Unknown Stream - File Entry: " + FileHeader.FileName; }
-        }
-    }
-}

SharpCompress/Archive/Rar/SeekableStreamFilePart.cs

@@ -0,0 +1,28 @@
+using System.IO;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal class SeekableStreamFilePart : RarFilePart
+    {
+        internal SeekableStreamFilePart(MarkHeader mh, FileHeader fh, Stream stream)
+            : base(mh, fh)
+        {
+            Stream = stream;
+        }
+
+        internal Stream Stream { get; private set; }
+
+        internal override Stream GetCompressedStream()
+        {
+            Stream.Position = FileHeader.DataStartPosition;
+            return Stream;
+        }
+
+        internal override string FilePartName
+        {
+            get { return "Unknown Stream - File Entry: " + base.FileHeader.FileName; }
+        }
+    }
+}

SharpCompress/Archive/Rar/StreamRarArchiveVolume.cs

@@ -9,11 +9,18 @@ namespace SharpCompress.Archive.Rar
 {
     internal class StreamRarArchiveVolume : RarVolume
     {
-        internal StreamRarArchiveVolume(Stream stream, string password, Options options)
-            : base(StreamingMode.Seekable, stream, password, options)
+        internal StreamRarArchiveVolume(Stream stream, Options options)
+            : base(StreamingMode.Seekable, stream, options)
         {
         }
 
+#if !PORTABLE && !NETFX_CORE
+        public override FileInfo VolumeFile
+        {
+            get { return null; }
+        }
+#endif
+
         internal override IEnumerable<RarFilePart> ReadFileParts()
         {
             return GetVolumeFileParts();
@@ -21,7 +28,7 @@ namespace SharpCompress.Archive.Rar
 
         internal override RarFilePart CreateFilePart(FileHeader fileHeader, MarkHeader markHeader)
         {
-            return new SeekableFilePart(markHeader, fileHeader, Stream, Password);
+            return new SeekableStreamFilePart(markHeader, fileHeader, Stream);
         }
     }
 }

SharpCompress/Archive/SevenZip/SevenZipArchive.cs

@@ -77,17 +77,13 @@ namespace SharpCompress.Archive.SevenZip
 
 #if !PORTABLE && !NETFX_CORE
         internal SevenZipArchive(FileInfo fileInfo, Options options)
-            : base(ArchiveType.SevenZip, fileInfo, options, null)
+            : base(ArchiveType.SevenZip, fileInfo, options)
         {
         }
 
         protected override IEnumerable<SevenZipVolume> LoadVolumes(FileInfo file, Options options)
         {
-            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
-            {
-                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return new SevenZipVolume(file.OpenRead(), options).AsEnumerable();
+            return new SevenZipVolume(file, options).AsEnumerable();
         }
 
         public static bool IsSevenZipFile(string filePath)
@@ -109,7 +105,7 @@ namespace SharpCompress.Archive.SevenZip
 #endif
 
         internal SevenZipArchive(Stream stream, Options options)
-            : base(ArchiveType.SevenZip, stream.AsEnumerable(), options, null)
+            : base(ArchiveType.SevenZip, stream.AsEnumerable(), options)
         {
         }
 
@@ -188,15 +184,6 @@ namespace SharpCompress.Archive.SevenZip
             get { return Entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder).Count() > 1; }
         }
 
-        public override long TotalSize
-        {
-            get
-            {
-                int i = Entries.Count;
-                return database.PackSizes.Aggregate(0L, (total, packSize) => total + packSize);
-            }
-        }
-
         private class SevenZipReader : AbstractReader<SevenZipEntry, SevenZipVolume>
         {
             private readonly SevenZipArchive archive;
@@ -245,7 +232,7 @@ namespace SharpCompress.Archive.SevenZip
 
             protected override EntryStream GetEntryStream()
             {
-                return CreateEntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
+                return new EntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
             }
         }
     }

SharpCompress/Archive/SevenZip/SevenZipArchiveEntry.cs

@@ -1,21 +1,32 @@
 using System.IO;
+using SharpCompress.Common;
 using SharpCompress.Common.SevenZip;
 
 namespace SharpCompress.Archive.SevenZip
 {
     public class SevenZipArchiveEntry : SevenZipEntry, IArchiveEntry
     {
+        private SevenZipArchive archive;
+
         internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part)
             : base(part)
         {
-            Archive = archive;
+            this.archive = archive;
         }
 
         public Stream OpenEntryStream()
         {
             return FilePart.GetCompressedStream();
         }
-        public IArchive Archive { get; private set; }
+
+        public void WriteTo(Stream stream)
+        {
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(archive, stream);
+        }
 
         public bool IsComplete
         {

SharpCompress/Archive/Tar/TarArchive.cs

@@ -123,11 +123,7 @@ namespace SharpCompress.Archive.Tar
 
         protected override IEnumerable<TarVolume> LoadVolumes(FileInfo file, Options options)
         {
-            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
-            {
-                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return new TarVolume(file.OpenRead(), options).AsEnumerable();
+            return new TarVolume(file, options).AsEnumerable();
         }
 #endif
 
@@ -137,7 +133,7 @@ namespace SharpCompress.Archive.Tar
         /// <param name="stream"></param>
         /// <param name="options"></param>
         internal TarArchive(Stream stream, Options options)
-            : base(ArchiveType.Tar, stream, options)
+            : base(ArchiveType.Tar, stream.AsEnumerable(), options)
         {
         }
 
@@ -169,21 +165,11 @@ namespace SharpCompress.Archive.Tar
                         {
                             var entry = new TarArchiveEntry(this, new TarFilePart(previousHeader, stream),
                                                             CompressionType.None);
-
-                            var oldStreamPos = stream.Position;
-
-                            using(var entryStream = entry.OpenEntryStream())
-                            using(var memoryStream = new MemoryStream())
-                            {
-                                entryStream.TransferTo(memoryStream);
-                                memoryStream.Position = 0;
-                                var bytes = memoryStream.ToArray();
-
-                                header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
-                            }
-
-                            stream.Position = oldStreamPos;
-
+                            var memoryStream = new MemoryStream();
+                            entry.WriteTo(memoryStream);
+                            memoryStream.Position = 0;
+                            var bytes = memoryStream.ToArray();
+                            header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
                             previousHeader = null;
                         }
                         yield return new TarArchiveEntry(this, new TarFilePart(header, stream), CompressionType.None);
@@ -197,7 +183,7 @@ namespace SharpCompress.Archive.Tar
             return new TarArchive();
         }
 
-        protected override TarArchiveEntry CreateEntryInternal(string filePath, Stream source,
+        protected override TarArchiveEntry CreateEntry(string filePath, Stream source,
                                                        long size, DateTime? modified, bool closeStream)
         {
             return new TarWritableArchiveEntry(this, source, CompressionType.Unknown, filePath, size, modified,
@@ -215,7 +201,7 @@ namespace SharpCompress.Archive.Tar
                 {
                     using (var entryStream = entry.OpenEntryStream())
                     {
-                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, entry.Size);
+                        writer.Write(entry.FilePath, entryStream, entry.LastModifiedTime, entry.Size);
                     }
                 }
             }

SharpCompress/Archive/Tar/TarArchiveEntry.cs

@@ -7,10 +7,12 @@ namespace SharpCompress.Archive.Tar
 {
     public class TarArchiveEntry : TarEntry, IArchiveEntry
     {
+        private TarArchive archive;
+
         internal TarArchiveEntry(TarArchive archive, TarFilePart part, CompressionType compressionType)
             : base(part, compressionType)
         {
-            Archive = archive;
+            this.archive = archive;
         }
 
         public virtual Stream OpenEntryStream()
@@ -19,7 +21,15 @@ namespace SharpCompress.Archive.Tar
         }
 
         #region IArchiveEntry Members
-        public IArchive Archive { get; private set; }
+
+        public void WriteTo(Stream streamToWriteTo)
+        {
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(archive, streamToWriteTo);
+        }
 
         public bool IsComplete
         {

SharpCompress/Archive/Tar/TarWritableArchiveEntry.cs

@@ -6,31 +6,30 @@ using SharpCompress.IO;
 
 namespace SharpCompress.Archive.Tar
 {
-    internal class TarWritableArchiveEntry : TarArchiveEntry, IWritableArchiveEntry
+    internal class TarWritableArchiveEntry : TarArchiveEntry
     {
-        private readonly string path;
-        private readonly long size;
-        private readonly DateTime? lastModified;
-        private readonly bool closeStream;
-        private readonly Stream stream;
+        private string path;
+        private long size;
+        private DateTime? lastModified;
+        private bool closeStream;
 
         internal TarWritableArchiveEntry(TarArchive archive, Stream stream, CompressionType compressionType,
                                          string path, long size, DateTime? lastModified, bool closeStream)
             : base(archive, null, compressionType)
         {
-            this.stream = stream;
+            this.Stream = stream;
             this.path = path;
             this.size = size;
             this.lastModified = lastModified;
             this.closeStream = closeStream;
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return 0; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return path; }
         }
@@ -84,26 +83,19 @@ namespace SharpCompress.Archive.Tar
         {
             get { throw new NotImplementedException(); }
         }
-        Stream IWritableArchiveEntry.Stream
-        {
-            get
-            {
-                return stream;
-            }
-        }
+
+        internal Stream Stream { get; private set; }
 
         public override Stream OpenEntryStream()
         {
-            //ensure new stream is at the start, this could be reset
-            stream.Seek(0, SeekOrigin.Begin);
-            return new NonDisposingStream(stream);
+            return new NonDisposingStream(Stream);
         }
 
         internal override void Close()
         {
             if (closeStream)
             {
-                stream.Dispose();
+                Stream.Dispose();
             }
         }
     }

SharpCompress/Archive/Zip/ZipArchive.cs

@@ -14,7 +14,7 @@ namespace SharpCompress.Archive.Zip
 {
     public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
     {
-        private readonly SeekableZipHeaderFactory headerFactory;
+        private SeekableZipHeaderFactory headerFactory;
 
         /// <summary>
         /// Gets or sets the compression level applied to files added to the archive,
@@ -116,7 +116,7 @@ namespace SharpCompress.Archive.Zip
             try
             {
                 ZipHeader header =
-                    headerFactory.ReadStreamHeader(stream).FirstOrDefault(x => x != null && x.ZipHeaderType != ZipHeaderType.Split);
+                    headerFactory.ReadStreamHeader(stream).FirstOrDefault(x => x.ZipHeaderType != ZipHeaderType.Split);
                 if (header == null)
                 {
                     return false;
@@ -148,11 +148,7 @@ namespace SharpCompress.Archive.Zip
 
         protected override IEnumerable<ZipVolume> LoadVolumes(FileInfo file, Options options)
         {
-            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
-            {
-                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return new ZipVolume(file.OpenRead(), options).AsEnumerable();
+            return new ZipVolume(file, options).AsEnumerable();
         }
 #endif
 
@@ -168,7 +164,7 @@ namespace SharpCompress.Archive.Zip
         /// <param name="options"></param>
         /// <param name="password"></param>
         internal ZipArchive(Stream stream, Options options, string password = null)
-            : base(ArchiveType.Zip, stream, options)
+            : base(ArchiveType.Zip, stream.AsEnumerable(), options)
         {
             headerFactory = new SeekableZipHeaderFactory(password);
         }
@@ -181,7 +177,7 @@ namespace SharpCompress.Archive.Zip
         protected override IEnumerable<ZipArchiveEntry> LoadEntries(IEnumerable<ZipVolume> volumes)
         {
             var volume = volumes.Single();
-            Stream stream = volume.Stream;
+            Stream stream = volumes.Single().Stream;
             foreach (ZipHeader h in headerFactory.ReadSeekableHeader(stream))
             {
                 if (h != null)
@@ -218,13 +214,13 @@ namespace SharpCompress.Archive.Zip
                 {
                     using (var entryStream = entry.OpenEntryStream())
                     {
-                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, string.Empty);
+                        writer.Write(entry.FilePath, entryStream, entry.LastModifiedTime, string.Empty);
                     }
                 }
             }
         }
 
-        protected override ZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
+        protected override ZipArchiveEntry CreateEntry(string filePath, Stream source, long size, DateTime? modified,
                                                        bool closeStream)
         {
             return new ZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);

SharpCompress/Archive/Zip/ZipArchiveEntry.cs

@@ -6,10 +6,12 @@ namespace SharpCompress.Archive.Zip
 {
     public class ZipArchiveEntry : ZipEntry, IArchiveEntry
     {
+        private ZipArchive archive;
+
         internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart part)
             : base(part)
         {
-            Archive = archive;
+            this.archive = archive;
         }
 
         public virtual Stream OpenEntryStream()
@@ -19,7 +21,10 @@ namespace SharpCompress.Archive.Zip
 
         #region IArchiveEntry Members
 
-        public IArchive Archive { get; private set; }
+        public void WriteTo(Stream streamToWriteTo)
+        {
+            this.Extract(archive, streamToWriteTo);
+        }
 
         public bool IsComplete
         {

SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs

@@ -6,32 +6,30 @@ using SharpCompress.IO;
 
 namespace SharpCompress.Archive.Zip
 {
-    internal class ZipWritableArchiveEntry : ZipArchiveEntry, IWritableArchiveEntry
+    internal class ZipWritableArchiveEntry : ZipArchiveEntry
     {
-        private readonly string path;
-        private readonly long size;
-        private readonly DateTime? lastModified;
-        private readonly bool closeStream;
-        private readonly Stream stream;
-        private bool isDisposed;
+        private string path;
+        private long size;
+        private DateTime? lastModified;
+        private bool closeStream;
 
         internal ZipWritableArchiveEntry(ZipArchive archive, Stream stream, string path, long size,
                                          DateTime? lastModified, bool closeStream)
             : base(archive, null)
         {
-            this.stream = stream;
+            this.Stream = stream;
             this.path = path;
             this.size = size;
             this.lastModified = lastModified;
             this.closeStream = closeStream;
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return 0; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return path; }
         }
@@ -86,27 +84,18 @@ namespace SharpCompress.Archive.Zip
             get { throw new NotImplementedException(); }
         }
 
-        Stream IWritableArchiveEntry.Stream
-        {
-            get
-            {
-                return stream;
-            }
-        }
+        internal Stream Stream { get; private set; }
 
         public override Stream OpenEntryStream()
         {
-            //ensure new stream is at the start, this could be reset
-            stream.Seek(0, SeekOrigin.Begin);
-            return new NonDisposingStream(stream);
+            return new NonDisposingStream(Stream);
         }
 
         internal override void Close()
         {
-            if (closeStream && !isDisposed)
+            if (closeStream)
             {
-                stream.Dispose();
-                isDisposed = true;
+                Stream.Dispose();
             }
         }
     }

SharpCompress/ArchiveType.cs

@@ -0,0 +1,11 @@
+namespace SharpCompress
+{
+    public enum ArchiveType
+    {
+        Rar,
+        Zip,
+        Tar,
+        SevenZip,
+        GZip,
+    }
+}

SharpCompress/AssemblyInfo.cs

@@ -1,20 +1,20 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
-
+#if SILVERLIGHT
+[assembly: AssemblyTitle("SharpCompress.Silverlight")]
+[assembly: AssemblyProduct("SharpCompress.Silverlight")]
+#else
 #if PORTABLE
-[assembly: AssemblyTitle("SharpCompress.Portable")]
-[assembly: AssemblyProduct("SharpCompress.Portable")]
+[assembly: AssemblyTitle("SharpCompress.Silverlight")]
+[assembly: AssemblyProduct("SharpCompress.Silverlight")]
 #else
 
 [assembly: AssemblyTitle("SharpCompress")]
 [assembly: AssemblyProduct("SharpCompress")]
+[assembly:
+    InternalsVisibleTo(
+        "SharpCompress.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010005d6ae1b0f6875393da83c920a5b9408f5191aaf4e8b3c2c476ad2a11f5041ecae84ce9298bc4c203637e2fd3a80ad5378a9fa8da1363e98cea45c73969198a4b64510927c910001491cebbadf597b22448ad103b0a4007e339faf8fe8665dcdb70d65b27ac05b1977c0655fad06b372b820ecbdccf10a0f214fee0986dfeded"
+        )]
 #endif
-
-#if UNSIGNED
-[assembly: InternalsVisibleTo("SharpCompress.Test")]
-[assembly: InternalsVisibleTo("SharpCompress.Test.Portable")]
-#endif
-
-[assembly: CLSCompliant(true)]
+#endif

SharpCompress/Common/ArchiveEncoding.cs

@@ -1,23 +1,29 @@
-using System.Text;
+using System.Globalization;
+using System.Text;
 
 namespace SharpCompress.Common
 {
-    public static class ArchiveEncoding
+    public class ArchiveEncoding
     {
         /// <summary>
         /// Default encoding to use when archive format doesn't specify one.
         /// </summary>
-        public static Encoding Default { get; set; }
+        public static Encoding Default;
 
         /// <summary>
         /// Encoding used by encryption schemes which don't comply with RFC 2898.
         /// </summary>
-        public static Encoding Password { get; set; }
+        public static Encoding Password;
 
         static ArchiveEncoding()
         {
+#if PORTABLE || NETFX_CORE
             Default = Encoding.UTF8;
             Password = Encoding.UTF8;
+#else
+            Default = Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage);
+            Password = Encoding.Default;
+#endif
         }
     }
 }

SharpCompress/Common/Entry.cs

@@ -3,17 +3,19 @@ using System.Collections.Generic;
 
 namespace SharpCompress.Common
 {
-    public abstract class Entry : IEntry
+    public abstract class Entry : SharpCompress.Common.IEntry
     {
+        internal bool IsSolid { get; set; }
+
         /// <summary>
         /// The File's 32 bit CRC Hash
         /// </summary>
-        public abstract long Crc { get; }
+        public abstract uint Crc { get; }
 
         /// <summary>
-        /// The string key of the file internal to the Archive.
+        /// The path of the file internal to the Rar Archive.
         /// </summary>
-        public abstract string Key { get; }
+        public abstract string FilePath { get; }
 
         /// <summary>
         /// The compressed file size
@@ -46,7 +48,7 @@ namespace SharpCompress.Common
         public abstract DateTime? LastAccessedTime { get; }
 
         /// <summary>
-        /// The entry time when archived, if recorded
+        /// The entry time whend archived, if recorded
         /// </summary>
         public abstract DateTime? ArchivedTime { get; }
 
@@ -60,26 +62,10 @@ namespace SharpCompress.Common
         /// </summary>
         public abstract bool IsDirectory { get; }
 
-        /// <summary>
-        /// Entry is split among multiple volumes
-        /// </summary>
         public abstract bool IsSplit { get; }
 
         internal abstract IEnumerable<FilePart> Parts { get; }
-        internal bool IsSolid { get; set; }
-
-        internal virtual void Close()
-        {
-
-        }
-
-        /// <summary>
-        /// Entry file attribute.
-        /// </summary>
-        public virtual int? Attrib
-        {
-            get { throw new NotImplementedException(); }
-        }
 
+        internal abstract void Close();
     }
 }

SharpCompress/Common/EntryStream.cs

@@ -1,19 +1,15 @@
 using System;
 using System.IO;
-using SharpCompress.Reader;
 
 namespace SharpCompress.Common
 {
     public class EntryStream : Stream
     {
-        public IReader Reader { get; private set; }
         private Stream stream;
         private bool completed;
-        private bool isDisposed;
 
-        internal EntryStream(IReader reader, Stream stream)
+        internal EntryStream(Stream stream)
         {
-            this.Reader = reader;
             this.stream = stream;
         }
 
@@ -31,15 +27,11 @@ namespace SharpCompress.Common
 
         protected override void Dispose(bool disposing)
         {
-            if (!(completed || Reader.Cancelled))
+            if (!completed)
             {
-                SkipEntry();
+                throw new InvalidOperationException(
+                    "EntryStream has not been fully consumed.  Read the entire stream or use SkipEntry.");
             }
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
             base.Dispose(disposing);
             stream.Dispose();
         }
@@ -61,18 +53,18 @@ namespace SharpCompress.Common
 
         public override void Flush()
         {
-            throw new NotSupportedException();
+            throw new System.NotImplementedException();
         }
 
         public override long Length
         {
-            get { throw new NotSupportedException(); }
+            get { throw new System.NotImplementedException(); }
         }
 
         public override long Position
         {
-            get { throw new NotSupportedException(); }
-            set { throw new NotSupportedException(); }
+            get { throw new System.NotImplementedException(); }
+            set { throw new System.NotImplementedException(); }
         }
 
         public override int Read(byte[] buffer, int offset, int count)
@@ -87,17 +79,17 @@ namespace SharpCompress.Common
 
         public override long Seek(long offset, SeekOrigin origin)
         {
-            throw new NotSupportedException();
+            throw new System.NotImplementedException();
         }
 
         public override void SetLength(long value)
         {
-            throw new NotSupportedException();
+            throw new System.NotImplementedException();
         }
 
         public override void Write(byte[] buffer, int offset, int count)
         {
-            throw new NotSupportedException();
+            throw new System.NotImplementedException();
         }
     }
 }

SharpCompress/Common/ExtractOptions.cs

@@ -5,26 +5,16 @@ namespace SharpCompress.Common
     [Flags]
     public enum ExtractOptions
     {
-        None = 0,
+        None,
 
         /// <summary>
         /// overwrite target if it exists
         /// </summary>
-        Overwrite = 1 << 0,
+        Overwrite,
 
         /// <summary>
         /// extract with internal directory structure
         /// </summary>
-        ExtractFullPath = 1 << 1,
-
-        /// <summary>
-        /// preserve file time
-        /// </summary>
-        PreserveFileTime = 1 << 2,
-
-        /// <summary>
-        /// preserve windows file attributes
-        /// </summary>
-        PreserveAttributes = 1 << 3,
+        ExtractFullPath,
     }
 }

SharpCompress/Common/GZip/GZipEntry.cs

@@ -18,12 +18,12 @@ namespace SharpCompress.Common.GZip
             get { return CompressionType.GZip; }
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return 0; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return filePart.FilePartName; }
         }
@@ -82,5 +82,9 @@ namespace SharpCompress.Common.GZip
         {
             yield return new GZipEntry(new GZipFilePart(stream));
         }
+
+        internal override void Close()
+        {
+        }
     }
 }

SharpCompress/Common/GZip/GZipVolume.cs

@@ -21,6 +21,16 @@ namespace SharpCompress.Common.GZip
         }
 #endif
 
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// File that backs this volume, if it not stream based
+        /// </summary>
+        public override FileInfo VolumeFile
+        {
+            get { return fileInfo; }
+        }
+#endif
+
         public override bool IsFirstVolume
         {
             get { return true; }

SharpCompress/Common/GenericVolume.cs

@@ -0,0 +1,44 @@
+using System.IO;
+
+namespace SharpCompress.Common
+{
+    public class GenericVolume : Volume
+    {
+#if !PORTABLE && !NETFX_CORE
+        private FileInfo fileInfo;
+#endif
+
+        public GenericVolume(Stream stream, Options options)
+            : base(stream, options)
+        {
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        public GenericVolume(FileInfo fileInfo, Options options)
+            : base(fileInfo.OpenRead(), options)
+        {
+            this.fileInfo = fileInfo;
+        }
+#endif
+
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// File that backs this volume, if it not stream based
+        /// </summary>
+        public override FileInfo VolumeFile
+        {
+            get { return fileInfo; }
+        }
+#endif
+
+        public override bool IsFirstVolume
+        {
+            get { return true; }
+        }
+
+        public override bool IsMultiVolume
+        {
+            get { return true; }
+        }
+    }
+}

SharpCompress/Common/IEntry.cs

@@ -7,15 +7,14 @@ namespace SharpCompress.Common
         CompressionType CompressionType { get; }
         DateTime? ArchivedTime { get; }
         long CompressedSize { get; }
-        long Crc { get; }
+        uint Crc { get; }
         DateTime? CreatedTime { get; }
-        string Key { get; }
+        string FilePath { get; }
         bool IsDirectory { get; }
         bool IsEncrypted { get; }
         bool IsSplit { get; }
         DateTime? LastAccessedTime { get; }
         DateTime? LastModifiedTime { get; }
         long Size { get; }
-        int? Attrib { get; }
     }
 }

SharpCompress/Common/IStreamListener.cs

@@ -1,6 +1,6 @@
 namespace SharpCompress.Common
 {
-    internal interface IExtractionListener
+    internal interface IStreamListener
     {
         void FireFilePartExtractionBegin(string name, long size, long compressedSize);
         void FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes);

SharpCompress/Common/IVolume.cs

@@ -7,5 +7,11 @@ namespace SharpCompress.Common
 {
     public interface IVolume : IDisposable
     {
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// File that backs this volume, if it not stream based
+        /// </summary>
+        FileInfo VolumeFile { get; }
+#endif
     }
 }

SharpCompress/Common/Rar/Headers/ArchiveHeader.cs

@@ -27,10 +27,5 @@ namespace SharpCompress.Common.Rar.Headers
         internal int PosAv { get; private set; }
 
         internal byte EncryptionVersion { get; private set; }
-
-        public bool HasPassword
-        {
-            get { return ArchiveHeaderFlags.HasFlag(ArchiveFlags.PASSWORD); }
-        }
     }
 }

SharpCompress/Common/Rar/Headers/FileHeader.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 using SharpCompress.IO;
 
 namespace SharpCompress.Common.Rar.Headers
@@ -14,7 +15,7 @@ namespace SharpCompress.Common.Rar.Headers
         {
             uint lowUncompressedSize = reader.ReadUInt32();
 
-            HostOS = (HostOS)reader.ReadByte();
+            HostOS = (HostOS) (int) reader.ReadByte();
 
             FileCRC = reader.ReadUInt32();
 
@@ -45,7 +46,7 @@ namespace SharpCompress.Common.Rar.Headers
             CompressedSize = UInt32To64(highCompressedSize, AdditionalSize);
             UncompressedSize = UInt32To64(highUncompressedkSize, lowUncompressedSize);
 
-            nameSize = nameSize > 4 * 1024 ? (short)(4 * 1024) : nameSize;
+            nameSize = nameSize > 4*1024 ? (short) (4*1024) : nameSize;
 
             byte[] fileNameBytes = reader.ReadBytes(nameSize);
 
@@ -105,16 +106,11 @@ namespace SharpCompress.Common.Rar.Headers
             }
             if (FileFlags.HasFlag(FileFlags.EXTTIME))
             {
-                // verify that the end of the header hasn't been reached before reading the Extended Time.
-                //  some tools incorrectly omit Extended Time despite specifying FileFlags.EXTTIME, which most parsers tolerate.
-                if (ReadBytes + reader.CurrentReadByteCount <= HeaderSize - 2)
-                {
-                    ushort extendedFlags = reader.ReadUInt16();
-                    FileLastModifiedTime = ProcessExtendedTime(extendedFlags, FileLastModifiedTime, reader, 0);
-                    FileCreatedTime = ProcessExtendedTime(extendedFlags, null, reader, 1);
-                    FileLastAccessedTime = ProcessExtendedTime(extendedFlags, null, reader, 2);
-                    FileArchivedTime = ProcessExtendedTime(extendedFlags, null, reader, 3);
-                }
+                ushort extendedFlags = reader.ReadUInt16();
+                FileLastModifiedTime = ProcessExtendedTime(extendedFlags, FileLastModifiedTime, reader, 0);
+                FileCreatedTime = ProcessExtendedTime(extendedFlags, null, reader, 1);
+                FileLastAccessedTime = ProcessExtendedTime(extendedFlags, null, reader, 2);
+                FileArchivedTime = ProcessExtendedTime(extendedFlags, null, reader, 3);
             }
         }
 
@@ -134,7 +130,7 @@ namespace SharpCompress.Common.Rar.Headers
         private static DateTime? ProcessExtendedTime(ushort extendedFlags, DateTime? time, MarkingBinaryReader reader,
                                                      int i)
         {
-            uint rmode = (uint)extendedFlags >> (3 - i) * 4;
+            uint rmode = (uint) extendedFlags >> (3 - i)*4;
             if ((rmode & 8) == 0)
             {
                 return null;
@@ -149,14 +145,14 @@ namespace SharpCompress.Common.Rar.Headers
                 time = time.Value.AddSeconds(1);
             }
             uint nanosecondHundreds = 0;
-            int count = (int)rmode & 3;
+            int count = (int) rmode & 3;
             for (int j = 0; j < count; j++)
             {
                 byte b = reader.ReadByte();
-                nanosecondHundreds |= (((uint)b) << ((j + 3 - count) * 8));
+                nanosecondHundreds |= (((uint) b) << ((j + 3 - count)*8));
             }
             //10^-7 to 10^-3
-            return time.Value.AddMilliseconds(nanosecondHundreds * Math.Pow(10, -4));
+            return time.Value.AddMilliseconds(nanosecondHundreds*Math.Pow(10, -4));
         }
 
         private static string ConvertPath(string path, HostOS os)
@@ -209,7 +205,7 @@ namespace SharpCompress.Common.Rar.Headers
 
         internal FileFlags FileFlags
         {
-            get { return (FileFlags)base.Flags; }
+            get { return (FileFlags) base.Flags; }
         }
 
         internal long CompressedSize { get; private set; }

SharpCompress/Common/Rar/Headers/ProtectHeader.cs

@@ -1,22 +0,0 @@
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    // ProtectHeader is part of the Recovery Record feature
-    internal class ProtectHeader : RarHeader
-    {
-        protected override void ReadFromReader(MarkingBinaryReader reader)
-        {
-            Version = reader.ReadByte();
-            RecSectors = reader.ReadUInt16();
-            TotalBlocks = reader.ReadUInt32();
-            Mark = reader.ReadBytes(8);
-        }
-
-        internal uint DataSize { get { return AdditionalSize; } }
-        internal byte Version { get; private set; }
-        internal ushort RecSectors { get; private set; }
-        internal uint TotalBlocks { get; private set; }
-        internal byte[] Mark { get; private set; }
-    }
-}

SharpCompress/Common/Rar/Headers/RarHeader.cs

@@ -35,10 +35,11 @@ namespace SharpCompress.Common.Rar.Headers
                 return null;
             }
         }
+
         protected virtual void ReadFromReader(MarkingBinaryReader reader)
         {
             HeadCRC = reader.ReadInt16();
-            HeaderType = (HeaderType)(reader.ReadByte() & 0xff);
+            HeaderType = (HeaderType) (int) (reader.ReadByte() & 0xff);
             Flags = reader.ReadInt16();
             HeaderSize = reader.ReadInt16();
             if (FlagUtility.HasFlag(Flags, LONG_BLOCK))
@@ -57,7 +58,7 @@ namespace SharpCompress.Common.Rar.Headers
             header.ReadFromReader(reader);
             header.ReadBytes += reader.CurrentReadByteCount;
 
-            int headerSizeDiff = header.HeaderSize - (int)header.ReadBytes;
+            int headerSizeDiff = header.HeaderSize - (int) header.ReadBytes;
 
             if (headerSizeDiff > 0)
             {

SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs

@@ -7,27 +7,24 @@ namespace SharpCompress.Common.Rar.Headers
 {
     internal class RarHeaderFactory
     {
-        private const int MAX_SFX_SIZE = 0x80000 - 16; //archive.cpp line 136
+        private int MAX_SFX_SIZE = 0x80000 - 16; //archive.cpp line 136
 
-        internal RarHeaderFactory(StreamingMode mode, Options options, string password = null)
+        internal RarHeaderFactory(StreamingMode mode, Options options)
         {
             StreamingMode = mode;
             Options = options;
-            Password = password;
         }
 
         private Options Options { get; set; }
-        public string Password { get; private set; }
+
         internal StreamingMode StreamingMode { get; private set; }
-        internal bool IsEncrypted { get; private set; }
-        
+
         internal IEnumerable<RarHeader> ReadHeaders(Stream stream)
         {
             if (Options.HasFlag(Options.LookForHeader))
             {
                 stream = CheckSFX(stream);
             }
-
             RarHeader header;
             while ((header = ReadNextHeader(stream)) != null)
             {
@@ -93,11 +90,7 @@ namespace SharpCompress.Common.Rar.Headers
             {
                 if (!Options.HasFlag(Options.KeepStreamsOpen))
                 {
-#if NET2
-                    reader.Close();
-#else
                     reader.Dispose();
-#endif
                 }
                 throw new InvalidFormatException("Error trying to read rar signature.", e);
             }
@@ -114,26 +107,9 @@ namespace SharpCompress.Common.Rar.Headers
             return rewindableStream;
         }
 
-
         private RarHeader ReadNextHeader(Stream stream)
         {
-#if PORTABLE
-            var reader = new MarkingBinaryReader(stream);
-#else
-            var reader = new RarCryptoBinaryReader(stream, Password);
-            
-            if (IsEncrypted)
-            {
-                if (Password == null)
-                {
-                    throw new CryptographicException("Encrypted Rar archive has no password specified.");
-                }
-                reader.SkipQueue();
-                byte[] salt = reader.ReadBytes(8);
-                reader.InitializeAes(salt);
-            }
-#endif
-
+            MarkingBinaryReader reader = new MarkingBinaryReader(stream);
             RarHeader header = RarHeader.Create(reader);
             if (header == null)
             {
@@ -143,41 +119,12 @@ namespace SharpCompress.Common.Rar.Headers
             {
                 case HeaderType.ArchiveHeader:
                     {
-                        var ah = header.PromoteHeader<ArchiveHeader>(reader);
-                        IsEncrypted = ah.HasPassword;
-                        return ah;
+                        return header.PromoteHeader<ArchiveHeader>(reader);
                     }
                 case HeaderType.MarkHeader:
                     {
                         return header.PromoteHeader<MarkHeader>(reader);
                     }
-
-                case HeaderType.ProtectHeader:
-                    {
-                        ProtectHeader ph = header.PromoteHeader<ProtectHeader>(reader);
-                        
-                        // skip the recovery record data, we do not use it.
-                        switch (StreamingMode)
-                        {
-                            case StreamingMode.Seekable:
-                                {
-                                    reader.BaseStream.Position += ph.DataSize;
-                                }
-                                break;
-                            case StreamingMode.Streaming:
-                                {
-                                    reader.BaseStream.Skip(ph.DataSize);
-                                }
-                                break;
-                            default:
-                                {
-                                    throw new InvalidFormatException("Invalid StreamingMode");
-                                }
-                        }
-
-                        return ph;
-                    }
-
                 case HeaderType.NewSubHeader:
                     {
                         FileHeader fh = header.PromoteHeader<FileHeader>(reader);
@@ -215,19 +162,9 @@ namespace SharpCompress.Common.Rar.Headers
                                 break;
                             case StreamingMode.Streaming:
                                 {
-                                    var ms = new ReadOnlySubStream(reader.BaseStream, fh.CompressedSize);
-                                    if (fh.Salt == null)
-                                    {
-                                        fh.PackedStream = ms;
-                                    }
-                                    else
-                                    {
-#if PORTABLE
-                                        throw new NotSupportedException("Encrypted Rar files aren't supported in portable distro.");
-#else
-                                        fh.PackedStream = new RarCryptoWrapper(ms, Password,  fh.Salt);
-#endif
-                                    }
+                                    ReadOnlySubStream ms
+                                        = new ReadOnlySubStream(reader.BaseStream, fh.CompressedSize);
+                                    fh.PackedStream = ms;
                                 }
                                 break;
                             default:

SharpCompress/Common/Rar/RarCryptoBinaryReader.cs

@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarCryptoBinaryReader : MarkingBinaryReader
-    {
-        private RarRijndael rijndael;
-        private byte[] salt;
-        private readonly string password;
-        private readonly Queue<byte> data = new Queue<byte>();
-
-        public RarCryptoBinaryReader(Stream stream, string password )
-            : base(stream)
-        {
-            this.password = password;
-        }
-
-        protected bool UseEncryption
-        {
-            get { return salt != null; }
-        }
-
-        internal void InitializeAes(byte[] salt)
-        {
-            this.salt = salt;
-            rijndael = RarRijndael.InitializeFrom(password, salt);
-        }
-
-        public override byte[] ReadBytes(int count)
-        {
-            if (UseEncryption)
-            {
-                return ReadAndDecryptBytes(count);
-            }
-            return base.ReadBytes(count);
-        }
-
-        private byte[] ReadAndDecryptBytes(int count)
-        {
-            int queueSize = data.Count;
-            int sizeToRead = count - queueSize;
-
-            if (sizeToRead > 0)
-            {
-                int alignedSize = sizeToRead + ((~sizeToRead + 1) & 0xf);
-                for (int i = 0; i < alignedSize / 16; i++)
-                {
-                    //long ax = System.currentTimeMillis();
-                    byte[] cipherText = base.ReadBytes(16);
-                    var readBytes = rijndael.ProcessBlock(cipherText);
-                    foreach (var readByte in readBytes)
-                        data.Enqueue(readByte);
-
-                }
-
-            }
-
-            var decryptedBytes = new byte[count];
-
-            for (int i = 0; i < count; i++)
-            {
-                decryptedBytes[i] = data.Dequeue();
-            }
-            return decryptedBytes;
-        }
-
-        public void ClearQueue()
-        {
-            data.Clear();
-        }
-
-        public void SkipQueue()
-        {
-            var position = BaseStream.Position;
-            BaseStream.Position = position + data.Count;
-            ClearQueue();
-        }
-    }
-}

SharpCompress/Common/Rar/RarCryptoWrapper.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarCryptoWrapper : Stream
-    {
-        private readonly Stream actualStream;
-        private readonly byte[] salt;
-        private RarRijndael rijndael;
-        private readonly Queue<byte> data = new Queue<byte>();
-
-        public RarCryptoWrapper(Stream actualStream, string password, byte[] salt)
-        {
-            this.actualStream = actualStream;
-            this.salt = salt;
-            rijndael = RarRijndael.InitializeFrom(password, salt);
-        }
-
-        public override void Flush()
-        {
-            throw new NotSupportedException();
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (salt == null)
-            {
-                return actualStream.Read(buffer, offset, count);
-            }
-            return ReadAndDecrypt(buffer, offset, count);
-        }
-
-        public int ReadAndDecrypt(byte[] buffer, int offset, int count)
-        {
-            int queueSize = data.Count;
-            int sizeToRead = count - queueSize;
-
-            if (sizeToRead > 0)
-            {
-                int alignedSize = sizeToRead + ((~sizeToRead + 1) & 0xf);
-                for (int i = 0; i < alignedSize / 16; i++)
-                {
-                    //long ax = System.currentTimeMillis();
-                    byte[] cipherText = new byte[RarRijndael.CRYPTO_BLOCK_SIZE];
-                    actualStream.Read(cipherText, 0, RarRijndael.CRYPTO_BLOCK_SIZE);
-
-                    var readBytes = rijndael.ProcessBlock(cipherText);
-                    foreach (var readByte in readBytes)
-                        data.Enqueue(readByte);
-
-                }
-
-                for (int i = 0; i < count; i++)
-                    buffer[offset + i] = data.Dequeue();
-            }
-            return count;
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        public override long Position { get; set; }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (rijndael != null)
-            {
-                rijndael.Dispose();
-                rijndael = null;
-            }
-            base.Dispose(disposing);
-        }
-    }
-}

SharpCompress/Common/Rar/RarEntry.cs

@@ -10,7 +10,7 @@ namespace SharpCompress.Common.Rar
         /// <summary>
         /// The File's 32 bit CRC Hash
         /// </summary>
-        public override long Crc
+        public override uint Crc
         {
             get { return FileHeader.FileCRC; }
         }
@@ -18,7 +18,7 @@ namespace SharpCompress.Common.Rar
         /// <summary>
         /// The path of the file internal to the Rar Archive.
         /// </summary>
-        public override string Key
+        public override string FilePath
         {
             get { return FileHeader.FileName; }
         }
@@ -79,7 +79,7 @@ namespace SharpCompress.Common.Rar
         public override string ToString()
         {
             return string.Format("Entry Path: {0} Compressed Size: {1} Uncompressed Size: {2} CRC: {3}",
-                                 Key, CompressedSize, Size, Crc);
+                                 FilePath, CompressedSize, Size, Crc);
         }
     }
 }

SharpCompress/Common/Rar/RarRijndael.Portable.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Engines;
-using Org.BouncyCastle.Crypto.Parameters;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarRijndael : IDisposable
-    {
-        internal const int CRYPTO_BLOCK_SIZE = 16;
-
-        private readonly string password;
-        private readonly byte[] salt;
-        private byte[] aesInitializationVector;
-        private RijndaelEngine rijndael;
-
-        private RarRijndael(string password, byte[] salt)
-        {
-            this.password = password;
-            this.salt = salt;
-        }
-
-        private byte[] ComputeHash(byte[] input)
-        {
-            var sha = new Sha1Digest();
-            sha.BlockUpdate(input, 0, input.Length);
-            byte[] result = new byte[sha.GetDigestSize()];
-            sha.DoFinal(result, 0);
-            return result;
-        }
-
-        private void Initialize()
-        {
-
-            rijndael = new RijndaelEngine();
-            aesInitializationVector = new byte[CRYPTO_BLOCK_SIZE];
-            int rawLength = 2 * password.Length;
-            byte[] rawPassword = new byte[rawLength + 8];
-            byte[] passwordBytes = Encoding.UTF8.GetBytes(password);
-            for (int i = 0; i < password.Length; i++)
-            {
-                rawPassword[i * 2] = passwordBytes[i];
-                rawPassword[i * 2 + 1] = 0;
-            }
-            for (int i = 0; i < salt.Length; i++)
-            {
-                rawPassword[i + rawLength] = salt[i];
-            }
-
-
-            const int noOfRounds = (1 << 18);
-            IList<byte> bytes = new List<byte>();
-            byte[] digest;
-
-            //TODO slow code below, find ways to optimize
-            for (int i = 0; i < noOfRounds; i++)
-            {
-                bytes.AddRange(rawPassword);
-
-                bytes.AddRange(new[] { (byte)i, (byte)(i >> 8), (byte)(i >> CRYPTO_BLOCK_SIZE) });
-                if (i % (noOfRounds / CRYPTO_BLOCK_SIZE) == 0)
-                {
-                    digest = ComputeHash(bytes.ToArray());
-                    aesInitializationVector[i / (noOfRounds / CRYPTO_BLOCK_SIZE)] = digest[19];
-                }
-            }
-
-            digest = ComputeHash(bytes.ToArray());
-            //slow code ends
-
-            byte[] aesKey = new byte[CRYPTO_BLOCK_SIZE];
-            for (int i = 0; i < 4; i++)
-                for (int j = 0; j < 4; j++)
-                    aesKey[i * 4 + j] = (byte)
-                        (((digest[i * 4] * 0x1000000) & 0xff000000 |
-                        (uint)((digest[i * 4 + 1] * 0x10000) & 0xff0000) |
-                          (uint)((digest[i * 4 + 2] * 0x100) & 0xff00) |
-                          (uint)(digest[i * 4 + 3] & 0xff)) >> (j * 8));
-
-
-            rijndael.Init(false, new KeyParameter(aesKey));
-
-        }
-
-        public static RarRijndael InitializeFrom(string password, byte[] salt)
-        {
-            var rijndael = new RarRijndael(password, salt);
-            rijndael.Initialize();
-            return rijndael;
-        }
-
-        public byte[] ProcessBlock(byte[] cipherText)
-        {
-            var plainText = new byte[CRYPTO_BLOCK_SIZE];
-            var decryptedBytes = new List<byte>();
-            rijndael.ProcessBlock(cipherText, 0, plainText, 0);
-
-            for (int j = 0; j < plainText.Length; j++)
-                decryptedBytes.Add((byte)(plainText[j] ^ aesInitializationVector[j % 16])); //32:114, 33:101
-
-            for (int j = 0; j < aesInitializationVector.Length; j++)
-                aesInitializationVector[j] = cipherText[j];
-            return decryptedBytes.ToArray();
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}

SharpCompress/Common/Rar/RarRijndael.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarRijndael : IDisposable
-    {
-        internal const int CRYPTO_BLOCK_SIZE = 16;
-        private readonly string password;
-        private readonly byte[] salt;
-        private byte[] aesInitializationVector;
-        private Rijndael rijndael;
-
-        private RarRijndael(string password, byte[] salt)
-        {
-            this.password = password;
-            this.salt = salt;
-        }
-
-        private void Initialize()
-        {
-
-            rijndael = new RijndaelManaged() { Padding = PaddingMode.None };
-            aesInitializationVector = new byte[CRYPTO_BLOCK_SIZE];
-            int rawLength = 2 * password.Length;
-            byte[] rawPassword = new byte[rawLength + 8];
-            byte[] passwordBytes = Encoding.Unicode.GetBytes(password);
-            for (int i = 0; i < rawLength; i++)
-            {
-                rawPassword[i] = passwordBytes[i];
-            }
-            for (int i = 0; i < salt.Length; i++)
-            {
-                rawPassword[i + rawLength] = salt[i];
-            }
-
-            SHA1 sha = new SHA1CryptoServiceProvider();
-
-            const int noOfRounds = (1 << 18);
-            IList<byte> bytes = new List<byte>();
-            byte[] digest;
-
-            //TODO slow code below, find ways to optimize
-            for (int i = 0; i < noOfRounds; i++)
-            {
-                bytes.AddRange(rawPassword);
-
-                bytes.AddRange(new[] { (byte)i, (byte)(i >> 8), (byte)(i >> CRYPTO_BLOCK_SIZE) });
-                if (i % (noOfRounds / CRYPTO_BLOCK_SIZE) == 0)
-                {
-                    digest = sha.ComputeHash(bytes.ToArray());
-                    aesInitializationVector[i / (noOfRounds / CRYPTO_BLOCK_SIZE)] = digest[19];
-                }
-            }
-
-            digest = sha.ComputeHash(bytes.ToArray());
-            //slow code ends
-
-            byte[] aesKey = new byte[CRYPTO_BLOCK_SIZE];
-            for (int i = 0; i < 4; i++)
-                for (int j = 0; j < 4; j++)
-                    aesKey[i * 4 + j] = (byte)
-                        (((digest[i * 4] * 0x1000000) & 0xff000000 |
-                        (uint)((digest[i * 4 + 1] * 0x10000) & 0xff0000) |
-                          (uint)((digest[i * 4 + 2] * 0x100) & 0xff00) |
-                          (uint)(digest[i * 4 + 3] & 0xff)) >> (j * 8));
-
-            rijndael.IV = new byte[CRYPTO_BLOCK_SIZE];
-            rijndael.Key = aesKey;
-            rijndael.BlockSize = CRYPTO_BLOCK_SIZE * 8;
-
-        }
-
-        public static RarRijndael InitializeFrom(string password, byte[] salt)
-        {
-            var rijndael = new RarRijndael(password, salt);
-            rijndael.Initialize();
-            return rijndael;
-        }
-
-        public byte[] ProcessBlock(byte[] cipherText)
-        {
-            var plainText = new byte[CRYPTO_BLOCK_SIZE];
-            var decryptedBytes = new List<byte>();
-            var decryptor = rijndael.CreateDecryptor();
-            using (var msDecrypt = new MemoryStream(cipherText))
-            {
-                using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
-                {
-                    csDecrypt.ReadFully(plainText);
-                }
-            }
-
-            for (int j = 0; j < plainText.Length; j++)
-                decryptedBytes.Add((byte)(plainText[j] ^ aesInitializationVector[j % 16])); //32:114, 33:101
-
-            for (int j = 0; j < aesInitializationVector.Length; j++)
-                aesInitializationVector[j] = cipherText[j];
-            return decryptedBytes.ToArray();
-        }
-
-        public void Dispose()
-        {
-            ((IDisposable)rijndael).Dispose();
-        }
-    }
-}

SharpCompress/Common/Rar/RarVolume.cs

@@ -13,16 +13,13 @@ namespace SharpCompress.Common.Rar
     public abstract class RarVolume : Volume
     {
         private readonly RarHeaderFactory headerFactory;
-            
-        internal RarVolume(StreamingMode mode, Stream stream, string password, Options options)
+
+        internal RarVolume(StreamingMode mode, Stream stream, Options options)
             : base(stream, options)
         {
-            headerFactory = new RarHeaderFactory(mode, options, password);
-            Password = password;
+            headerFactory = new RarHeaderFactory(mode, options);
         }
 
-        internal string Password { get; private set; }
-
         internal StreamingMode Mode
         {
             get { return headerFactory.StreamingMode; }

SharpCompress/Common/ReaderExtractionEventArgs.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class ReaderExtractionEventArgs<T> : EventArgs
-    {
-        internal ReaderExtractionEventArgs(T entry)
-        {
-            Item = entry;
-        }
-        public T Item { get; private set; }
-    }
-}

SharpCompress/Common/SevenZip/ArchiveReader.cs

@@ -67,9 +67,8 @@ namespace SharpCompress.Common.SevenZip
             ulong id = _currentReader.ReadNumber();
             if (id > 25)
                 return null;
-#if DEBUG
+
             Log.WriteLine("ReadId: {0}", (BlockType)id);
-#endif
             return (BlockType)id;
         }
 
@@ -160,7 +159,7 @@ namespace SharpCompress.Common.SevenZip
         private DateTime TranslateTime(long time)
         {
             // FILETIME = 100-nanosecond intervals since January 1, 1601 (UTC)
-            return DateTime.FromFileTimeUtc(time).ToLocalTime();
+            return DateTime.FromFileTimeUtc(time);
         }
 
         private DateTime? TranslateTime(long? time)
@@ -198,25 +197,20 @@ namespace SharpCompress.Common.SevenZip
 
         private void GetNextFolderItem(CFolder folder)
         {
-#if DEBUG
             Log.WriteLine("-- GetNextFolderItem --");
             Log.PushIndent();
-#endif
             try
             {
                 int numCoders = ReadNum();
-#if DEBUG
                 Log.WriteLine("NumCoders: " + numCoders);
-#endif
+
                 folder.Coders = new List<CCoderInfo>(numCoders);
                 int numInStreams = 0;
                 int numOutStreams = 0;
                 for (int i = 0; i < numCoders; i++)
                 {
-#if DEBUG
                     Log.WriteLine("-- Coder --");
                     Log.PushIndent();
-#endif
                     try
                     {
                         CCoderInfo coder = new CCoderInfo();
@@ -226,9 +220,11 @@ namespace SharpCompress.Common.SevenZip
                         int idSize = (mainByte & 0xF);
                         byte[] longID = new byte[idSize];
                         ReadBytes(longID, 0, idSize);
-#if DEBUG
-                        Log.WriteLine("MethodId: " + String.Join("", Enumerable.Range(0, idSize).Select(x => longID[x].ToString("x2")).ToArray()));
-#endif
+                        Log.WriteLine("MethodId: " +
+                                      String.Join("",
+                                                  Enumerable.Range(0, idSize)
+                                                            .Select(x => longID[x].ToString("x2"))
+                                                            .ToArray()));
                         if (idSize > 8)
                             throw new NotSupportedException();
                         ulong id = 0;
@@ -240,15 +236,12 @@ namespace SharpCompress.Common.SevenZip
                         {
                             coder.NumInStreams = ReadNum();
                             coder.NumOutStreams = ReadNum();
-#if DEBUG
-                            Log.WriteLine("Complex Stream (In: " + coder.NumInStreams + " - Out: " + coder.NumOutStreams + ")");
-#endif
+                            Log.WriteLine("Complex Stream (In: " + coder.NumInStreams + " - Out: " + coder.NumOutStreams +
+                                          ")");
                         }
                         else
                         {
-#if DEBUG
                             Log.WriteLine("Simple Stream (In: 1 - Out: 1)");
-#endif
                             coder.NumInStreams = 1;
                             coder.NumOutStreams = 1;
                         }
@@ -258,9 +251,8 @@ namespace SharpCompress.Common.SevenZip
                             int propsSize = ReadNum();
                             coder.Props = new byte[propsSize];
                             ReadBytes(coder.Props, 0, propsSize);
-#if DEBUG
-                            Log.WriteLine("Settings: " + String.Join("", coder.Props.Select(bt => bt.ToString("x2")).ToArray()));
-#endif
+                            Log.WriteLine("Settings: " +
+                                          String.Join("", coder.Props.Select(bt => bt.ToString("x2")).ToArray()));
                         }
 
                         if ((mainByte & 0x80) != 0)
@@ -271,31 +263,23 @@ namespace SharpCompress.Common.SevenZip
                     }
                     finally
                     {
-#if DEBUG
                         Log.PopIndent();
-#endif
                     }
                 }
 
                 int numBindPairs = numOutStreams - 1;
                 folder.BindPairs = new List<CBindPair>(numBindPairs);
-#if DEBUG
                 Log.WriteLine("BindPairs: " + numBindPairs);
                 Log.PushIndent();
-#endif
                 for (int i = 0; i < numBindPairs; i++)
                 {
                     CBindPair bp = new CBindPair();
                     bp.InIndex = ReadNum();
                     bp.OutIndex = ReadNum();
                     folder.BindPairs.Add(bp);
-#if DEBUG
                     Log.WriteLine("#" + i + " - In: " + bp.InIndex + " - Out: " + bp.OutIndex);
-#endif
                 }
-#if DEBUG
                 Log.PopIndent();
-#endif
 
                 if (numInStreams < numBindPairs)
                     throw new NotSupportedException();
@@ -308,9 +292,7 @@ namespace SharpCompress.Common.SevenZip
                     {
                         if (folder.FindBindPairForInStream(i) < 0)
                         {
-#if DEBUG
                             Log.WriteLine("Single PackStream: #" + i);
-#endif
                             folder.PackStreams.Add(i);
                             break;
                         }
@@ -321,36 +303,26 @@ namespace SharpCompress.Common.SevenZip
                 }
                 else
                 {
-#if DEBUG
                     Log.WriteLine("Multiple PackStreams ...");
                     Log.PushIndent();
-#endif
                     for (int i = 0; i < numPackStreams; i++)
                     {
                         var num = ReadNum();
-#if DEBUG
                         Log.WriteLine("#" + i + " - " + num);
-#endif
                         folder.PackStreams.Add(num);
                     }
-#if DEBUG
                     Log.PopIndent();
-#endif
                 }
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
         private List<uint?> ReadHashDigests(int count)
         {
-#if DEBUG
             Log.Write("ReadHashDigests:");
-#endif
 
             var defined = ReadOptionalBitVector(count);
             var digests = new List<uint?>(count);
@@ -359,62 +331,44 @@ namespace SharpCompress.Common.SevenZip
                 if (defined[i])
                 {
                     uint crc = ReadUInt32();
-#if DEBUG
                     Log.Write("  " + crc.ToString("x8"));
-#endif
                     digests.Add(crc);
                 }
                 else
                 {
-#if DEBUG
                     Log.Write("  ########");
-#endif
                     digests.Add(null);
                 }
             }
-#if DEBUG
 
             Log.WriteLine();
-#endif
             return digests;
         }
 
         private void ReadPackInfo(out long dataOffset, out List<long> packSizes, out List<uint?> packCRCs)
         {
-#if DEBUG
             Log.WriteLine("-- ReadPackInfo --");
             Log.PushIndent();
-#endif
             try
             {
                 packCRCs = null;
 
                 dataOffset = checked((long)ReadNumber());
-#if DEBUG
                 Log.WriteLine("DataOffset: " + dataOffset);
-#endif
 
                 int numPackStreams = ReadNum();
-#if DEBUG
                 Log.WriteLine("NumPackStreams: " + numPackStreams);
-#endif
 
                 WaitAttribute(BlockType.Size);
                 packSizes = new List<long>(numPackStreams);
-#if DEBUG
                 Log.Write("Sizes:");
-#endif
                 for (int i = 0; i < numPackStreams; i++)
                 {
                     var size = checked((long)ReadNumber());
-#if DEBUG
                     Log.Write("  " + size);
-#endif
                     packSizes.Add(size);
                 }
-#if DEBUG
                 Log.WriteLine();
-#endif
 
                 BlockType? type;
                 for (; ; )
@@ -439,25 +393,19 @@ namespace SharpCompress.Common.SevenZip
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
         private void ReadUnpackInfo(List<byte[]> dataVector, out List<CFolder> folders)
         {
-#if DEBUG
             Log.WriteLine("-- ReadUnpackInfo --");
             Log.PushIndent();
-#endif
             try
             {
                 WaitAttribute(BlockType.Folder);
                 int numFolders = ReadNum();
-#if DEBUG
                 Log.WriteLine("NumFolders: {0}", numFolders);
-#endif
 
                 using (CStreamSwitch streamSwitch = new CStreamSwitch())
                 {
@@ -476,27 +424,20 @@ namespace SharpCompress.Common.SevenZip
                 }
 
                 WaitAttribute(BlockType.CodersUnpackSize);
-#if DEBUG
+
                 Log.WriteLine("UnpackSizes:");
-#endif
                 for (int i = 0; i < numFolders; i++)
                 {
                     CFolder folder = folders[i];
-#if DEBUG
                     Log.Write("  #" + i + ":");
-#endif
                     int numOutStreams = folder.GetNumOutStreams();
                     for (int j = 0; j < numOutStreams; j++)
                     {
                         long size = checked((long)ReadNumber());
-#if DEBUG
                         Log.Write("  " + size);
-#endif
                         folder.UnpackSizes.Add(size);
                     }
-#if DEBUG
                     Log.WriteLine();
-#endif
                 }
 
                 for (; ; )
@@ -518,19 +459,15 @@ namespace SharpCompress.Common.SevenZip
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
         private void ReadSubStreamsInfo(List<CFolder> folders, out List<int> numUnpackStreamsInFolders,
                                         out List<long> unpackSizes, out List<uint?> digests)
         {
-#if DEBUG
             Log.WriteLine("-- ReadSubStreamsInfo --");
             Log.PushIndent();
-#endif
             try
             {
                 numUnpackStreamsInFolders = null;
@@ -542,20 +479,14 @@ namespace SharpCompress.Common.SevenZip
                     if (type == BlockType.NumUnpackStream)
                     {
                         numUnpackStreamsInFolders = new List<int>(folders.Count);
-#if DEBUG
                         Log.Write("NumUnpackStreams:");
-#endif
                         for (int i = 0; i < folders.Count; i++)
                         {
                             var num = ReadNum();
-#if DEBUG
                             Log.Write("  " + num);
-#endif
                             numUnpackStreamsInFolders.Add(num);
                         }
-#if DEBUG
                         Log.WriteLine();
-#endif
                         continue;
                     }
                     if (type == BlockType.CRC || type == BlockType.Size)
@@ -580,26 +511,21 @@ namespace SharpCompress.Common.SevenZip
                     int numSubstreams = numUnpackStreamsInFolders[i];
                     if (numSubstreams == 0)
                         continue;
-#if DEBUG
+
                     Log.Write("#{0} StreamSizes:", i);
-#endif
                     long sum = 0;
                     for (int j = 1; j < numSubstreams; j++)
                     {
                         if (type == BlockType.Size)
                         {
                             long size = checked((long)ReadNumber());
-#if DEBUG
                             Log.Write("  " + size);
-#endif
                             unpackSizes.Add(size);
                             sum += size;
                         }
                     }
                     unpackSizes.Add(folders[i].GetUnpackSize() - sum);
-#if DEBUG
                     Log.WriteLine("  -  rest: " + unpackSizes.Last());
-#endif
                 }
                 if (type == BlockType.Size)
                     type = ReadId();
@@ -663,9 +589,7 @@ namespace SharpCompress.Common.SevenZip
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
@@ -679,10 +603,8 @@ namespace SharpCompress.Common.SevenZip
             out List<long> unpackSizes,
             out List<uint?> digests)
         {
-#if DEBUG
             Log.WriteLine("-- ReadStreamsInfo --");
             Log.PushIndent();
-#endif
             try
             {
                 dataOffset = long.MinValue;
@@ -715,18 +637,14 @@ namespace SharpCompress.Common.SevenZip
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
         private List<byte[]> ReadAndDecodePackedStreams(long baseOffset, IPasswordProvider pass)
         {
-#if DEBUG
             Log.WriteLine("-- ReadAndDecodePackedStreams --");
             Log.PushIndent();
-#endif
             try
             {
                 long dataStartPos;
@@ -779,18 +697,14 @@ namespace SharpCompress.Common.SevenZip
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
         private void ReadHeader(ArchiveDatabase db, IPasswordProvider getTextPassword)
         {
-#if DEBUG
             Log.WriteLine("-- ReadHeader --");
             Log.PushIndent();
-#endif
             try
             {
                 BlockType? type = ReadId();
@@ -848,9 +762,7 @@ namespace SharpCompress.Common.SevenZip
                     throw new InvalidOperationException();
 
                 int numFiles = ReadNum();
-#if DEBUG
                 Log.WriteLine("NumFiles: " + numFiles);
-#endif
                 db.Files = new List<CFileItem>(numFiles);
                 for (int i = 0; i < numFiles; i++)
                     db.Files.Add(new CFileItem());
@@ -874,147 +786,112 @@ namespace SharpCompress.Common.SevenZip
                             using (var streamSwitch = new CStreamSwitch())
                             {
                                 streamSwitch.Set(this, dataVector);
-#if DEBUG
                                 Log.Write("FileNames:");
-#endif
                                 for (int i = 0; i < db.Files.Count; i++)
                                 {
                                     db.Files[i].Name = _currentReader.ReadString();
-#if DEBUG
                                     Log.Write("  " + db.Files[i].Name);
-#endif
                                 }
-#if DEBUG
                                 Log.WriteLine();
-#endif
                             }
                             break;
                         case BlockType.WinAttributes:
-#if DEBUG
                             Log.Write("WinAttributes:");
-#endif
                             ReadAttributeVector(dataVector, numFiles, delegate(int i, uint? attr)
                                                                           {
                                                                               db.Files[i].Attrib = attr;
-#if DEBUG
-                                                                              Log.Write("  " + (attr.HasValue ? attr.Value.ToString("x8") : "n/a"));
-#endif
+                                                                              Log.Write("  " +
+                                                                                        (attr.HasValue
+                                                                                             ? attr.Value.ToString("x8")
+                                                                                             : "n/a"));
                                                                           });
-#if DEBUG
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.EmptyStream:
                             emptyStreamVector = ReadBitVector(numFiles);
-#if DEBUG
 
                             Log.Write("EmptyStream: ");
-#endif
                             for (int i = 0; i < emptyStreamVector.Length; i++)
                             {
                                 if (emptyStreamVector[i])
                                 {
-#if DEBUG
                                     Log.Write("x");
-#endif
                                     numEmptyStreams++;
                                 }
                                 else
                                 {
-#if DEBUG
                                     Log.Write(".");
-#endif
                                 }
                             }
-#if DEBUG
                             Log.WriteLine();
-#endif
 
                             emptyFileVector = new BitVector(numEmptyStreams);
                             antiFileVector = new BitVector(numEmptyStreams);
                             break;
                         case BlockType.EmptyFile:
                             emptyFileVector = ReadBitVector(numEmptyStreams);
-#if DEBUG
                             Log.Write("EmptyFile: ");
                             for (int i = 0; i < numEmptyStreams; i++)
                                 Log.Write(emptyFileVector[i] ? "x" : ".");
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.Anti:
                             antiFileVector = ReadBitVector(numEmptyStreams);
-#if DEBUG
                             Log.Write("Anti: ");
                             for (int i = 0; i < numEmptyStreams; i++)
                                 Log.Write(antiFileVector[i] ? "x" : ".");
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.StartPos:
-#if DEBUG
                             Log.Write("StartPos:");
-#endif
                             ReadNumberVector(dataVector, numFiles, delegate(int i, long? startPos)
                                                                        {
                                                                            db.Files[i].StartPos = startPos;
-#if DEBUG
-                                                                           Log.Write("  " + (startPos.HasValue ? startPos.Value.ToString() : "n/a"));
-#endif
+                                                                           Log.Write("  " +
+                                                                                     (startPos.HasValue
+                                                                                          ? startPos.Value.ToString()
+                                                                                          : "n/a"));
                                                                        });
-#if DEBUG
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.CTime:
-#if DEBUG
                             Log.Write("CTime:");
-#endif
                             ReadDateTimeVector(dataVector, numFiles, delegate(int i, DateTime? time)
                                                                          {
                                                                              db.Files[i].CTime = time;
-#if DEBUG
-                                                                             Log.Write("  " + (time.HasValue ? time.Value.ToString() : "n/a"));
-#endif
+                                                                             Log.Write("  " +
+                                                                                       (time.HasValue
+                                                                                            ? time.Value.ToString()
+                                                                                            : "n/a"));
                                                                          });
-#if DEBUG
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.ATime:
-#if DEBUG
                             Log.Write("ATime:");
-#endif
                             ReadDateTimeVector(dataVector, numFiles, delegate(int i, DateTime? time)
                                                                          {
                                                                              db.Files[i].ATime = time;
-#if DEBUG
-                                                                             Log.Write("  " + (time.HasValue ? time.Value.ToString() : "n/a"));
-#endif
+                                                                             Log.Write("  " +
+                                                                                       (time.HasValue
+                                                                                            ? time.Value.ToString()
+                                                                                            : "n/a"));
                                                                          });
-#if DEBUG
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.MTime:
-#if DEBUG
                             Log.Write("MTime:");
-#endif
                             ReadDateTimeVector(dataVector, numFiles, delegate(int i, DateTime? time)
                                                                          {
                                                                              db.Files[i].MTime = time;
-#if DEBUG
-                                                                             Log.Write("  " + (time.HasValue ? time.Value.ToString() : "n/a"));
-#endif
+                                                                             Log.Write("  " +
+                                                                                       (time.HasValue
+                                                                                            ? time.Value.ToString()
+                                                                                            : "n/a"));
                                                                          });
-#if DEBUG
                             Log.WriteLine();
-#endif
                             break;
                         case BlockType.Dummy:
-#if DEBUG
                             Log.Write("Dummy: " + size);
-#endif
                             for (long j = 0; j < size; j++)
                                 if (ReadByte() != 0)
                                     throw new InvalidOperationException();
@@ -1056,9 +933,7 @@ namespace SharpCompress.Common.SevenZip
             }
             finally
             {
-#if DEBUG
                 Log.PopIndent();
-#endif
             }
         }
 
@@ -1214,48 +1089,48 @@ namespace SharpCompress.Common.SevenZip
 
             public override bool CanRead
             {
-                get { return true; }
+                get { throw new NotImplementedException(); }
             }
 
             public override bool CanSeek
             {
-                get { return false; }
+                get { throw new NotImplementedException(); }
             }
 
             public override bool CanWrite
             {
-                get { return false; }
+                get { throw new NotImplementedException(); }
             }
 
             public override void Flush()
             {
-                throw new NotSupportedException();
+                throw new NotImplementedException();
             }
 
             public override long Length
             {
-                get { throw new NotSupportedException(); }
+                get { throw new NotImplementedException(); }
             }
 
             public override long Position
             {
-                get { throw new NotSupportedException(); }
-                set { throw new NotSupportedException(); }
+                get { throw new NotImplementedException(); }
+                set { throw new NotImplementedException(); }
             }
 
             public override int Read(byte[] buffer, int offset, int count)
             {
-                throw new NotSupportedException();
+                throw new NotImplementedException();
             }
 
             public override long Seek(long offset, SeekOrigin origin)
             {
-                throw new NotSupportedException();
+                throw new NotImplementedException();
             }
 
             public override void SetLength(long value)
             {
-                throw new NotSupportedException();
+                throw new NotImplementedException();
             }
 
             private Stream _stream;
@@ -1281,9 +1156,7 @@ namespace SharpCompress.Common.SevenZip
                 //string filename = @"D:\_testdump\" + _db.Files[index].Name;
                 //Directory.CreateDirectory(Path.GetDirectoryName(filename));
                 //_stream = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.Delete);
-#if DEBUG
                 Log.WriteLine(_db.Files[index].Name);
-#endif
                 if (_db.Files[index].CrcDefined)
                     _stream = new CrcCheckStream(_db.Files[index].Crc.Value);
                 else
@@ -1319,7 +1192,7 @@ namespace SharpCompress.Common.SevenZip
                         {
                             // we support partial extracting
                             System.Diagnostics.Debugger.Break();
-                            throw new NotSupportedException();
+                            throw new NotImplementedException();
                         }
                         OpenFile();
                     }

SharpCompress/Common/SevenZip/CStreamSwitch.cs

@@ -16,9 +16,7 @@ namespace SharpCompress.Common.SevenZip
             if (_active)
             {
                 _active = false;
-#if DEBUG
                 Log.WriteLine("[end of switch]");
-#endif
             }
 
             if (_needRemove)
@@ -49,9 +47,7 @@ namespace SharpCompress.Common.SevenZip
                 if (dataIndex < 0 || dataIndex >= dataVector.Count)
                     throw new InvalidOperationException();
 
-#if DEBUG
                 Log.WriteLine("[switch to stream {0}]", dataIndex);
-#endif
                 _archive = archive;
                 _archive.AddByteStream(dataVector[dataIndex], 0, dataVector[dataIndex].Length);
                 _needRemove = true;
@@ -59,9 +55,7 @@ namespace SharpCompress.Common.SevenZip
             }
             else
             {
-#if DEBUG
                 Log.WriteLine("[inline data]");
-#endif
             }
         }
     }

SharpCompress/Common/SevenZip/DataReader.cs

@@ -78,9 +78,7 @@ namespace SharpCompress.Common.SevenZip
                 throw new EndOfStreamException();
 
             _offset += (int) size;
-#if DEBUG
             Log.WriteLine("SkipData {0}", size);
-#endif
         }
 
         public void SkipData()

SharpCompress/Common/SevenZip/SevenZipEntry.cs

@@ -17,12 +17,12 @@ namespace SharpCompress.Common.SevenZip
             get { return FilePart.CompressionType; }
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return FilePart.Header.Crc ?? 0; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return FilePart.Header.Name; }
         }
@@ -39,22 +39,22 @@ namespace SharpCompress.Common.SevenZip
 
         public override DateTime? LastModifiedTime
         {
-            get { return FilePart.Header.MTime; }
+            get { throw new NotImplementedException(); }
         }
 
         public override DateTime? CreatedTime
         {
-            get { return null; }
+            get { throw new NotImplementedException(); }
         }
 
         public override DateTime? LastAccessedTime
         {
-            get { return null; }
+            get { throw new NotImplementedException(); }
         }
 
         public override DateTime? ArchivedTime
         {
-            get { return null; }
+            get { throw new NotImplementedException(); }
         }
 
         public override bool IsEncrypted
@@ -72,14 +72,13 @@ namespace SharpCompress.Common.SevenZip
             get { return false; }
         }
 
-        public override int? Attrib
-        {
-            get { return (int) FilePart.Header.Attrib; }
-        }
-
         internal override IEnumerable<FilePart> Parts
         {
             get { return FilePart.AsEnumerable<FilePart>(); }
         }
+
+        internal override void Close()
+        {
+        }
     }
 }

SharpCompress/Common/SevenZip/SevenZipVolume.cs

@@ -2,11 +2,18 @@
 
 namespace SharpCompress.Common.SevenZip
 {
-    public class SevenZipVolume : Volume
+    public class SevenZipVolume : GenericVolume
     {
         public SevenZipVolume(Stream stream, Options options)
             : base(stream, options)
         {
         }
+
+#if !PORTABLE && !NETFX_CORE
+        public SevenZipVolume(FileInfo fileInfo, Options options)
+            : base(fileInfo, options)
+        {
+        }
+#endif
     }
 }

SharpCompress/Common/Tar/Headers/TarHeader.cs

@@ -25,7 +25,7 @@ namespace SharpCompress.Common.Tar.Headers
 
     internal class TarHeader
     {
-        internal static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        internal static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0);
 
         internal string Name { get; set; }
         //internal int Mode { get; set; }
@@ -40,64 +40,48 @@ namespace SharpCompress.Common.Tar.Headers
 
         internal void Write(Stream output)
         {
+            if (Name.Length > 255)
+            {
+                throw new InvalidFormatException("UsTar fileName can not be longer thatn 255 chars");
+            }
             byte[] buffer = new byte[512];
+            string name = Name;
+            if (name.Length > 100)
+            {
+                name = Name.Substring(0, 100);
+            }
+            WriteStringBytes(name, buffer, 0, 100);
 
-            WriteOctalBytes(511, buffer, 100, 8);   // file mode
-            WriteOctalBytes(0, buffer, 108, 8);     // owner ID
-            WriteOctalBytes(0, buffer, 116, 8);     // group ID
+            WriteOctalBytes(511, buffer, 100, 8);
+            WriteOctalBytes(0, buffer, 108, 8);
+            WriteOctalBytes(0, buffer, 116, 8);
+            WriteOctalBytes(Size, buffer, 124, 12);
+            var time = (long) (LastModifiedTime - Epoch).TotalSeconds;
+            WriteOctalBytes(time, buffer, 136, 12);
+
+            buffer[156] = (byte) EntryType;
 
             //Encoding.UTF8.GetBytes("magic").CopyTo(buffer, 257);
             if (Name.Length > 100)
             {
-                // Set mock filename and filetype to indicate the next block is the actual name of the file
-                WriteStringBytes("././@LongLink", buffer, 0, 100);
-                buffer[156] = (byte)EntryType.LongName;
-                WriteOctalBytes(Name.Length + 1, buffer, 124, 12);
+                name = Name.Substring(101, Name.Length);
+                ArchiveEncoding.Default.GetBytes(name).CopyTo(buffer, 345);
             }
-            else
+            if (Size >= 0x1FFFFFFFF)
             {
-                WriteStringBytes(Name, buffer, 0, 100);
-                WriteOctalBytes(Size, buffer, 124, 12);
-                var time = (long)(LastModifiedTime.ToUniversalTime() - Epoch).TotalSeconds;
-                WriteOctalBytes(time, buffer, 136, 12);
-                buffer[156] = (byte)EntryType;
-
-                if (Size >= 0x1FFFFFFFF)
-                {
 #if PORTABLE || NETFX_CORE
                 byte[] bytes = BitConverter.GetBytes(Utility.HostToNetworkOrder(Size));
 #else
-                    byte[] bytes = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(Size));
+                byte[] bytes = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(Size));
 #endif
-                    var bytes12 = new byte[12];
-                    bytes.CopyTo(bytes12, 12 - bytes.Length);
-                    bytes12[0] |= 0x80;
-                    bytes12.CopyTo(buffer, 124);
-                }
+                var bytes12 = new byte[12];
+                bytes.CopyTo(bytes12, 12 - bytes.Length);
+                bytes12[0] |= 0x80;
+                bytes12.CopyTo(buffer, 124);
             }
-
             int crc = RecalculateChecksum(buffer);
             WriteOctalBytes(crc, buffer, 148, 8);
-
             output.Write(buffer, 0, buffer.Length);
-
-            if (Name.Length > 100)
-            {
-                WriteLongFilenameHeader(output);
-                Name = Name.Substring(0, 100);
-                Write(output);
-            }
-        }
-        private void WriteLongFilenameHeader(Stream output)
-        {
-            byte[] nameBytes = ArchiveEncoding.Default.GetBytes(Name);
-            output.Write(nameBytes, 0, nameBytes.Length);
-
-            // pad to multiple of 512 bytes, and make sure a terminating null is added
-            int numPaddingBytes = 512 - (nameBytes.Length % 512);
-            if (numPaddingBytes == 0)
-                numPaddingBytes = 512;
-            output.Write(new byte[numPaddingBytes], 0, numPaddingBytes);
         }
 
         internal bool Read(BinaryReader reader)
@@ -131,12 +115,12 @@ namespace SharpCompress.Common.Tar.Headers
                 Size = ReadASCIIInt64Base8(buffer, 124, 11);
             }
             long unixTimeStamp = ReadASCIIInt64Base8(buffer, 136, 11);
-            LastModifiedTime = Epoch.AddSeconds(unixTimeStamp).ToLocalTime();
+            LastModifiedTime = Epoch.AddSeconds(unixTimeStamp);
 
 
             Magic = ArchiveEncoding.Default.GetString(buffer, 257, 6).TrimNulls();
 
-            if (!string.IsNullOrEmpty(Magic) && "ustar".Equals(Magic))
+            if (!string.IsNullOrEmpty(Magic) && "ustar ".Equals(Magic))
             {
                 string namePrefix = ArchiveEncoding.Default.GetString(buffer, 345, 157);
                 namePrefix = namePrefix.TrimNulls();
@@ -179,6 +163,7 @@ namespace SharpCompress.Common.Tar.Headers
             {
                 buffer[offset + i + shift] = (byte) val[i];
             }
+            buffer[offset + length] = 0;
         }
 
         private static int ReadASCIIInt32Base8(byte[] buffer, int offset, int count)

SharpCompress/Common/Tar/TarEntry.cs

@@ -22,12 +22,12 @@ namespace SharpCompress.Common.Tar
             get { return type; }
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return 0; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return filePart.Header.Name; }
         }
@@ -100,5 +100,9 @@ namespace SharpCompress.Common.Tar
                 }
             }
         }
+
+        internal override void Close()
+        {
+        }
     }
 }

SharpCompress/Common/Tar/TarFilePart.cs

@@ -6,12 +6,12 @@ namespace SharpCompress.Common.Tar
 {
     internal class TarFilePart : FilePart
     {
-        private readonly Stream seekableStream;
+        private Stream seekableStream;
 
         internal TarFilePart(TarHeader header, Stream seekableStream)
         {
             this.seekableStream = seekableStream;
-            Header = header;
+            this.Header = header;
         }
 
         internal TarHeader Header { get; private set; }

SharpCompress/Common/Tar/TarReadOnlySubStream.cs

@@ -4,25 +4,19 @@ namespace SharpCompress.Common.Tar
 {
     internal class TarReadOnlySubStream : Stream
     {
-        private bool isDisposed;
-        private long amountRead;
+        private int amountRead;
 
         public TarReadOnlySubStream(Stream stream, long bytesToRead)
         {
-            Stream = stream;
-            BytesLeftToRead = bytesToRead;
+            this.Stream = stream;
+            this.BytesLeftToRead = bytesToRead;
         }
 
         protected override void Dispose(bool disposing)
         {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
             if (disposing)
             {
-                long skipBytes = amountRead % 512;
+                int skipBytes = this.amountRead%512;
                 if (skipBytes == 0)
                 {
                     return;
@@ -33,7 +27,7 @@ namespace SharpCompress.Common.Tar
                     return;
                 }
                 var buffer = new byte[skipBytes];
-                Stream.ReadFully(buffer);
+                this.Stream.ReadFully(buffer);
             }
         }
 
@@ -58,48 +52,48 @@ namespace SharpCompress.Common.Tar
 
         public override void Flush()
         {
-            throw new System.NotSupportedException();
+            throw new System.NotImplementedException();
         }
 
         public override long Length
         {
-            get { throw new System.NotSupportedException(); }
+            get { throw new System.NotImplementedException(); }
         }
 
         public override long Position
         {
-            get { throw new System.NotSupportedException(); }
-            set { throw new System.NotSupportedException(); }
+            get { throw new System.NotImplementedException(); }
+            set { throw new System.NotImplementedException(); }
         }
 
         public override int Read(byte[] buffer, int offset, int count)
         {
-            if (BytesLeftToRead < count)
+            if (this.BytesLeftToRead < count)
             {
-                count = (int)BytesLeftToRead;
+                count = (int) this.BytesLeftToRead;
             }
-            int read = Stream.Read(buffer, offset, count);
+            int read = this.Stream.Read(buffer, offset, count);
             if (read > 0)
             {
-                BytesLeftToRead -= read;
-                amountRead += read;
+                this.BytesLeftToRead -= read;
+                this.amountRead += read;
             }
             return read;
         }
 
         public override long Seek(long offset, SeekOrigin origin)
         {
-            throw new System.NotSupportedException();
+            throw new System.NotImplementedException();
         }
 
         public override void SetLength(long value)
         {
-            throw new System.NotSupportedException();
+            throw new System.NotImplementedException();
         }
 
         public override void Write(byte[] buffer, int offset, int count)
         {
-            throw new System.NotSupportedException();
+            throw new System.NotImplementedException();
         }
     }
 }

SharpCompress/Common/Tar/TarVolume.cs

@@ -2,11 +2,18 @@
 
 namespace SharpCompress.Common.Tar
 {
-    public class TarVolume : Volume
+    public class TarVolume : GenericVolume
     {
         public TarVolume(Stream stream, Options options)
             : base(stream, options)
         {
         }
+
+#if !PORTABLE && !NETFX_CORE
+        public TarVolume(FileInfo fileInfo, Options options)
+            : base(fileInfo, options)
+        {
+        }
+#endif
     }
 }

SharpCompress/Common/Volume.cs

@@ -24,18 +24,16 @@ namespace SharpCompress.Common
         /// RarArchive is the first volume of a multi-part archive.
         /// Only Rar 3.0 format and higher
         /// </summary>
-        public virtual bool IsFirstVolume
-        {
-            get { return true; }
-        }
+        public abstract bool IsFirstVolume { get; }
 
         /// <summary>
         /// RarArchive is part of a multi-part archive.
         /// </summary>
-        public virtual bool IsMultiVolume
-        {
-            get { return true; }
-        }
+        public abstract bool IsMultiVolume { get; }
+
+#if !PORTABLE && !NETFX_CORE
+        public abstract FileInfo VolumeFile { get; }
+#endif
 
         private bool disposed;
 

SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Linq;
 
 namespace SharpCompress.Common.Zip.Headers
 {
@@ -35,12 +34,6 @@ namespace SharpCompress.Common.Zip.Headers
             byte[] comment = reader.ReadBytes(commentLength);
             Comment = DecodeString(comment);
             LoadExtra(extra);
-
-            var unicodePathExtra = Extra.FirstOrDefault(u => u.Type == ExtraDataType.UnicodePathExtraField);
-            if (unicodePathExtra != null)
-            {
-                Name = ((ExtraUnicodePathExtraField)unicodePathExtra).UnicodeName;
-            }
         }
 
         internal override void Write(BinaryWriter writer)

SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs

@@ -1,8 +1,19 @@
 using System.IO;
-using System.Linq;
 
 namespace SharpCompress.Common.Zip.Headers
 {
+    internal enum ExtraDataType : ushort
+    {
+        WinZipAes = 0x9901,
+    }
+
+    internal class ExtraData
+    {
+        internal ExtraDataType Type { get; set; }
+        internal ushort Length { get; set; }
+        internal byte[] DataBytes { get; set; }
+    }
+
     internal class LocalEntryHeader : ZipFileEntry
     {
         public LocalEntryHeader()
@@ -26,12 +37,6 @@ namespace SharpCompress.Common.Zip.Headers
             byte[] extra = reader.ReadBytes(extraLength);
             Name = DecodeString(name);
             LoadExtra(extra);
-
-            var unicodePathExtra = Extra.FirstOrDefault(u => u.Type == ExtraDataType.UnicodePathExtraField);
-            if (unicodePathExtra!=null)
-            {
-                Name = ((ExtraUnicodePathExtraField) unicodePathExtra).UnicodeName;
-            }
         }
 
         internal override void Write(BinaryWriter writer)

SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Text;
-
-namespace SharpCompress.Common.Zip.Headers
-{
-    internal enum ExtraDataType : ushort
-    {
-        WinZipAes = 0x9901,
-
-        NotImplementedExtraData = 0xFFFF,
-        // Third Party Mappings
-        // -Info-ZIP Unicode Path Extra Field
-        UnicodePathExtraField = 0x7075
-    }
-
-    internal class ExtraData
-    {
-        internal ExtraDataType Type { get; set; }
-        internal ushort Length { get; set; }
-        internal byte[] DataBytes { get; set; }
-    }
-
-    internal class ExtraUnicodePathExtraField : ExtraData
-    {
-        internal byte Version
-        {
-            get { return this.DataBytes[0]; }
-        }
-
-        internal byte[] NameCRC32
-        {
-            get
-            {
-                var crc = new byte[4];
-                Buffer.BlockCopy(this.DataBytes, 1, crc, 0, 4);
-                return crc;
-            }
-        }
-
-        internal string UnicodeName
-        {
-            get
-            {
-                // PathNamelength = dataLength - Version(1 byte) - NameCRC32(4 bytes)
-                var length = this.Length - 5;
-                var nameStr = Encoding.UTF8.GetString(this.DataBytes, 5, length);
-                return nameStr;
-            }
-        }
-    }
-
-    internal static class LocalEntryHeaderExtraFactory
-    {
-        internal static ExtraData Create(ExtraDataType type,ushort length, byte[] extraData)
-        {
-            switch (type)
-            {
-                case ExtraDataType.UnicodePathExtraField:
-                    return new ExtraUnicodePathExtraField()
-                    {
-                        Type = type,
-                        Length = length,
-                        DataBytes = extraData
-                    };
-                default:
-                    return new ExtraData
-                    {
-                        Type = type,
-                        Length = length,
-                        DataBytes = extraData
-                    };
-            }
-        }
-    }
-}

SharpCompress/Common/Zip/Headers/ZipFileEntry..cs

@@ -13,6 +13,7 @@ namespace SharpCompress.Common.Zip.Headers
             Extra = new List<ExtraData>();
         }
 
+
         internal bool IsDirectory
         {
             get { return Name.EndsWith("/"); }
@@ -24,7 +25,6 @@ namespace SharpCompress.Common.Zip.Headers
             {
                 return Encoding.UTF8.GetString(str, 0, str.Length);
             }
-
             return ArchiveEncoding.Default.GetString(str, 0, str.Length);
         }
 
@@ -66,19 +66,22 @@ namespace SharpCompress.Common.Zip.Headers
 
         protected void LoadExtra(byte[] extra)
         {
-            for (int i = 0; i < extra.Length-4;)
+            for (int i = 0; i < extra.Length;)
             {
                 ExtraDataType type = (ExtraDataType) BitConverter.ToUInt16(extra, i);
                 if (!Enum.IsDefined(typeof (ExtraDataType), type))
                 {
-                    type = ExtraDataType.NotImplementedExtraData;
+                    return;
                 }
-
                 ushort length = BitConverter.ToUInt16(extra, i + 2);
                 byte[] data = new byte[length];
                 Buffer.BlockCopy(extra, i + 4, data, 0, length);
-                Extra.Add(LocalEntryHeaderExtraFactory.Create(type,length,data));
-
+                Extra.Add(new ExtraData
+                              {
+                                  Type = type,
+                                  Length = length,
+                                  DataBytes = data
+                              });
                 i += length + 4;
             }
         }

SharpCompress/Common/Zip/PkwareTraditionalCryptoStream.cs

@@ -15,7 +15,6 @@ namespace SharpCompress.Common.Zip
         private readonly PkwareTraditionalEncryptionData encryptor;
         private readonly CryptoMode mode;
         private readonly Stream stream;
-        private bool isDisposed;
 
         public PkwareTraditionalCryptoStream(Stream stream, PkwareTraditionalEncryptionData encryptor, CryptoMode mode)
         {
@@ -105,16 +104,5 @@ namespace SharpCompress.Common.Zip
         {
             throw new NotSupportedException();
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            base.Dispose(disposing);
-            stream.Dispose();
-        }
     }
 }

SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs

@@ -8,7 +8,7 @@ namespace SharpCompress.Common.Zip
 {
     internal class SeekableZipHeaderFactory : ZipHeaderFactory
     {
-        private const int MAX_ITERATIONS_FOR_DIRECTORY_HEADER = 4096;
+        private const int MAX_ITERATIONS_FOR_DIRECTORY_HEADER = 1000;
 
         internal SeekableZipHeaderFactory(string password)
             : base(StreamingMode.Seekable, password)

SharpCompress/Common/Zip/StreamingZipHeaderFactory.cs

@@ -45,17 +45,18 @@ namespace SharpCompress.Common.Zip
                 lastEntryHeader = null;
                 uint headerBytes = reader.ReadUInt32();
                 header = ReadHeader(headerBytes, reader);
-                if (header != null) {
-                    // entry could be zero bytes so we need to know that.
-                    if(header.ZipHeaderType == ZipHeaderType.LocalEntry) {
-                        bool isRecording = rewindableStream.IsRecording;
-                        if (!isRecording) {
-                            rewindableStream.StartRecording();
-                        }
-                        uint nextHeaderBytes = reader.ReadUInt32();
-                        header.HasData = !IsHeader(nextHeaderBytes);
-                        rewindableStream.Rewind(!isRecording);
+
+                //entry could be zero bytes so we need to know that.
+                if (header.ZipHeaderType == ZipHeaderType.LocalEntry)
+                {
+                    bool isRecording = rewindableStream.IsRecording;
+                    if (!isRecording)
+                    {
+                        rewindableStream.StartRecording();
                     }
+                    uint nextHeaderBytes = reader.ReadUInt32();
+                    header.HasData = !IsHeader(nextHeaderBytes);
+                    rewindableStream.Rewind(!isRecording);
                 }
                 yield return header;
             }

SharpCompress/Common/Zip/WinzipAesCryptoStream.Portable.cs

@@ -1,170 +0,0 @@
-using System;
-using System.IO;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Engines;
-using Org.BouncyCastle.Crypto.Parameters;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class WinzipAesCryptoStream : Stream
-    {
-        private const int BLOCK_SIZE_IN_BYTES = 16;
-        private readonly IBufferedCipher rijndael;
-        private readonly byte[] counter = new byte[BLOCK_SIZE_IN_BYTES];
-        private readonly Stream stream;
-        private int nonce = 1;
-        private byte[] counterOut = new byte[BLOCK_SIZE_IN_BYTES];
-        private bool isFinalBlock;
-        private long totalBytesLeftToRead;
-        private bool isDisposed;
-
-        internal WinzipAesCryptoStream(Stream stream, WinzipAesEncryptionData winzipAesEncryptionData, long length)
-        {
-            this.stream = stream;
-            totalBytesLeftToRead = length;
-
-            rijndael = CreateRijndael(winzipAesEncryptionData);
-        }
-
-        private IBufferedCipher CreateRijndael(WinzipAesEncryptionData winzipAesEncryptionData)
-        {
-            var blockCipher = new BufferedBlockCipher(new RijndaelEngine());
-            var param = new KeyParameter(winzipAesEncryptionData.KeyBytes);
-            blockCipher.Init(true, param);
-            return blockCipher;
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Length
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        public override long Position
-        {
-            get { throw new NotImplementedException(); }
-            set { throw new NotImplementedException(); }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            if (disposing)
-            {
-                //read out last 10 auth bytes
-                var ten = new byte[10];
-                stream.Read(ten, 0, 10);
-                stream.Dispose();
-            }
-        }
-
-        public override void Flush()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (totalBytesLeftToRead == 0)
-            {
-                return 0;
-            }
-            int bytesToRead = count;
-            if (count > totalBytesLeftToRead)
-            {
-                bytesToRead = (int)totalBytesLeftToRead;
-            }
-            int read = stream.Read(buffer, offset, bytesToRead);
-            totalBytesLeftToRead -= read;
-
-            ReadTransformBlocks(buffer, offset, read);
-
-            return read;
-        }
-
-        private int ReadTransformOneBlock(byte[] buffer, int offset, int last)
-        {
-            if (isFinalBlock)
-            {
-                throw new InvalidOperationException();
-            }
-
-            int bytesRemaining = last - offset;
-            int bytesToRead = (bytesRemaining > BLOCK_SIZE_IN_BYTES)
-                                  ? BLOCK_SIZE_IN_BYTES
-                                  : bytesRemaining;
-
-            // update the counter
-            Array.Copy(BitConverter.GetBytes(nonce++), 0, counter, 0, 4);
-
-            // Determine if this is the final block
-            if ((bytesToRead == bytesRemaining) && (totalBytesLeftToRead == 0))
-            {
-                counterOut = rijndael.DoFinal(counter, 0, BLOCK_SIZE_IN_BYTES);
-
-                isFinalBlock = true;
-            }
-            else
-            {
-                rijndael.ProcessBytes(counter, 0, BLOCK_SIZE_IN_BYTES, counterOut, 0);
-            }
-            XorInPlace(buffer, offset, bytesToRead);
-            return bytesToRead;
-        }
-
-
-        private void XorInPlace(byte[] buffer, int offset, int count)
-        {
-            for (int i = 0; i < count; i++)
-            {
-                buffer[offset + i] = (byte)(counterOut[i] ^ buffer[offset + i]);
-            }
-        }
-
-        private void ReadTransformBlocks(byte[] buffer, int offset, int count)
-        {
-            int posn = offset;
-            int last = count + offset;
-
-            while (posn < buffer.Length && posn < last)
-            {
-                int n = ReadTransformOneBlock(buffer, posn, last);
-                posn += n;
-            }
-        }
-
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

SharpCompress/Common/Zip/WinzipAesCryptoStream.cs

@@ -9,33 +9,48 @@ namespace SharpCompress.Common.Zip
         private const int BLOCK_SIZE_IN_BYTES = 16;
         private readonly SymmetricAlgorithm cipher;
         private readonly byte[] counter = new byte[BLOCK_SIZE_IN_BYTES];
+        private readonly HMACSHA1 hmac;
         private readonly Stream stream;
         private readonly ICryptoTransform transform;
-        private int nonce = 1;
+        private int _nonce = 1;
         private byte[] counterOut = new byte[BLOCK_SIZE_IN_BYTES];
         private bool isFinalBlock;
+        private CryptoMode mode;
         private long totalBytesLeftToRead;
-        private bool isDisposed;
 
-        internal WinzipAesCryptoStream(Stream stream, WinzipAesEncryptionData winzipAesEncryptionData, long length)
+        internal WinzipAesCryptoStream(Stream stream, WinzipAesEncryptionData winzipAesEncryptionData, long length,
+                                       CryptoMode mode)
         {
+            this.mode = mode;
             this.stream = stream;
             totalBytesLeftToRead = length;
 
+            hmac = new HMACSHA1(winzipAesEncryptionData.IvBytes);
+
             cipher = CreateCipher(winzipAesEncryptionData);
 
             var iv = new byte[BLOCK_SIZE_IN_BYTES];
             transform = cipher.CreateEncryptor(winzipAesEncryptionData.KeyBytes, iv);
+
+            //if (_mode == CryptoMode.Encrypt)
+            //{
+            //    _iobuf = new byte[2048];
+            //    _PendingWriteBlock = new byte[BLOCK_SIZE_IN_BYTES];
+            //}
         }
 
         private SymmetricAlgorithm CreateCipher(WinzipAesEncryptionData winzipAesEncryptionData)
         {
+#if !PORTABLE
             RijndaelManaged cipher = new RijndaelManaged();
-            cipher.BlockSize = BLOCK_SIZE_IN_BYTES * 8;
-            cipher.KeySize = winzipAesEncryptionData.KeyBytes.Length * 8;
+            cipher.BlockSize = BLOCK_SIZE_IN_BYTES*8;
+            cipher.KeySize = winzipAesEncryptionData.KeyBytes.Length*8;
             cipher.Mode = CipherMode.ECB;
             cipher.Padding = PaddingMode.None;
             return cipher;
+#else
+            throw new NotSupportedException("Cannot decrypt Winzip AES with Silverlight or WP7.");
+#endif
         }
 
         public override bool CanRead
@@ -55,22 +70,17 @@ namespace SharpCompress.Common.Zip
 
         public override long Length
         {
-            get { throw new NotSupportedException(); }
+            get { throw new NotImplementedException(); }
         }
 
         public override long Position
         {
-            get { throw new NotSupportedException(); }
-            set { throw new NotSupportedException(); }
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
         }
 
         protected override void Dispose(bool disposing)
         {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
             if (disposing)
             {
                 //read out last 10 auth bytes
@@ -82,7 +92,7 @@ namespace SharpCompress.Common.Zip
 
         public override void Flush()
         {
-            throw new NotSupportedException();
+            throw new NotImplementedException();
         }
 
         public override int Read(byte[] buffer, int offset, int count)
@@ -94,7 +104,7 @@ namespace SharpCompress.Common.Zip
             int bytesToRead = count;
             if (count > totalBytesLeftToRead)
             {
-                bytesToRead = (int)totalBytesLeftToRead;
+                bytesToRead = (int) totalBytesLeftToRead;
             }
             int read = stream.Read(buffer, offset, bytesToRead);
             totalBytesLeftToRead -= read;
@@ -117,11 +127,12 @@ namespace SharpCompress.Common.Zip
                                   : bytesRemaining;
 
             // update the counter
-            Array.Copy(BitConverter.GetBytes(nonce++), 0, counter, 0, 4);
+            Array.Copy(BitConverter.GetBytes(_nonce++), 0, counter, 0, 4);
 
             // Determine if this is the final block
             if ((bytesToRead == bytesRemaining) && (totalBytesLeftToRead == 0))
             {
+                hmac.TransformFinalBlock(buffer, offset, bytesToRead);
                 counterOut = transform.TransformFinalBlock(counter,
                                                            0,
                                                            BLOCK_SIZE_IN_BYTES);
@@ -129,6 +140,7 @@ namespace SharpCompress.Common.Zip
             }
             else
             {
+                hmac.TransformBlock(buffer, offset, bytesToRead, null, 0);
                 transform.TransformBlock(counter,
                                          0, // offset
                                          BLOCK_SIZE_IN_BYTES,
@@ -145,7 +157,7 @@ namespace SharpCompress.Common.Zip
         {
             for (int i = 0; i < count; i++)
             {
-                buffer[offset + i] = (byte)(counterOut[i] ^ buffer[offset + i]);
+                buffer[offset + i] = (byte) (counterOut[i] ^ buffer[offset + i]);
             }
         }
 
@@ -164,17 +176,17 @@ namespace SharpCompress.Common.Zip
 
         public override long Seek(long offset, SeekOrigin origin)
         {
-            throw new NotSupportedException();
+            throw new NotImplementedException();
         }
 
         public override void SetLength(long value)
         {
-            throw new NotSupportedException();
+            throw new NotImplementedException();
         }
 
         public override void Write(byte[] buffer, int offset, int count)
         {
-            throw new NotSupportedException();
+            throw new NotImplementedException();
         }
     }
 }

SharpCompress/Common/Zip/WinzipAesEncryptionData.Portable.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Text;
-using SharpCompress.Crypto;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class WinzipAesEncryptionData
-    {
-        private const int RFC2898_ITERATIONS = 1000;
-
-        private byte[] salt;
-        private WinzipAesKeySize keySize;
-        private byte[] passwordVerifyValue;
-        private string password;
-
-        private byte[] generatedVerifyValue;
-
-        internal WinzipAesEncryptionData(WinzipAesKeySize keySize, byte[] salt, byte[] passwordVerifyValue,
-                                         string password)
-        {
-            this.keySize = keySize;
-            this.salt = salt;
-            this.passwordVerifyValue = passwordVerifyValue;
-            this.password = password;
-            Initialize();
-        }
-
-        internal byte[] IvBytes { get; set; }
-        internal byte[] KeyBytes { get; set; }
-
-        private int KeySizeInBytes
-        {
-            get { return KeyLengthInBytes(keySize); }
-        }
-
-        internal static int KeyLengthInBytes(WinzipAesKeySize keySize)
-        {
-            switch (keySize)
-            {
-                case WinzipAesKeySize.KeySize128:
-                    return 16;
-                case WinzipAesKeySize.KeySize192:
-                    return 24;
-                case WinzipAesKeySize.KeySize256:
-                    return 32;
-            }
-            throw new InvalidOperationException();
-        }
-
-        private void Initialize()
-        {
-            var utf8 = new UTF8Encoding(false);
-            var paramz = new PBKDF2(utf8.GetBytes(password), salt, RFC2898_ITERATIONS);
-            KeyBytes = paramz.GetBytes(KeySizeInBytes);
-            IvBytes = paramz.GetBytes(KeySizeInBytes);
-            generatedVerifyValue = paramz.GetBytes(2);
-
-
-            short verify = BitConverter.ToInt16(passwordVerifyValue, 0);
-            if (password != null)
-            {
-                short generated = BitConverter.ToInt16(generatedVerifyValue, 0);
-                if (verify != generated)
-                    throw new InvalidFormatException("bad password");
-            }
-        }
-    }
-}

SharpCompress/Common/Zip/ZipEntry.cs

@@ -53,12 +53,12 @@ namespace SharpCompress.Common.Zip
             }
         }
 
-        public override long Crc
+        public override uint Crc
         {
             get { return filePart.Header.Crc; }
         }
 
-        public override string Key
+        public override string FilePath
         {
             get { return filePart.Header.Name; }
         }
@@ -112,5 +112,9 @@ namespace SharpCompress.Common.Zip
         {
             get { return filePart.AsEnumerable<FilePart>(); }
         }
+
+        internal override void Close()
+        {
+        }
     }
 }

SharpCompress/Common/Zip/ZipFilePart.cs

@@ -89,7 +89,7 @@ namespace SharpCompress.Common.Zip
                                               Header.CompressedSize > 0 ? Header.CompressedSize - 4 - props.Length : -1,
                                               FlagUtility.HasFlag(Header.Flags, HeaderFlags.Bit1)
                                                   ? -1
-                                                  : (long)Header.UncompressedSize);
+                                                  : (long) Header.UncompressedSize);
                     }
                 case ZipCompressionMethod.PPMd:
                     {
@@ -120,7 +120,7 @@ namespace SharpCompress.Common.Zip
                         {
                             throw new InvalidFormatException("Unexpected vendor ID for WinZip AES metadata");
                         }
-                        Header.CompressionMethod = (ZipCompressionMethod)BitConverter.ToUInt16(data.DataBytes, 5);
+                        Header.CompressionMethod = (ZipCompressionMethod) BitConverter.ToUInt16(data.DataBytes, 5);
                         return CreateDecompressionStream(stream);
                     }
                 default:
@@ -134,7 +134,7 @@ namespace SharpCompress.Common.Zip
         {
             if ((Header.CompressedSize == 0)
 #if !PORTABLE && !NETFX_CORE
- && ((Header.PkwareTraditionalEncryptionData != null)
+                && ((Header.PkwareTraditionalEncryptionData != null)
                     || (Header.WinzipAesEncryptionData != null)))
 #else 
                 && (Header.PkwareTraditionalEncryptionData != null))
@@ -160,7 +160,8 @@ namespace SharpCompress.Common.Zip
             if (Header.WinzipAesEncryptionData != null)
             {
                 //only read 10 less because the last ten are auth bytes
-                return new WinzipAesCryptoStream(plainStream, Header.WinzipAesEncryptionData, Header.CompressedSize - 10);
+                return new WinzipAesCryptoStream(plainStream, Header.WinzipAesEncryptionData,
+                                                 Header.CompressedSize - 10, CryptoMode.Decrypt);
             }
 #endif
             return plainStream;

SharpCompress/Common/Zip/ZipHeaderFactory.cs

@@ -87,7 +87,7 @@ namespace SharpCompress.Common.Zip
                         return entry;
                     }
                 default:
-                    return null;
+                    throw new NotSupportedException("Unknown header: " + headerBytes);
             }
         }
 

SharpCompress/Common/Zip/ZipVolume.cs

@@ -2,13 +2,20 @@
 
 namespace SharpCompress.Common.Zip
 {
-    public class ZipVolume : Volume
+    public class ZipVolume : GenericVolume
     {
         public ZipVolume(Stream stream, Options options)
             : base(stream, options)
         {
         }
 
+#if !PORTABLE && !NETFX_CORE
+        public ZipVolume(FileInfo fileInfo, Options options)
+            : base(fileInfo, options)
+        {
+        }
+#endif
+
         public string Comment { get; internal set; }
     }
 }

SharpCompress/CompressionType.cs

@@ -0,0 +1,14 @@
+namespace SharpCompress
+{
+    public enum CompressionType
+    {
+        None,
+        GZip,
+        BZip2,
+        PPMd,
+        Deflate,
+        Rar,
+        LZMA,
+        Unknown,
+    }
+}

SharpCompress/Compressor/BZip2/BZip2Stream.cs

@@ -5,7 +5,6 @@ namespace SharpCompress.Compressor.BZip2
     public class BZip2Stream : Stream
     {
         private readonly Stream stream;
-        private bool isDisposed;
 
         /// <summary>
         /// Create a BZip2Stream
@@ -30,11 +29,6 @@ namespace SharpCompress.Compressor.BZip2
 
         protected override void Dispose(bool disposing)
         {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
             if (disposing)
             {
                 stream.Dispose();

SharpCompress/Compressor/BZip2/CBZip2InputStream.cs

@@ -65,8 +65,8 @@ namespace SharpCompress.Compressor.BZip2
             {
                 if (inUse[i])
                 {
-                    seqToUnseq[nInUse] = (char)i;
-                    unseqToSeq[i] = (char)nInUse;
+                    seqToUnseq[nInUse] = (char) i;
+                    unseqToSeq[i] = (char) nInUse;
                     nInUse++;
                 }
             }
@@ -145,7 +145,6 @@ namespace SharpCompress.Compressor.BZip2
         private int rTPos = 0;
         private int j2;
         private char z;
-        private bool isDisposed;
 
         public CBZip2InputStream(Stream zStream, bool decompressConcatenated, bool leaveOpen)
         {
@@ -158,20 +157,6 @@ namespace SharpCompress.Compressor.BZip2
             SetupBlock();
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            base.Dispose(disposing);
-            if (bsStream != null)
-            {
-                bsStream.Dispose();
-            }
-        }
-
         internal static int[][] InitIntArray(int n1, int n2)
         {
             int[][] a = new int[n1][];
@@ -314,7 +299,7 @@ namespace SharpCompress.Compressor.BZip2
             }
 
             computedCombinedCRC = (computedCombinedCRC << 1)
-                                  | (int)(((uint)computedCombinedCRC) >> 31);
+                                  | (int) (((uint) computedCombinedCRC) >> 31);
             computedCombinedCRC ^= computedBlockCRC;
         }
 
@@ -387,7 +372,7 @@ namespace SharpCompress.Compressor.BZip2
                 int thech = '\0';
                 try
                 {
-                    thech = (char)bsStream.ReadByte();
+                    thech = (char) bsStream.ReadByte();
                 }
                 catch (IOException)
                 {
@@ -409,7 +394,7 @@ namespace SharpCompress.Compressor.BZip2
 
         private char BsGetUChar()
         {
-            return (char)BsR(8);
+            return (char) BsR(8);
         }
 
         private int BsGetint()
@@ -424,12 +409,12 @@ namespace SharpCompress.Compressor.BZip2
 
         private int BsGetIntVS(int numBits)
         {
-            return (int)BsR(numBits);
+            return (int) BsR(numBits);
         }
 
         private int BsGetInt32()
         {
-            return (int)BsGetint();
+            return (int) BsGetint();
         }
 
         private void HbCreateDecodeTables(int[] limit, int[] basev,
@@ -516,7 +501,7 @@ namespace SharpCompress.Compressor.BZip2
                     {
                         if (BsR(1) == 1)
                         {
-                            inUse[i * 16 + j] = true;
+                            inUse[i*16 + j] = true;
                         }
                     }
                 }
@@ -535,7 +520,7 @@ namespace SharpCompress.Compressor.BZip2
                 {
                     j++;
                 }
-                selectorMtf[i] = (char)j;
+                selectorMtf[i] = (char) j;
             }
 
             /* Undo the MTF values for the selectors. */
@@ -578,7 +563,7 @@ namespace SharpCompress.Compressor.BZip2
                             curr--;
                         }
                     }
-                    len[t][i] = (char)curr;
+                    len[t][i] = (char) curr;
                 }
             }
 
@@ -610,7 +595,7 @@ namespace SharpCompress.Compressor.BZip2
             int i, j, nextSym, limitLast;
             int EOB, groupNo, groupPos;
 
-            limitLast = BZip2Constants.baseBlockSize * blockSize100k;
+            limitLast = BZip2Constants.baseBlockSize*blockSize100k;
             origPtr = BsGetIntVS(24);
 
             RecvDecodingTables();
@@ -631,7 +616,7 @@ namespace SharpCompress.Compressor.BZip2
 
             for (i = 0; i <= 255; i++)
             {
-                yy[i] = (char)i;
+                yy[i] = (char) i;
             }
 
             last = -1;
@@ -658,7 +643,7 @@ namespace SharpCompress.Compressor.BZip2
                                 char thech = '\0';
                                 try
                                 {
-                                    thech = (char)bsStream.ReadByte();
+                                    thech = (char) bsStream.ReadByte();
                                 }
                                 catch (IOException)
                                 {
@@ -697,13 +682,13 @@ namespace SharpCompress.Compressor.BZip2
                     {
                         if (nextSym == BZip2Constants.RUNA)
                         {
-                            s = s + (0 + 1) * N;
+                            s = s + (0 + 1)*N;
                         }
                         else if (nextSym == BZip2Constants.RUNB)
                         {
-                            s = s + (1 + 1) * N;
+                            s = s + (1 + 1)*N;
                         }
-                        N = N * 2;
+                        N = N*2;
                         {
                             int zt, zn, zvec, zj;
                             if (groupPos == 0)
@@ -726,7 +711,7 @@ namespace SharpCompress.Compressor.BZip2
                                             char thech = '\0';
                                             try
                                             {
-                                                thech = (char)bsStream.ReadByte();
+                                                thech = (char) bsStream.ReadByte();
                                             }
                                             catch (IOException)
                                             {
@@ -823,7 +808,7 @@ namespace SharpCompress.Compressor.BZip2
                                         char thech = '\0';
                                         try
                                         {
-                                            thech = (char)bsStream.ReadByte();
+                                            thech = (char) bsStream.ReadByte();
                                         }
                                         catch (IOException)
                                         {
@@ -863,7 +848,7 @@ namespace SharpCompress.Compressor.BZip2
 
             for (i = 0; i <= last; i++)
             {
-                ch = (char)ll8[i];
+                ch = (char) ll8[i];
                 tt[cftab[ch]] = i;
                 cftab[ch]++;
             }
@@ -904,7 +889,7 @@ namespace SharpCompress.Compressor.BZip2
                     }
                 }
                 rNToGo--;
-                ch2 ^= (int)((rNToGo == 1) ? 1 : 0);
+                ch2 ^= (int) ((rNToGo == 1) ? 1 : 0);
                 i2++;
 
                 currentChar = ch2;
@@ -965,7 +950,7 @@ namespace SharpCompress.Compressor.BZip2
                         }
                     }
                     rNToGo--;
-                    z ^= (char)((rNToGo == 1) ? 1 : 0);
+                    z ^= (char) ((rNToGo == 1) ? 1 : 0);
                     j2 = 0;
                     currentState = RAND_PART_C_STATE;
                     SetupRandPartC();
@@ -980,7 +965,7 @@ namespace SharpCompress.Compressor.BZip2
 
         private void SetupRandPartC()
         {
-            if (j2 < (int)z)
+            if (j2 < (int) z)
             {
                 currentChar = ch2;
                 mCrc.UpdateCRC(ch2);
@@ -1024,7 +1009,7 @@ namespace SharpCompress.Compressor.BZip2
 
         private void SetupNoRandPartC()
         {
-            if (j2 < (int)z)
+            if (j2 < (int) z)
             {
                 currentChar = ch2;
                 mCrc.UpdateCRC(ch2);
@@ -1054,7 +1039,7 @@ namespace SharpCompress.Compressor.BZip2
                 return;
             }
 
-            int n = BZip2Constants.baseBlockSize * newSize100k;
+            int n = BZip2Constants.baseBlockSize*newSize100k;
             ll8 = new char[n];
             tt = new int[n];
         }
@@ -1072,7 +1057,7 @@ namespace SharpCompress.Compressor.BZip2
                 c = ReadByte();
                 if (c == -1)
                     break;
-                buffer[k + offset] = (byte)c;
+                buffer[k + offset] = (byte) c;
             }
             return k;
         }