Delegates renamed which is a breaking change. Other minor tweaks in ZipExtraData to allow reading of various tagged data values. Not completely finished yet.

jfreilly · jfreilly · commit ed489113dcd5 · 2007-08-14T09:23:51.000Z
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
@@ -73,8 +73,8 @@
 [assembly: AssemblyCopyright("Copyright 2001-2007 Mike Krueger, John Reilly")]
 [assembly: AssemblyTrademark("Copyright 2001-2007 Mike Krueger, John Reilly")]
 
-[assembly: AssemblyVersion("0.85.2.329")]
-[assembly: AssemblyInformationalVersionAttribute("0.85.2")]
+[assembly: AssemblyVersion("0.85.3.346")]
+[assembly: AssemblyInformationalVersionAttribute("0.85.3")]
 
 
 [assembly: CLSCompliant(true)]
diff --git a/src/Core/FileSystemScanner.cs b/src/Core/FileSystemScanner.cs
@@ -64,7 +64,6 @@ public string Name
 			get { return name_; }
 		}
 		
-		
 		/// <summary>
 		/// Get set a value indicating if scanning should continue or not.
 		/// </summary>
@@ -163,26 +162,32 @@ public bool ContinueRunning
 	}
 	
 	#endregion
+	
 	#region Delegates
 	/// <summary>
-	/// Delegate invoked when a directory is processed.
+	/// Delegate invoked before starting to process a directory.
 	/// </summary>
-	public delegate void ProcessDirectoryDelegate(object sender, DirectoryEventArgs e);
+	public delegate void ProcessDirectoryHandler(object sender, DirectoryEventArgs e);
 	
 	/// <summary>
-	/// Delegate invoked when a file is processed.
+	/// Delegate invoked before starting to process a file.
+	/// </summary>
+	public delegate void ProcessFileHandler(object sender, ScanEventArgs e);
+
+	/// <summary>
+	/// Delegate invoked when a file has been completely processed.
 	/// </summary>
-	public delegate void ProcessFileDelegate(object sender, ScanEventArgs e);
+	public delegate void CompletedFileHandler(object sender, ScanEventArgs e);
 	
 	/// <summary>
 	/// Delegate invoked when a directory failure is detected.
 	/// </summary>
-	public delegate void DirectoryFailureDelegate(object sender, ScanFailureEventArgs e);
+	public delegate void DirectoryFailureHandler(object sender, ScanFailureEventArgs e);
 	
 	/// <summary>
 	/// Delegate invoked when a file failure is detected.
 	/// </summary>
-	public delegate void FileFailureDelegate(object sender, ScanFailureEventArgs e);
+	public delegate void FileFailureHandler(object sender, ScanFailureEventArgs e);
 	#endregion
 
 	/// <summary>
@@ -231,26 +236,32 @@ public FileSystemScanner(IScanFilter fileFilter, IScanFilter directoryFilter)
 			directoryFilter_ = directoryFilter;
 		}
 		#endregion
+
 		#region Delegates
 		/// <summary>
 		/// Delegate to invoke when a directory is processed.
 		/// </summary>
-		public ProcessDirectoryDelegate ProcessDirectory;
+		public ProcessDirectoryHandler ProcessDirectory;
 		
 		/// <summary>
 		/// Delegate to invoke when a file is processed.
 		/// </summary>
-		public ProcessFileDelegate ProcessFile;
+		public ProcessFileHandler ProcessFile;
+
+		/// <summary>
+		/// Delegate to invoke when processing for a file has finished.
+		/// </summary>
+		public CompletedFileHandler CompletedFile;
 
 		/// <summary>
 		/// Delegate to invoke when a directory failure is detected.
 		/// </summary>
-		public DirectoryFailureDelegate DirectoryFailure;
+		public DirectoryFailureHandler DirectoryFailure;
 		
 		/// <summary>
 		/// Delegate to invoke when a file failure is detected.
 		/// </summary>
-		public FileFailureDelegate FileFailure;
+		public FileFailureHandler FileFailure;
 		#endregion
 
 		/// <summary>
@@ -289,21 +300,31 @@ public void OnFileFailure(string file, Exception e)
 		/// Raise the ProcessFile event.
 		/// </summary>
 		/// <param name="file">The file name.</param>
-		public void OnProcessFile(string file)
+		void OnProcessFile(string file)
 		{
 			if ( ProcessFile != null ) {
 				ScanEventArgs args = new ScanEventArgs(file);
 				ProcessFile(this, args);
 				alive_ = args.ContinueRunning;
 			}
 		}
-		
+
+		void OnCompleteFile(string file)
+		{
+			if (CompletedFile != null)
+			{
+				ScanEventArgs args = new ScanEventArgs(file);
+				CompletedFile(this, args);
+				alive_ = args.ContinueRunning;
+			}
+		}
+
 		/// <summary>
 		/// Raise the ProcessDirectory event.
 		/// </summary>
 		/// <param name="directory">The directory name.</param>
 		/// <param name="hasMatchingFiles">Flag indicating if the directory has matching files.</param>
