Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #133 from kikijiki/kikijiki-fix-awaitable-functions
Browse files Browse the repository at this point in the history 
Fix exception rethrow in async functions
  • Loading branch information
@squid-box
squid-box committed Aug 15, 2021
2 parents 05314bb + fb0710f commit 114a332
Show file tree
Hide file tree
Showing 2 changed files with 181 additions and 73 deletions.
170 changes: 121 additions & 49 deletions SevenZip/SevenZipCompressorAsynchronous.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,17 @@ public void BeginCompressFilesEncrypted(Stream archiveStream, int commonRootLeng
/// </summary>
/// <param name="fileFullNames">Array of file names to pack.</param>
/// <param name="archiveName">The archive file name.</param>
public Task CompressFilesAsync(string archiveName, params string[] fileFullNames)
public async Task CompressFilesAsync(string archiveName, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFiles1Delegate(CompressFiles).Invoke(archiveName, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFiles1Delegate(CompressFiles).Invoke(archiveName, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -159,11 +165,17 @@ public Task CompressFilesAsync(string archiveName, params string[] fileFullNames
/// <param name="fileFullNames">Array of file names to pack.</param>
/// <param name="archiveStream">The archive output stream.
/// Use CompressFiles(string archiveName ... ) overloads for archiving to disk.</param>
public Task CompressFilesAsync(Stream archiveStream, params string[] fileFullNames)
public async Task CompressFilesAsync(Stream archiveStream, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFiles2Delegate(CompressFiles).Invoke(archiveStream, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFiles2Delegate(CompressFiles).Invoke(archiveStream, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -172,11 +184,17 @@ public Task CompressFilesAsync(Stream archiveStream, params string[] fileFullNam
/// <param name="fileFullNames">Array of file names to pack.</param>
/// <param name="commonRootLength">The length of the common root of the file names.</param>
/// <param name="archiveName">The archive file name.</param>
public Task CompressFilesAsync(string archiveName, int commonRootLength, params string[] fileFullNames)
public async Task CompressFilesAsync(string archiveName, int commonRootLength, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFiles3Delegate(CompressFiles).Invoke(archiveName, commonRootLength, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFiles3Delegate(CompressFiles).Invoke(archiveName, commonRootLength, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -186,11 +204,17 @@ public Task CompressFilesAsync(string archiveName, int commonRootLength, params
/// <param name="commonRootLength">The length of the common root of the file names.</param>
/// <param name="archiveStream">The archive output stream.
/// Use CompressFiles(string archiveName, ... ) overloads for archiving to disk.</param>
public Task CompressFilesAsync(Stream archiveStream, int commonRootLength, params string[] fileFullNames)
public async Task CompressFilesAsync(Stream archiveStream, int commonRootLength, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFiles4Delegate(CompressFiles).Invoke(archiveStream, commonRootLength, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFiles4Delegate(CompressFiles).Invoke(archiveStream, commonRootLength, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -199,11 +223,17 @@ public Task CompressFilesAsync(Stream archiveStream, int commonRootLength, param
/// <param name="fileFullNames">Array of file names to pack.</param>
/// <param name="archiveName">The archive file name</param>
/// <param name="password">The archive password.</param>
public Task CompressFilesEncryptedAsync(string archiveName, string password, params string[] fileFullNames)
public async Task CompressFilesEncryptedAsync(string archiveName, string password, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFilesEncrypted1Delegate(CompressFilesEncrypted).Invoke(archiveName, password, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFilesEncrypted1Delegate(CompressFilesEncrypted).Invoke(archiveName, password, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -213,11 +243,17 @@ public Task CompressFilesEncryptedAsync(string archiveName, string password, par
/// <param name="archiveStream">The archive output stream.
/// Use CompressFiles( ... string archiveName ... ) overloads for archiving to disk.</param>
/// <param name="password">The archive password.</param>
public Task CompressFilesEncryptedAsync(Stream archiveStream, string password, params string[] fileFullNames)
public async Task CompressFilesEncryptedAsync(Stream archiveStream, string password, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFilesEncrypted2Delegate(CompressFilesEncrypted).Invoke(archiveStream, password, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFilesEncrypted2Delegate(CompressFilesEncrypted).Invoke(archiveStream, password, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -227,11 +263,17 @@ public Task CompressFilesEncryptedAsync(Stream archiveStream, string password, p
/// <param name="archiveName">The archive file name</param>
/// <param name="password">The archive password.</param>
/// <param name="commonRootLength">The length of the common root of the file names.</param>
public Task CompressFilesEncryptedAsync(string archiveName, int commonRootLength, string password, params string[] fileFullNames)
public async Task CompressFilesEncryptedAsync(string archiveName, int commonRootLength, string password, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFilesEncrypted3Delegate(CompressFilesEncrypted).Invoke(archiveName, commonRootLength, password, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFilesEncrypted3Delegate(CompressFilesEncrypted).Invoke(archiveName, commonRootLength, password, fileFullNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -242,11 +284,17 @@ public Task CompressFilesEncryptedAsync(string archiveName, int commonRootLength
/// Use CompressFiles( ... string archiveName ... ) overloads for archiving to disk.</param>
/// <param name="password">The archive password.</param>
/// <param name="commonRootLength">The length of the common root of the file names.</param>
public Task CompressFilesEncryptedAsync(Stream archiveStream, int commonRootLength, string password, params string[] fileFullNames)
public async Task CompressFilesEncryptedAsync(Stream archiveStream, int commonRootLength, string password, params string[] fileFullNames)
{
SaveContext();
return Task.Run(() => new CompressFilesEncrypted4Delegate(CompressFilesEncrypted).Invoke(archiveStream, commonRootLength, password, fileFullNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressFilesEncrypted4Delegate(CompressFilesEncrypted).Invoke(archiveStream, commonRootLength, password, fileFullNames));
}
finally
{
ReleaseContext();
}
}

#endregion
Expand Down Expand Up @@ -296,11 +344,17 @@ public void BeginCompressDirectory(string directory, Stream archiveStream, strin
/// <param name="password">The archive password.</param>
/// <param name="searchPattern">Search string, such as "*.txt".</param>
/// <param name="recursion">If true, files will be searched for recursively; otherwise, not.</param>
public Task CompressDirectoryAsync(string directory, string archiveName, string password = "", string searchPattern = "*", bool recursion = true)
public async Task CompressDirectoryAsync(string directory, string archiveName, string password = "", string searchPattern = "*", bool recursion = true)
{
SaveContext();
return Task.Run(() => new CompressDirectoryDelegate(CompressDirectory).Invoke(directory, archiveName, password, searchPattern, recursion))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressDirectoryDelegate(CompressDirectory).Invoke(directory, archiveName, password, searchPattern, recursion));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -312,11 +366,17 @@ public Task CompressDirectoryAsync(string directory, string archiveName, string
/// <param name="password">The archive password.</param>
/// <param name="searchPattern">Search string, such as "*.txt".</param>
/// <param name="recursion">If true, files will be searched for recursively; otherwise, not.</param>
public Task CompressDirectoryAsync(string directory, Stream archiveStream, string password, string searchPattern = "*", bool recursion = true)
public async Task CompressDirectoryAsync(string directory, Stream archiveStream, string password, string searchPattern = "*", bool recursion = true)
{
SaveContext();
return Task.Run(() => new CompressDirectory2Delegate(CompressDirectory).Invoke(directory, archiveStream, password, searchPattern, recursion))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new CompressDirectory2Delegate(CompressDirectory).Invoke(directory, archiveStream, password, searchPattern, recursion));
}
finally
{
ReleaseContext();
}
}

#endregion
Expand Down Expand Up @@ -348,13 +408,19 @@ public void BeginCompressStream(Stream inStream, Stream outStream, string passwo
/// <param name="outStream">The destination compressed stream.</param>
/// <param name="password">The archive password.</param>
/// <exception cref="System.ArgumentException">ArgumentException: at least one of the specified streams is invalid.</exception>
public Task CompressStreamAsync(Stream inStream, Stream outStream, string password = "")
public async Task CompressStreamAsync(Stream inStream, Stream outStream, string password = "")
{
SaveContext();
return Task.Run(() => new CompressStreamDelegate(CompressStream).Invoke(inStream, outStream, password))
.ContinueWith(_ => ReleaseContext());

try
{
SaveContext();
await Task.Run(() => new CompressStreamDelegate(CompressStream).Invoke(inStream, outStream, password));
}
finally
{
ReleaseContext();
}
}

#endregion

#region BeginModifyArchive overloads
Expand Down Expand Up @@ -382,11 +448,17 @@ public void BeginModifyArchive(string archiveName, IDictionary<int, string> newF
/// <param name="archiveName">The archive file name.</param>
/// <param name="newFileNames">New file names. Null value to delete the corresponding index.</param>
/// <param name="password">The archive password.</param>
public Task ModifyArchiveAsync(string archiveName, IDictionary<int, string> newFileNames, string password = "")
public async Task ModifyArchiveAsync(string archiveName, IDictionary<int, string> newFileNames, string password = "")
{
SaveContext();
return Task.Run(() => new ModifyArchiveDelegate(ModifyArchive).Invoke(archiveName, newFileNames, password))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ModifyArchiveDelegate(ModifyArchive).Invoke(archiveName, newFileNames, password));
}
finally
{
ReleaseContext();
}
}

#endregion
Expand Down
84 changes: 60 additions & 24 deletions SevenZip/SevenZipExtractorAsynchronous.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,17 @@ public void BeginExtractArchive(string directory)
/// Unpacks the whole archive asynchronously to the specified directory name at the specified priority.
/// </summary>
/// <param name="directory">The directory where the files are to be unpacked.</param>
public Task ExtractArchiveAsync(string directory)
public async Task ExtractArchiveAsync(string directory)
{
SaveContext();
return Task.Run(() => new ExtractArchiveDelegate(ExtractArchive).Invoke(directory))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ExtractArchiveDelegate(ExtractArchive).Invoke(directory));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -136,11 +142,17 @@ public void BeginExtractFile(string fileName, Stream stream)
/// </summary>
/// <param name="fileName">The file full name in the archive file table.</param>
/// <param name="stream">The stream where the file is to be unpacked.</param>
public Task ExtractFileAsync(string fileName, Stream stream)
public async Task ExtractFileAsync(string fileName, Stream stream)
{
SaveContext();
return Task.Run(() => new ExtractFileByFileNameDelegate(ExtractFile).Invoke(fileName, stream))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ExtractFileByFileNameDelegate(ExtractFile).Invoke(fileName, stream));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -160,11 +172,17 @@ public void BeginExtractFile(int index, Stream stream)
/// </summary>
/// <param name="index">Index in the archive file table.</param>
/// <param name="stream">The stream where the file is to be unpacked.</param>
public Task ExtractFileAsync(int index, Stream stream)
public async Task ExtractFileAsync(int index, Stream stream)
{
SaveContext();
return Task.Run(() => new ExtractFileByIndexDelegate(ExtractFile).Invoke(index, stream))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ExtractFileByIndexDelegate(ExtractFile).Invoke(index, stream));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -184,11 +202,17 @@ public void BeginExtractFiles(string directory, params int[] indexes)
/// </summary>
/// <param name="indexes">indexes of the files in the archive file table.</param>
/// <param name="directory">Directory where the files are to be unpacked.</param>
public Task ExtractFilesAsync(string directory, params int[] indexes)
public async Task ExtractFilesAsync(string directory, params int[] indexes)
{
SaveContext();
return Task.Run(() => new ExtractFiles1Delegate(ExtractFiles).Invoke(directory, indexes))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ExtractFiles1Delegate(ExtractFiles).Invoke(directory, indexes));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -208,11 +232,17 @@ public void BeginExtractFiles(string directory, params string[] fileNames)
/// </summary>
/// <param name="fileNames">Full file names in the archive file table.</param>
/// <param name="directory">Directory where the files are to be unpacked.</param>
public Task ExtractFilesAsync(string directory, params string[] fileNames)
public async Task ExtractFilesAsync(string directory, params string[] fileNames)
{
SaveContext();
return Task.Run(() => new ExtractFiles2Delegate(ExtractFiles).Invoke(directory, fileNames))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ExtractFiles2Delegate(ExtractFiles).Invoke(directory, fileNames));
}
finally
{
ReleaseContext();
}
}

/// <summary>
Expand All @@ -234,11 +264,17 @@ public void BeginExtractFiles(ExtractFileCallback extractFileCallback)
/// 7-Zip (and any other solid) archives are NOT supported.
/// </summary>
/// <param name="extractFileCallback">The callback to call for each file in the archive.</param>
public Task ExtractFilesAsync(ExtractFileCallback extractFileCallback)
public async Task ExtractFilesAsync(ExtractFileCallback extractFileCallback)
{
SaveContext();
return Task.Run(() => new ExtractFiles3Delegate(ExtractFiles).Invoke(extractFileCallback))
.ContinueWith(_ => ReleaseContext());
try
{
SaveContext();
await Task.Run(() => new ExtractFiles3Delegate(ExtractFiles).Invoke(extractFileCallback));
}
finally
{
ReleaseContext();
}
}
}
}

0 comments on commit 114a332

Please sign in to comment.