Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/System.IO.Compression/SharpCompress/Archive/AbstractArchive.cs

@@ -0,0 +1,206 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Archive
+{
+    internal abstract class AbstractArchive<TEntry, TVolume> : IArchive, IArchiveExtractionListener
+        where TEntry : IArchiveEntry
+        where TVolume : IVolume
+    {
+        private readonly LazyReadOnlyCollection<TVolume> lazyVolumes;
+        private readonly LazyReadOnlyCollection<TEntry> lazyEntries;
+
+        public event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionBegin;
+        public event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionEnd;
+
+        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)
+        {
+            Type = type;
+            Password = password;
+            if (!fileInfo.Exists)
+            {
+                throw new ArgumentException("File does not exist: " + fileInfo.FullName);
+            }
+            options = (Options) FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
+            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(fileInfo, options));
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
+        }
+
+
+        protected abstract IEnumerable<TVolume> LoadVolumes(FileInfo file, Options options);
+#endif
+
+        internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, Options options, string password)
+        {
+            Type = type;
+            Password = password;
+            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams), options));
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
+        }
+
+        internal AbstractArchive(ArchiveType type)
+        {
+            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)
+        {
+            if (EntryExtractionBegin != null)
+            {
+                EntryExtractionBegin(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
+            }
+        }
+
+        void IArchiveExtractionListener.FireEntryExtractionEnd(IArchiveEntry entry)
+        {
+            if (EntryExtractionEnd != null)
+            {
+                EntryExtractionEnd(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
+            }
+        }
+
+        private static Stream CheckStreams(Stream stream)
+        {
+            if (!stream.CanSeek || !stream.CanRead)
+            {
+                throw new ArgumentException("Archive streams must be Readable and Seekable");
+            }
+            return stream;
+        }
+
+        /// <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; }
+        }
+
+        /// <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; }
+        }
+
+        /// <summary>
+        /// The total size of the files compressed in the archive.
+        /// </summary>
+        public long TotalSize
+        {
+            get { return Entries.Aggregate(0L, (total, cf) => total + cf.CompressedSize); }
+        }
+
+        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>(); }
+        }
+
+        IEnumerable<IVolume> IArchive.Volumes
+        {
+            get { return lazyVolumes.Cast<IVolume>(); }
+        }
+
+        private bool disposed;
+
+        public virtual void Dispose()
+        {
+            if (!disposed)
+            {
+                lazyVolumes.ForEach(v => v.Dispose());
+                lazyEntries.GetLoaded().Cast<Entry>().ForEach(x => x.Close());
+                disposed = true;
+            }
+        }
+
+        void IArchiveExtractionListener.EnsureEntriesLoaded()
+        {
+            lazyEntries.EnsureFullyLoaded();
+            lazyVolumes.EnsureFullyLoaded();
+        }
+
+        void IExtractionListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
+        {
+            if (CompressedBytesRead != null)
+            {
+                CompressedBytesRead(this, new CompressedBytesReadEventArgs()
+                                              {
+                                                  CurrentFilePartCompressedBytesRead = currentPartCompressedBytes,
+                                                  CompressedBytesRead = compressedReadBytes
+                                              });
+            }
+        }
+
+        void IExtractionListener.FireFilePartExtractionBegin(string name, long size, long compressedSize)
+        {
+            if (FilePartExtractionBegin != null)
+            {
+                FilePartExtractionBegin(this, new FilePartExtractionBeginEventArgs()
+                                                  {
+                                                      CompressedSize = compressedSize,
+                                                      Size = size,
+                                                      Name = name,
+                                                  });
+            }
+        }
+
+        /// <summary>
+        /// Use this method to extract all entries in an archive in order.
+        /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be 
+        /// extracted sequentially for the best performance.
+        /// 
+        /// This method will load all entry information from the archive.
+        /// 
+        /// WARNING: this will reuse the underlying stream for the archive.  Errors may 
+        /// occur if this is used at the same time as other extraction methods on this instance.
+        /// </summary>
+        /// <returns></returns>
+        public IReader ExtractAllEntries()
+        {
+            ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
+            return CreateReaderForSolidExtraction();
+        }
+
+        protected abstract IReader CreateReaderForSolidExtraction();
+
+        /// <summary>
+        /// Archive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
+        /// </summary>
+        public virtual bool IsSolid
+        {
+            get { return false; }
+        }
+
+
+        /// <summary>
+        /// The archive can find all the parts of the archive needed to fully extract the archive.  This forces the parsing of the entire archive.
+        /// </summary>
+        public bool IsComplete
+        {
+            get
+            {
+                ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
+                return Entries.All(x => x.IsComplete);
+            }
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/AbstractWritableArchive.Extensions.cs

@@ -0,0 +1,100 @@
+using System;
+using System.IO;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    internal 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
+        {
+#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 TEntry AddEntry<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive, string key, FileInfo fileInfo)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            if (!fileInfo.Exists)
+            {
+                throw new ArgumentException("FileInfo does not exist.");
+            }
+            return writableArchive.AddEntry(key, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
+        }
+#endif
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/AbstractWritableArchive.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    internal abstract class AbstractWritableArchive<TEntry, TVolume> : AbstractArchive<TEntry, TVolume>
+        where TEntry : IArchiveEntry
+        where TVolume : IVolume
+    {
+        private readonly List<TEntry> newEntries = new List<TEntry>();
+        private readonly List<TEntry> removedEntries = new List<TEntry>();
+
+        private readonly List<TEntry> modifiedEntries = new List<TEntry>();
+        private bool hasModifications;
+
+        internal AbstractWritableArchive(ArchiveType type)
+            : base(type)
+        {
+        }
+
+        internal AbstractWritableArchive(ArchiveType type, Stream stream, Options options)
+            : base(type, stream.AsEnumerable(), options, null)
+        {
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        internal AbstractWritableArchive(ArchiveType type, FileInfo fileInfo, Options options)
+            : base(type, fileInfo, options, null)
+        {
+        }
+#endif
+
+        public override ICollection<TEntry> Entries
+        {
+            get
+            {
+                if (hasModifications)
+                {
+                    return modifiedEntries;
+                }
+                return base.Entries;
+            }
+        }
+
+        private void RebuildModifiedCollection()
+        {
+            hasModifications = true;
+            newEntries.RemoveAll(v => removedEntries.Contains(v));
+            modifiedEntries.Clear();
+            modifiedEntries.AddRange(OldEntries.Concat(newEntries));
+        }
+
+        private IEnumerable<TEntry> OldEntries
+        {
+            get { return base.Entries.Where(x => !removedEntries.Contains(x)); }
+        }
+
+        public void RemoveEntry(TEntry entry)
+        {
+            if (!removedEntries.Contains(entry))
+            {
+                removedEntries.Add(entry);
+                RebuildModifiedCollection();
+            }
+        }
+
+        public TEntry AddEntry(string key, Stream source,
+                             long size = 0, DateTime? modified = null)
+        {
+            return AddEntry(key, source, false, 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);
+            RebuildModifiedCollection();
+            return entry;
+        }
+
+        private bool DoesKeyMatchExisting(string key)
+        {
+            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;
+        }
+
+        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,
+                                              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());
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/ArchiveFactory.cs

@@ -0,0 +1,194 @@
+using System;
+using System.IO;
+#if GZIP
+using SharpCompress.Archive.GZip;
+#endif
+#if RAR
+using SharpCompress.Archive.Rar;
+#endif
+#if SEVENZIP
+using SharpCompress.Archive.SevenZip;
+#endif
+#if TAR
+using SharpCompress.Archive.Tar;
+#endif
+using SharpCompress.Archive.Zip;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    internal class ArchiveFactory
+    {
+        /// <summary>
+        /// Opens an Archive for random access
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static IArchive Open(Stream stream, Options options = Options.KeepStreamsOpen)
+        {
+            stream.CheckNotNull("stream");
+            if (!stream.CanRead || !stream.CanSeek)
+            {
+                throw new ArgumentException("Stream should be readable and seekable");
+            }
+
+            if (ZipArchive.IsZipFile(stream, null))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return ZipArchive.Open(stream, options, null);
+            }
+#if RAR
+            stream.Seek(0, SeekOrigin.Begin);
+            if (RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return RarArchive.Open(stream, options);
+            }
+#endif
+#if TAR
+            stream.Seek(0, SeekOrigin.Begin);
+            if (TarArchive.IsTarFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return TarArchive.Open(stream, options);
+            }
+#endif
+#if SEVENZIP
+            stream.Seek(0, SeekOrigin.Begin);
+            if (SevenZipArchive.IsSevenZipFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return SevenZipArchive.Open(stream, options);
+            }
+#endif
+#if GZIP
+            stream.Seek(0, SeekOrigin.Begin);
+            if (GZipArchive.IsGZipFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return GZipArchive.Open(stream, options);
+            }
+#endif
+            throw new InvalidOperationException("Cannot determine compressed stream type.  Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
+        }
+
+        public static IArchive Create(ArchiveType type)
+        {
+            switch (type)
+            {
+                case ArchiveType.Zip:
+                    {
+                        return ZipArchive.Create();
+                    }
+#if TAR
+                case ArchiveType.Tar:
+                    {
+                        return TarArchive.Create();
+                    }
+#endif
+                default:
+                    {
+                        throw new NotSupportedException("Cannot create Archives of type: " + type);
+                    }
+            }
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public static IArchive 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 IArchive 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>
+        public static IArchive Open(string filePath, Options options)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        public static IArchive Open(FileInfo fileInfo, Options options)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            using (var stream = fileInfo.OpenRead())
+            {
+                if (ZipArchive.IsZipFile(stream, null))
+                {
+                    stream.Dispose();
+                    return ZipArchive.Open(fileInfo, options, null);
+                }
+#if RAR
+                stream.Seek(0, SeekOrigin.Begin);
+                if (RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
+                {
+                    stream.Dispose();
+                    return RarArchive.Open(fileInfo, options);
+                }
+#endif
+#if TAR
+                stream.Seek(0, SeekOrigin.Begin);
+                if (TarArchive.IsTarFile(stream))
+                {
+                    stream.Dispose();
+                    return TarArchive.Open(fileInfo, options);
+                }
+#endif
+#if SEVENZIP
+                stream.Seek(0, SeekOrigin.Begin);
+                if (SevenZipArchive.IsSevenZipFile(stream))
+                {
+                    stream.Dispose();
+                    return SevenZipArchive.Open(fileInfo, options);
+                }
+#endif
+#if GZIP
+                stream.Seek(0, SeekOrigin.Begin);
+                if (GZipArchive.IsGZipFile(stream))
+                {
+                    stream.Dispose();
+                    return GZipArchive.Open(fileInfo, options);
+                }
+#endif
+                throw new InvalidOperationException("Cannot determine compressed stream type.");
+            }
+        }
+
+        /// <summary>
+        /// Extract to specific directory, retaining filename
+        /// </summary>
+        public static void WriteToDirectory(string sourceArchive, string destinationDirectory,
+                                            ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            using (IArchive archive = Open(sourceArchive))
+            {
+                foreach (IArchiveEntry entry in archive.Entries)
+                {
+                    entry.WriteToDirectory(destinationDirectory, options);
+                }
+            }
+        }
+#endif
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/IArchive.Extensions.cs

@@ -0,0 +1,22 @@
+using System.Linq;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    internal static class IArchiveExtensions
+    {
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// Extract to specific directory, retaining filename
+        /// </summary>
+        public static void WriteToDirectory(this IArchive archive, string destinationDirectory,
+                                            ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            foreach (IArchiveEntry entry in archive.Entries.Where(x => !x.IsDirectory))
+            {
+                entry.WriteToDirectory(destinationDirectory, options);
+            }
+        }
+#endif
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/IArchive.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Archive
+{
+    internal interface IArchive : IDisposable
+    {
+        event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionBegin;
+        event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionEnd;
+
+        event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
+        event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
+
+        IEnumerable<IArchiveEntry> Entries { get; }
+        long TotalSize { get; }
+        IEnumerable<IVolume> Volumes { get; }
+
+        ArchiveType Type { get; }
+
+        /// <summary>
+        /// Use this method to extract all entries in an archive in order.
+        /// 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>
+        /// Archive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
+        /// Rar Archives can be SOLID while all 7Zip archives are considered SOLID.
+        /// </summary>
+        bool IsSolid { get; }
+
+        /// <summary>
+        /// This checks to see if all the known entries have IsComplete = true
+        /// </summary>
+        bool IsComplete { get; }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/IArchiveEntry.Extensions.cs

@@ -0,0 +1,89 @@
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive
+{
+    internal 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
+        /// </summary>
+        public static void WriteToDirectory(this IArchiveEntry entry, string destinationDirectory,
+                                            ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            string destinationFileName;
+            string file = Path.GetFileName(entry.Key);
+
+
+            if (options.HasFlag(ExtractOptions.ExtractFullPath))
+            {
+                string folder = Path.GetDirectoryName(entry.Key);
+                string destdir = Path.Combine(destinationDirectory, folder);
+                if (!Directory.Exists(destdir))
+                {
+                    Directory.CreateDirectory(destdir);
+                }
+                destinationFileName = Path.Combine(destdir, file);
+            }
+            else
+            {
+                destinationFileName = Path.Combine(destinationDirectory, file);
+            }
+            entry.WriteToFile(destinationFileName, options);
+        }
+
+        /// <summary>
+        /// Extract to specific file
+        /// </summary>
+        public static void WriteToFile(this IArchiveEntry entry, string destinationFileName,
+                                       ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            if (entry.IsDirectory)
+            {
+                return;
+            }
+            FileMode fm = FileMode.Create;
+
+            if (!options.HasFlag(ExtractOptions.Overwrite))
+            {
+                fm = FileMode.CreateNew;
+            }
+            using (FileStream fs = File.Open(destinationFileName, fm))
+            {
+                entry.WriteTo(fs);
+            }
+        }
+#endif
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/IArchiveEntry.cs

@@ -0,0 +1,24 @@
+using System.IO;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    internal interface IArchiveEntry : IEntry
+    {
+        /// <summary>
+        /// Opens the current entry as a stream that will decompress as it is read.
+        /// Read the entire stream or use SkipEntry on EntryStream.
+        /// </summary>
+        Stream OpenEntryStream();
+
+        /// <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; }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/IArchiveExtractionListener.cs

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

mcs/class/System.IO.Compression/SharpCompress/Archive/IWritableArchiveEntry.cs

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

mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipArchive.cs

@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Zip;
+using SharpCompress.Common.Zip.Headers;
+using SharpCompress.Compressor.Deflate;
+using SharpCompress.Reader;
+using SharpCompress.Reader.Zip;
+using SharpCompress.Writer.Zip;
+
+namespace SharpCompress.Archive.Zip
+{
+    internal class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
+    {
+        private readonly SeekableZipHeaderFactory headerFactory;
+
+        /// <summary>
+        /// Gets or sets the compression level applied to files added to the archive,
+        /// if the compression method is set to deflate
+        /// </summary>
+        public CompressionLevel DeflateCompressionLevel { get; set; }
+
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(string filePath, string password = null)
+        {
+            return Open(filePath, Options.None, password);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(FileInfo fileInfo, string password = null)
+        {
+            return Open(fileInfo, Options.None, password);
+        }
+
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(string filePath, Options options, string password = null)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options, password);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(FileInfo fileInfo, Options options, string password = null)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new ZipArchive(fileInfo, options, password);
+        }
+#endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(Stream stream, string password = null)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream, Options.None, password);
+        }
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(Stream stream, Options options, string password = null)
+        {
+            stream.CheckNotNull("stream");
+            return new ZipArchive(stream, options, password);
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        public static bool IsZipFile(string filePath, string password = null)
+        {
+            return IsZipFile(new FileInfo(filePath), password);
+        }
+
+        public static bool IsZipFile(FileInfo fileInfo, string password = null)
+        {
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+            using (Stream stream = fileInfo.OpenRead())
+            {
+                return IsZipFile(stream, password);
+            }
+        }
+#endif
+
+        public static bool IsZipFile(Stream stream, string password = null)
+        {
+            StreamingZipHeaderFactory headerFactory = new StreamingZipHeaderFactory(password);
+            try
+            {
+                ZipHeader header =
+                    headerFactory.ReadStreamHeader(stream).FirstOrDefault(x => x.ZipHeaderType != ZipHeaderType.Split);
+                if (header == null)
+                {
+                    return false;
+                }
+                return Enum.IsDefined(typeof (ZipHeaderType), header.ZipHeaderType);
+            }
+            catch (CryptographicException)
+            {
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        internal ZipArchive(FileInfo fileInfo, Options options, string password = null)
+            : base(ArchiveType.Zip, fileInfo, options)
+        {
+            headerFactory = new SeekableZipHeaderFactory(password);
+        }
+
+        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();
+        }
+#endif
+
+        internal ZipArchive()
+            : base(ArchiveType.Zip)
+        {
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        internal ZipArchive(Stream stream, Options options, string password = null)
+            : base(ArchiveType.Zip, stream, options)
+        {
+            headerFactory = new SeekableZipHeaderFactory(password);
+        }
+
+        protected override IEnumerable<ZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
+        {
+            return new ZipVolume(streams.First(), options).AsEnumerable();
+        }
+
+        protected override IEnumerable<ZipArchiveEntry> LoadEntries(IEnumerable<ZipVolume> volumes)
+        {
+            var volume = volumes.Single();
+            Stream stream = volume.Stream;
+            foreach (ZipHeader h in headerFactory.ReadSeekableHeader(stream))
+            {
+                if (h != null)
+                {
+                    switch (h.ZipHeaderType)
+                    {
+                        case ZipHeaderType.DirectoryEntry:
+                            {
+                                yield return new ZipArchiveEntry(this,
+                                                                 new SeekableZipFilePart(headerFactory,
+                                                                                         h as DirectoryEntryHeader,
+                                                                                         stream));
+                            }
+                            break;
+                        case ZipHeaderType.DirectoryEnd:
+                            {
+                                byte[] bytes = (h as DirectoryEndHeader).Comment;
+                                volume.Comment = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length);
+                                yield break;
+                            }
+                    }
+                }
+            }
+        }
+
+        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
+                                       IEnumerable<ZipArchiveEntry> oldEntries,
+                                       IEnumerable<ZipArchiveEntry> newEntries)
+        {
+            using (var writer = new ZipWriter(stream, compressionInfo, string.Empty))
+            {
+                foreach (var entry in oldEntries.Concat(newEntries)
+                                                .Where(x => !x.IsDirectory))
+                {
+                    using (var entryStream = entry.OpenEntryStream())
+                    {
+                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, string.Empty);
+                    }
+                }
+            }
+        }
+
+        protected override ZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
+                                                       bool closeStream)
+        {
+            return new ZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
+        }
+
+        public static ZipArchive Create()
+        {
+            return new ZipArchive();
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            var stream = Volumes.Single().Stream;
+            stream.Position = 0;
+            return ZipReader.Open(stream);
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipArchiveEntry.cs

@@ -0,0 +1,36 @@
+using System.IO;
+using System.Linq;
+using SharpCompress.Common.Zip;
+
+namespace SharpCompress.Archive.Zip
+{
+    internal class ZipArchiveEntry : ZipEntry, IArchiveEntry
+    {
+        internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart part)
+            : base(part)
+        {
+            Archive = archive;
+        }
+
+        public virtual Stream OpenEntryStream()
+        {
+            return Parts.Single().GetCompressedStream();
+        }
+
+        #region IArchiveEntry Members
+
+        public IArchive Archive { get; private set; }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        #endregion
+
+        public string Comment
+        {
+            get { return (Parts.Single() as SeekableZipFilePart).Comment; }
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Zip
+{
+    internal class ZipWritableArchiveEntry : ZipArchiveEntry, IWritableArchiveEntry
+    {
+        private readonly string path;
+        private readonly long size;
+        private readonly DateTime? lastModified;
+        private readonly bool closeStream;
+        private readonly Stream stream;
+        private bool isDisposed;
+
+        internal ZipWritableArchiveEntry(ZipArchive archive, Stream stream, string path, long size,
+                                         DateTime? lastModified, bool closeStream)
+            : base(archive, null)
+        {
+            this.stream = stream;
+            this.path = path;
+            this.size = size;
+            this.lastModified = lastModified;
+            this.closeStream = closeStream;
+        }
+
+        public override uint Crc
+        {
+            get { return 0; }
+        }
+
+        public override string Key
+        {
+            get { return path; }
+        }
+
+        public override long CompressedSize
+        {
+            get { return 0; }
+        }
+
+        public override long Size
+        {
+            get { return size; }
+        }
+
+        public override DateTime? LastModifiedTime
+        {
+            get { return lastModified; }
+        }
+
+        public override DateTime? CreatedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? LastAccessedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? ArchivedTime
+        {
+            get { return null; }
+        }
+
+        public override bool IsEncrypted
+        {
+            get { return false; }
+        }
+
+        public override bool IsDirectory
+        {
+            get { return false; }
+        }
+
+        public override bool IsSplit
+        {
+            get { return false; }
+        }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        Stream IWritableArchiveEntry.Stream
+        {
+            get
+            {
+                return stream;
+            }
+        }
+
+        public override Stream OpenEntryStream()
+        {
+            //ensure new stream is at the start, this could be reset
+            stream.Seek(0, SeekOrigin.Begin);
+            return new NonDisposingStream(stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream && !isDisposed)
+            {
+                stream.Dispose();
+                isDisposed = true;
+            }
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Common/ArchiveEncoding.cs

@@ -0,0 +1,29 @@
+using System.Globalization;
+using System.Text;
+
+namespace SharpCompress.Common
+{
+    internal class ArchiveEncoding
+    {
+        /// <summary>
+        /// Default encoding to use when archive format doesn't specify one.
+        /// </summary>
+        public static Encoding Default;
+
+        /// <summary>
+        /// Encoding used by encryption schemes which don't comply with RFC 2898.
+        /// </summary>
+        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
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Common/ArchiveException.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace SharpCompress.Common
+{
+    internal class ArchiveException : Exception
+    {
+        public ArchiveException(string message)
+            : base(message)
+        {
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Common/ArchiveExtractionEventArgs.cs

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

mcs/class/System.IO.Compression/SharpCompress/Common/ArchiveType.cs

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

mcs/class/System.IO.Compression/SharpCompress/Common/CompressedBytesReadEventArgs.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace SharpCompress.Common
+{
+    internal class CompressedBytesReadEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Compressed bytes read for the current entry
+        /// </summary>
+        public long CompressedBytesRead { get; internal set; }
+
+        /// <summary>
+        /// Current file part read for Multipart files (e.g. Rar)
+        /// </summary>
+        public long CurrentFilePartCompressedBytesRead { get; internal set; }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Common/CompressionInfo.cs

@@ -0,0 +1,30 @@
+using SharpCompress.Compressor.Deflate;
+
+namespace SharpCompress.Common
+{
+    /// <summary>
+    /// Detailed compression properties when saving.
+    /// </summary>
+    internal class CompressionInfo
+    {
+        public CompressionInfo()
+        {
+            DeflateCompressionLevel = CompressionLevel.Default;
+        }
+
+        /// <summary>
+        /// The algorthm to use.  Must be valid for the format type.
+        /// </summary>
+        public CompressionType Type { get; set; }
+
+        /// <summary>
+        /// When CompressionType.Deflate is used, this property is referenced.  Defaults to CompressionLevel.Default.
+        /// </summary>
+        public CompressionLevel DeflateCompressionLevel { get; set; }
+
+        public static implicit operator CompressionInfo(CompressionType compressionType)
+        {
+            return new CompressionInfo() {Type = compressionType};
+        }
+    }
+}

mcs/class/System.IO.Compression/SharpCompress/Common/CompressionType.cs

@@ -0,0 +1,16 @@
+namespace SharpCompress.Common
+{
+    internal enum CompressionType
+    {
+        None,
+        GZip,
+        BZip2,
+        PPMd,
+        Deflate,
+        Rar,
+        LZMA,
+        BCJ,
+        BCJ2,
+        Unknown,
+    }
+}