-		public void OnProcessDirectory(string directory, bool hasMatchingFiles)
+		void OnProcessDirectory(string directory, bool hasMatchingFiles)
 		{
 			if ( ProcessDirectory != null ) {
 				DirectoryEventArgs args = new DirectoryEventArgs(directory, hasMatchingFiles);
diff --git a/src/ICSharpCode.SharpZLib.csproj b/src/ICSharpCode.SharpZLib.csproj
@@ -3,7 +3,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0AAD2BF5-F6C9-4180-9C50-9200726052DD}</ProjectGuid>
+    <ProjectGuid>{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}</ProjectGuid>
     <RootNamespace>ICSharpCode.SharpZipLib</RootNamespace>
     <AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
     <OutputType>Library</OutputType>
@@ -12,26 +12,27 @@
     <StartupObject />
     <NoStdLib>False</NoStdLib>
     <NoConfig>False</NoConfig>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <PreBuildEvent />
     <PostBuildEvent />
+    <DocumentationFile>..\bin\ICSharpCode.SharpZipLib.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>False</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>NET_VER_1</DefineConstants>
     <OutputPath>..\bin\</OutputPath>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugType>None</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <Optimize>False</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <OutputPath>..\bin\</OutputPath>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DebugType>Full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
@@ -41,9 +42,6 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <StartAction>Project</StartAction>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -62,8 +60,8 @@
     <Compile Include="Zip\ZipOutputStream.cs" />
     <Compile Include="Zip\ZipConstants.cs" />
     <Compile Include="Zip\ZipFile.cs" />
-    <Compile Include="GZip\GZipOutputStream.cs" />
-    <Compile Include="GZip\GZipInputStream.cs" />
+    <Compile Include="GZip\GzipOutputStream.cs" />
+    <Compile Include="GZip\GzipInputStream.cs" />
     <Compile Include="GZip\GZipConstants.cs" />
     <Compile Include="Zip\ZipException.cs" />
     <Compile Include="BZip2\BZip2InputStream.cs" />
@@ -109,13 +107,6 @@
     <Compile Include="Zip\ZipEntryFactory.cs" />
     <Compile Include="Zip\IEntryFactory.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Tar\" />
-    <Folder Include="Zip\Compression\" />
-    <Folder Include="Zip\Compression\Streams\" />
-    <Folder Include="Core\" />
-    <Folder Include="Encryption\" />
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
diff --git a/src/Zip/FastZip.cs b/src/Zip/FastZip.cs
@@ -47,22 +47,27 @@ public class FastZipEvents
 		/// <summary>
 		/// Delegate to invoke when processing directories.
 		/// </summary>
-		public ProcessDirectoryDelegate ProcessDirectory;
+		public ProcessDirectoryHandler ProcessDirectory;
 		
 		/// <summary>
 		/// Delegate to invoke when processing files.
 		/// </summary>
-		public ProcessFileDelegate ProcessFile;
+		public ProcessFileHandler ProcessFile;
+		
+		/// <summary>
+		/// Delegate to invoke when processing for a file has been completed.
+		/// </summary>
+		public CompletedFileHandler CompletedFile;
 		
 		/// <summary>
 		/// Delegate to invoke when processing directory failures.
 		/// </summary>
-		public DirectoryFailureDelegate DirectoryFailure;
+		public DirectoryFailureHandler DirectoryFailure;
 		
 		/// <summary>
 		/// Delegate to invoke when processing file failures.
 		/// </summary>
-		public FileFailureDelegate FileFailure;
+		public FileFailureHandler FileFailure;
 		
 		/// <summary>
 		/// Raise the <see cref="DirectoryFailure">directory failure</see> event.
@@ -99,7 +104,7 @@ public bool OnFileFailure(string file, Exception e)
 		}
 		
 		/// <summary>
-		/// Raises the <see cref="ProcessFile">Process File delegate</see>.
+		/// Fires the <see cref="ProcessFile">Process File delegate</see>.
 		/// </summary>
 		/// <param name="file">The file being processed.</param>
 		/// <returns>A boolean indicating if execution should continue or not.</returns>
@@ -114,6 +119,22 @@ public bool OnProcessFile(string file)
 			return result;
 		}
 		
+		/// <summary>
+		/// Fires the CompletedFile delegate
+		/// </summary>
+		/// <param name="file">The file whose processing has been completed.</param>
+		/// <returns>A boolean indicating if execution should continue or not.</returns>
+		public bool OnCompletedFile(string file)
+		{
+			bool result = true;
+			if ( CompletedFile != null ) {
+				ScanEventArgs args = new ScanEventArgs(file);
+				CompletedFile(this, args);
+				result = args.ContinueRunning;
+			}
+			return result;
+		}
+		
 		/// <summary>
 		/// Fires the <see cref="ProcessDirectory">process directory</see> delegate.
 		/// </summary>
