claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add and use ThrowOnError global (temp)

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-15 12:12:13 -07:00
parent ab06bf89f6
commit 91f659dca2
34 changed files with 468 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SabreTools.Library/FileTypes/Folder.cs
View File

@@ -127,6 +127,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return false;
}
@@ -205,6 +208,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return realentry;
}
@@ -244,6 +250,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return (ms, realentry);
}
@@ -380,7 +389,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}
finally

18
SabreTools.Library/FileTypes/GZipArchive.cs
View File

@@ -75,17 +75,25 @@ namespace SabreTools.Library.FileTypes
encounteredErrors = false;
}
catch (EndOfStreamException)
catch (EndOfStreamException ex)
{
// Catch this but don't count it as an error because SharpCompress is unsafe
if (Globals.ThrowOnError)
throw ex;
}
catch (InvalidOperationException)
catch (InvalidOperationException ex)
{
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
@@ -173,6 +181,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
ms = null;
realEntry = null;
}
@@ -242,6 +253,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return null;
}
}

20
SabreTools.Library/FileTypes/RarArchive.cs
View File

@@ -68,17 +68,25 @@ namespace SabreTools.Library.FileTypes
encounteredErrors = false;
ra.Dispose();
}
catch (EndOfStreamException)
catch (EndOfStreamException ex)
{
// Catch this but don't count it as an error because SharpCompress is unsafe
if (Globals.ThrowOnError)
throw ex;
}
catch (InvalidOperationException)
catch (InvalidOperationException ex)
{
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
@@ -159,6 +167,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
ms = null;
realEntry = null;
}
@@ -219,6 +230,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return null;
}
@@ -260,6 +274,8 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
}
return empties;

30
SabreTools.Library/FileTypes/SevenZipArchive.cs
View File

@@ -117,17 +117,25 @@ namespace SabreTools.Library.FileTypes
zf.ZipFileClose();
encounteredErrors = false;
}
catch (EndOfStreamException)
catch (EndOfStreamException ex)
{
// Catch this but don't count it as an error because SharpCompress is unsafe
if (Globals.ThrowOnError)
throw ex;
}
catch (InvalidOperationException)
catch (InvalidOperationException ex)
{
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
@@ -243,6 +251,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
ms = null;
realEntry = null;
}
@@ -330,6 +341,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return null;
}
@@ -383,6 +397,8 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
}
return empties;
@@ -599,7 +615,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}
finally
@@ -828,7 +847,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}

31
SabreTools.Library/FileTypes/TapeArchive.cs
View File

@@ -73,17 +73,26 @@ namespace SabreTools.Library.FileTypes
encounteredErrors = false;
ta.Dispose();
}
catch (EndOfStreamException)
catch (EndOfStreamException ex)
{
// Catch this but don't count it as an error because SharpCompress is unsafe
if (Globals.ThrowOnError)
throw ex;
}
catch (InvalidOperationException)
catch (InvalidOperationException ex)
{
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
@@ -164,6 +173,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
ms = null;
realEntry = null;
}
@@ -224,6 +236,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return null;
}
@@ -265,6 +280,8 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
}
return empties;
@@ -418,7 +435,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}
finally
@@ -598,7 +618,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}
finally

18
SabreTools.Library/FileTypes/XZArchive.cs
View File

@@ -69,17 +69,25 @@ namespace SabreTools.Library.FileTypes
encounteredErrors = false;
}
catch (EndOfStreamException)
catch (EndOfStreamException ex)
{
// Catch this but don't count it as an error because SharpCompress is unsafe
if (Globals.ThrowOnError)
throw ex;
}
catch (InvalidOperationException)
catch (InvalidOperationException ex)
{
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
@@ -165,6 +173,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
ms = null;
realEntry = null;
}
@@ -231,6 +242,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return null;
}
}

30
SabreTools.Library/FileTypes/ZipArchive.cs
View File

@@ -118,17 +118,25 @@ namespace SabreTools.Library.FileTypes
zf.ZipFileClose();
encounteredErrors = false;
}
catch (EndOfStreamException)
catch (EndOfStreamException ex)
{
// Catch this but don't count it as an error because SharpCompress is unsafe
if (Globals.ThrowOnError)
throw ex;
}
catch (InvalidOperationException)
catch (InvalidOperationException ex)
{
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
encounteredErrors = true;
}
@@ -244,6 +252,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
ms = null;
realEntry = null;
}
@@ -335,6 +346,9 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
return null;
}
@@ -388,6 +402,8 @@ namespace SabreTools.Library.FileTypes
catch (Exception ex)
{
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
}
return empties;
@@ -603,7 +619,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}
finally
@@ -833,7 +852,10 @@ namespace SabreTools.Library.FileTypes
}
catch (Exception ex)
{
Console.WriteLine(ex);
Globals.Logger.Error(ex.ToString());
if (Globals.ThrowOnError)
throw ex;
success = false;
}