Add variants of FastZip.CreateZip that take filters as IScanFilter in…

…stead of strings
icsharpcode · Jul 14, 2020 · ce40eff · ce40eff
1 parent b6ab9f5
commit ce40eff
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/ICSharpCode.SharpZipLib/Zip/FastZip.cs b/src/ICSharpCode.SharpZipLib/Zip/FastZip.cs
@@ -339,6 +339,20 @@ public void CreateZip(string zipFileName, string sourceDirectory,
 			CreateZip(File.Create(zipFileName), sourceDirectory, recurse, fileFilter, directoryFilter);
 		}
 
+		/// <summary>
+		/// Create a zip file.
+		/// </summary>
+		/// <param name="zipFileName">The name of the zip file to create.</param>
+		/// <param name="sourceDirectory">The directory to source files from.</param>
+		/// <param name="recurse">True to recurse directories, false for no recursion.</param>
+		/// <param name="fileFilter">The <see cref="IScanFilter">file filter</see> to apply.</param>
+		/// <param name="directoryFilter">The <see cref="IScanFilter">directory filter</see> to apply.</param>
+		public void CreateZip(string zipFileName, string sourceDirectory,
+			bool recurse, IScanFilter fileFilter, IScanFilter directoryFilter)
+		{
+			CreateZip(File.Create(zipFileName), sourceDirectory, recurse, fileFilter, directoryFilter);
+		}
+
 		/// <summary>
 		/// Create a zip file/archive.
 		/// </summary>
@@ -361,6 +375,35 @@ public void CreateZip(string zipFileName, string sourceDirectory, bool recurse,
 		/// <param name="directoryFilter">The <see cref="PathFilter">directory filter</see> to apply.</param>
 		/// <remarks>The <paramref name="outputStream"/> is closed after creation.</remarks>
 		public void CreateZip(Stream outputStream, string sourceDirectory, bool recurse, string fileFilter, string directoryFilter)
+		{
+			var scanner = new FileSystemScanner(fileFilter, directoryFilter);
+			CreateZip(outputStream, sourceDirectory, recurse, scanner);
+		}
+
+		/// <summary>
+		/// Create a zip archive sending output to the <paramref name="outputStream"/> passed.
+		/// </summary>
+		/// <param name="outputStream">The stream to write archive data to.</param>
+		/// <param name="sourceDirectory">The directory to source files from.</param>
+		/// <param name="recurse">True to recurse directories, false for no recursion.</param>
+		/// <param name="fileFilter">The <see cref="IScanFilter">file filter</see> to apply.</param>
+		/// <param name="directoryFilter">The <see cref="IScanFilter">directory filter</see> to apply.</param>
+		/// <remarks>The <paramref name="outputStream"/> is closed after creation.</remarks>
+		public void CreateZip(Stream outputStream, string sourceDirectory, bool recurse, IScanFilter fileFilter, IScanFilter directoryFilter)
+		{
+			var scanner = new FileSystemScanner(fileFilter, directoryFilter);
+			CreateZip(outputStream, sourceDirectory, recurse, scanner);
+		}
+
+		/// <summary>
+		/// Create a zip archive sending output to the <paramref name="outputStream"/> passed.
+		/// </summary>
+		/// <param name="outputStream">The stream to write archive data to.</param>
+		/// <param name="sourceDirectory">The directory to source files from.</param>
+		/// <param name="recurse">True to recurse directories, false for no recursion.</param>
+		/// <param name="scanner">For performing the actual file system scan</param>
+		/// <remarks>The <paramref name="outputStream"/> is closed after creation.</remarks>
+		private void CreateZip(Stream outputStream, string sourceDirectory, bool recurse, FileSystemScanner scanner)
 		{
 			NameTransform = new ZipNameTransform(sourceDirectory);
 			sourceDirectory_ = sourceDirectory;
@@ -375,7 +418,6 @@ public void CreateZip(Stream outputStream, string sourceDirectory, bool recurse,
 				}
 
 				outputStream_.UseZip64 = UseZip64;
-				var scanner = new FileSystemScanner(fileFilter, directoryFilter);
 				scanner.ProcessFile += ProcessFile;
 				if (this.CreateEmptyDirectories)
 				{

diff --git a/test/ICSharpCode.SharpZipLib.Tests/Zip/FastZipHandling.cs b/test/ICSharpCode.SharpZipLib.Tests/Zip/FastZipHandling.cs
@@ -238,7 +238,7 @@ private void TestFileNames(IEnumerable<string> names)
 					nameCount++;
 				}
 
-				zippy.CreateZip(tempZip.Filename, tempDir.Fullpath, true, null, null);
+				zippy.CreateZip(tempZip.Filename, tempDir.Fullpath, true, null);
 
 				using (ZipFile z = new ZipFile(tempZip.Filename))
 				{