@@ -306,9 +327,9 @@ public void CreateZip(Stream outputStream, string sourceDirectory, bool recurse,
 #endif
 
 				FileSystemScanner scanner = new FileSystemScanner(fileFilter, directoryFilter);
-				scanner.ProcessFile += new ProcessFileDelegate(ProcessFile);
+				scanner.ProcessFile += new ProcessFileHandler(ProcessFile);
 				if ( this.CreateEmptyDirectories ) {
-					scanner.ProcessDirectory += new ProcessDirectoryDelegate(ProcessDirectory);
+					scanner.ProcessDirectory += new ProcessDirectoryHandler(ProcessDirectory);
 				}
 				
 				if (events_ != null) {
@@ -461,7 +482,12 @@ void ExtractFileEntry(ZipEntry entry, string targetName)
 							if ( buffer_ == null ) {
 								buffer_ = new byte[4096];
 							}
+							
 							StreamUtils.Copy(zipFile_.GetInputStream(entry), outputStream, buffer_);
+							
+							if (events_ != null) {
+								continueRunning_ = events_.OnCompletedFile(entry.Name);
+							}
 						}
 
 #if !NETCF_1_0 && !NETCF_2_0
diff --git a/src/Zip/ZipEntry.cs b/src/Zip/ZipEntry.cs
@@ -540,6 +540,7 @@ public int HostSystem
 		/// 6.3 - File is encrypted using Blowfish<br/>
 		/// 6.3 - File is encrypted using Twofish<br/>
 		/// </remarks>
+		/// <seealso cref="CanDecompress"></seealso>
 		public int Version 
 		{
 			get {
@@ -572,6 +573,8 @@ public int Version
 		/// <summary>
 		/// Get a value indicating wether this entry can be decompressed by the library.
 		/// </summary>
+		/// <remarks>This is based on the <see cref="Version"></see> and 
+		/// wether the <see cref="IsCompressionMethodSupported()">compression method</see> is supported.</remarks>
 		public bool CanDecompress
 		{
 			get {
diff --git a/src/Zip/ZipEntryFactory.cs b/src/Zip/ZipEntryFactory.cs
@@ -212,7 +212,7 @@ public ZipEntry MakeFileEntry(string fileName)
 		}
 
 		/// <summary>
-		/// Make a new <see cref="ZipEntry"/> for a file.
+		/// Make a new <see cref="ZipEntry"/> from a name.
 		/// </summary>
 		/// <param name="fileName">The name of the file to create a new entry for.</param>
 		/// <param name="useFileSystem">If true entry detail is retrieved from the file system if the file exists.</param>
@@ -231,7 +231,7 @@ public ZipEntry MakeFileEntry(string fileName, bool useFileSystem)
 				fi = new FileInfo(fileName);
 			}
 
-			if (useFileSystem && fi.Exists)
+			if ((fi != null) && fi.Exists)
 			{
 				switch (timeSetting_)
 				{
@@ -333,7 +333,7 @@ public ZipEntry MakeDirectoryEntry(string directoryName, bool useFileSystem)
 			}
 
 
-			if (useFileSystem && di.Exists)
+			if ((di != null) && di.Exists)
 			{
 				switch (timeSetting_)
 				{
diff --git a/src/Zip/ZipExtraData.cs b/src/Zip/ZipExtraData.cs
diff --git a/src/Zip/ZipFile.cs b/src/Zip/ZipFile.cs
diff --git a/src/Zip/ZipHelperStream.cs b/src/Zip/ZipHelperStream.cs

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public ZipEntry MakeFileEntry(string fileName)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`/// <summary>`
`215`		`- /// Make a new <see cref="ZipEntry"/> for a file.`
	`215`	`+ /// Make a new <see cref="ZipEntry"/> from a name.`
`216`	`216`	`/// </summary>`
`217`	`217`	`/// <param name="fileName">The name of the file to create a new entry for.</param>`
`218`	`218`	`/// <param name="useFileSystem">If true entry detail is retrieved from the file system if the file exists.</param>`
`@@ -231,7 +231,7 @@ public ZipEntry MakeFileEntry(string fileName, bool useFileSystem)`
`231`	`231`	`fi = new FileInfo(fileName);`
`232`	`232`	`}`
`233`	`233`
`234`		`- if (useFileSystem && fi.Exists)`
	`234`	`+ if ((fi != null) && fi.Exists)`
`235`	`235`	`{`
`236`	`236`	`switch (timeSetting_)`
`237`	`237`	`{`
`@@ -333,7 +333,7 @@ public ZipEntry MakeDirectoryEntry(string directoryName, bool useFileSystem)`
`333`	`333`	`}`
`334`	`334`
`335`	`335`
`336`		`- if (useFileSystem && di.Exists)`
	`336`	`+ if ((di != null) && di.Exists)`
`337`	`337`	`{`
`338`	`338`	`switch (timeSetting_)`
`339`	`339`	`{`