Merge branch 'zippo227-master'

Author: siegfriedpammer

src/ICSharpCode.SharpZipLib/Zip/Compression/Deflater.cs

@@ -77,9 +77,45 @@ public class Deflater
 		/// There is no need to use this constant at all.
 		/// </summary>
 		public const int DEFLATED = 8;
-		#endregion
-		#region Local Constants
-		private const int IS_SETDICT = 0x01;
+        #endregion
+        #region Public Enum
+
+        /// <summary>
+        /// Compression Level as an enum for safer use
+        /// </summary>
+        public enum CompressionLevel
+        {
+            /// <summary>
+            /// The best and slowest compression level.  This tries to find very
+            /// long and distant string repetitions.
+            /// </summary>
+            BEST_COMPRESSION = Deflater.BEST_COMPRESSION,
+
+            /// <summary>
+            /// The worst but fastest compression level.
+            /// </summary>
+            BEST_SPEED = Deflater.BEST_SPEED,
+
+            /// <summary>
+            /// The default compression level.
+            /// </summary>
+            DEFAULT_COMPRESSION = Deflater.DEFAULT_COMPRESSION,
+
+            /// <summary>
+            /// This level won't compress at all but output uncompressed blocks.
+            /// </summary>
+            NO_COMPRESSION = Deflater.NO_COMPRESSION,
+
+            /// <summary>
+            /// The compression method.  This is the only method supported so far.
+            /// There is no need to use this constant at all.
+            /// </summary>
+            DEFLATED = Deflater.DEFLATED
+        }
+
+        #endregion
+        #region Local Constants
+        private const int IS_SETDICT = 0x01;
 		private const int IS_FLUSHING = 0x04;
 		private const int IS_FINISHING = 0x08;
 

src/ICSharpCode.SharpZipLib/Zip/FastZip.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.Zip.Compression;
+using static ICSharpCode.SharpZipLib.Zip.Compression.Deflater;
 
 namespace ICSharpCode.SharpZipLib.Zip
 {
@@ -170,6 +172,7 @@ public enum Overwrite
 			/// </summary>
 			Always
 		}
+
 		#endregion
 
 		#region Constructors
@@ -263,13 +266,22 @@ public bool RestoreDateTimeOnExtract {
 		}
 
 		/// <summary>
-		/// Get/set a value indicating wether file attributes should
+		/// Get/set a value indicating whether file attributes should
 		/// be restored during extract operations
 		/// </summary>
 		public bool RestoreAttributesOnExtract {
 			get { return restoreAttributesOnExtract_; }
 			set { restoreAttributesOnExtract_ = value; }
 		}
+
+        /// <summary>
+        /// Get/set the Compression Level that will be used
+        /// when creating the zip
+        /// </summary>
+        public Deflater.CompressionLevel CompressionLevel{
+            get { return compressionLevel_; }
+            set { compressionLevel_ = value; }
+        }
 		#endregion
 
 		#region Delegates
@@ -322,6 +334,8 @@ public void CreateZip(Stream outputStream, string sourceDirectory, bool recurse,
 
 			using (outputStream_ = new ZipOutputStream(outputStream)) {
 
+                outputStream_.SetLevel((int)CompressionLevel);
+
 				if (password_ != null) {
 					outputStream_.Password = password_;
 				}
@@ -640,8 +654,9 @@ static bool NameIsValid(string name)
 		IEntryFactory entryFactory_ = new ZipEntryFactory();
 		INameTransform extractNameTransform_;
 		UseZip64 useZip64_ = UseZip64.Dynamic;
+        CompressionLevel compressionLevel_ = CompressionLevel.DEFAULT_COMPRESSION;
 
-		string password_;
+        string password_;
 
 		#endregion
 	}