starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-22 23:15:20 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Remove begin and end events since this can now be tracked via progress instead

Browse Source
This commit is contained in:
Anders Gardebring
2017-04-25 13:21:04 +02:00
parent 0990b06cc9
commit 2aa123ccd7
3 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/SharpCompress/Readers/AbstractReader.cs
View File

@@ -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))
);
}
}
}

2
src/SharpCompress/Readers/IReader.cs
View File

@@ -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;

3
src/SharpCompress/Readers/IReaderExtractionListener.cs
View File

@@ -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);
}
}