From 2aa123ccd7bc8db2c8caa6f1b5c3a4bae7f79ffc Mon Sep 17 00:00:00 2001
From: Anders Gardebring <anders.gardebring@adlibris.com>
Date: Tue, 25 Apr 2017 13:21:04 +0200
Subject: [PATCH] Remove begin and end events since this can now be tracked via
 progress instead

---
 src/SharpCompress/Readers/AbstractReader.cs   | 29 ++++---------------
 src/SharpCompress/Readers/IReader.cs          |  2 --
 .../Readers/IReaderExtractionListener.cs      |  3 --
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/SharpCompress/Readers/AbstractReader.cs b/src/SharpCompress/Readers/AbstractReader.cs
index ecfeeb4b..af0cbdeb 100644
--- a/src/SharpCompress/Readers/AbstractReader.cs
+++ b/src/SharpCompress/Readers/AbstractReader.cs
@@ -180,15 +180,13 @@ namespace SharpCompress.Readers
                                                 "A writable Stream was required.  Use Cancel if that was intended.");
             }
 
-            var streamListener = this as IReaderExtractionListener;
-            streamListener.FireEntryExtractionBegin(Entry);
-            Write(writableStream, streamListener);
-            streamListener.FireEntryExtractionEnd(Entry);
+            Write(writableStream);
             wroteCurrentEntry = true;
         }
 
-        internal void Write(Stream writeStream, IReaderExtractionListener streamListener)
+        internal void Write(Stream writeStream)
         {
+            var streamListener = this as IReaderExtractionListener;
             using (Stream s = OpenEntryStream())
             {
                 s.TransferTo(writeStream, Entry, streamListener);
@@ -247,28 +245,13 @@ namespace SharpCompress.Readers
                                               });
             }
         }
-
-        void IReaderExtractionListener.FireEntryExtractionBegin(Entry entry)
-        {
-            if (EntryExtractionBegin != null)
-            {
-                EntryExtractionBegin(this, new ReaderExtractionEventArgs<IEntry>(entry));
-            }
-        }
-
         void IReaderExtractionListener.FireEntryExtractionProgress(Entry entry, long bytesTransferred, int iterations)
         {
             if (EntryExtractionProgress != null)
             {
-                EntryExtractionProgress(this, new ReaderExtractionEventArgs<IEntry>(entry, new ReaderProgress(entry, bytesTransferred, iterations)));
-            }
-        }
-
-        void IReaderExtractionListener.FireEntryExtractionEnd(Entry entry)
-        {
-            if (EntryExtractionEnd != null)
-            {
-                EntryExtractionEnd(this, new ReaderExtractionEventArgs<IEntry>(entry));
+                EntryExtractionProgress(this, 
+                    new ReaderExtractionEventArgs<IEntry>(entry, new ReaderProgress(entry, bytesTransferred, iterations))
+                );
             }
         }
     }
diff --git a/src/SharpCompress/Readers/IReader.cs b/src/SharpCompress/Readers/IReader.cs
index 1f8dbdab..db11164d 100644
--- a/src/SharpCompress/Readers/IReader.cs
+++ b/src/SharpCompress/Readers/IReader.cs
@@ -6,8 +6,6 @@ namespace SharpCompress.Readers
 {
     public interface IReader : IDisposable
     {
-        event EventHandler<ReaderExtractionEventArgs<IEntry>> EntryExtractionBegin;
-        event EventHandler<ReaderExtractionEventArgs<IEntry>> EntryExtractionEnd;
         event EventHandler<ReaderExtractionEventArgs<IEntry>> EntryExtractionProgress;
 
         event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
diff --git a/src/SharpCompress/Readers/IReaderExtractionListener.cs b/src/SharpCompress/Readers/IReaderExtractionListener.cs
index e00d9801..4a4adc4e 100644
--- a/src/SharpCompress/Readers/IReaderExtractionListener.cs
+++ b/src/SharpCompress/Readers/IReaderExtractionListener.cs
@@ -4,9 +4,6 @@ namespace SharpCompress.Readers
 {
     internal interface IReaderExtractionListener : IExtractionListener
     {
-        //        void EnsureEntriesLoaded();
-        void FireEntryExtractionBegin(Entry entry);
-        void FireEntryExtractionEnd(Entry entry);
         void FireEntryExtractionProgress(Entry entry, long sizeTransferred, int iterations);
     }
 }
\ No newline at end of file