jeddunk/auto-creamapi-2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

remove try catch clause in extract function

Browse Source
This commit is contained in:
Jeddunk 2021-01-13 13:06:28 +01:00
parent 478d5196a6
commit b14e8944c3
1 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
auto-creamapi/Services/DownloadCreamApiService.cs
View File

@ -103,47 +103,39 @@ namespace auto_creamapi.Services
const string steamApi64Dll = "steam_api64.dll"; const string steamApi64Dll = "steam_api64.dll";
const string steamApiDll = "steam_api.dll"; const string steamApiDll = "steam_api.dll";
MyLogger.Log.Information($@"Start extraction of ""{filename}""..."); MyLogger.Log.Information($@"Start extraction of ""{filename}""...");
try var nonlogBuildPath = Path.Combine(cwd, nonlogBuild);
if (Directory.Exists(nonlogBuildPath))
Directory.Delete(nonlogBuildPath, true);
_messenger.Publish(new ProgressMessage(this, "Extracting...", filename, 1.0));
SevenZipBase.SetLibraryPath(Path.Combine(cwd, "resources/7z.dll"));
using (var extractor =
new SevenZipExtractor(filename, ArchivePassword, InArchiveFormat.Rar)
{PreserveDirectoryStructure = false})
{ {
var nonlogBuildPath = Path.Combine(cwd, nonlogBuild); await extractor.ExtractFilesAsync(
if (Directory.Exists(nonlogBuildPath)) cwd,
Directory.Delete(nonlogBuildPath, true); $@"{nonlogBuild}\{steamApi64Dll}",
_messenger.Publish(new ProgressMessage(this, "Extracting...", filename, 1.0)); $@"{nonlogBuild}\{steamApiDll}"
SevenZipBase.SetLibraryPath(Path.Combine(cwd, "resources/7z.dll")); ).ConfigureAwait(false);
using (var extractor =
new SevenZipExtractor(filename, ArchivePassword, InArchiveFormat.Rar)
{PreserveDirectoryStructure = false})
{
await extractor.ExtractFilesAsync(
cwd,
$@"{nonlogBuild}\{steamApi64Dll}",
$@"{nonlogBuild}\{steamApiDll}"
).ConfigureAwait(false);
}
if (File.Exists(Path.Combine(nonlogBuildPath, steamApi64Dll)))
File.Move(
Path.Combine(cwd, nonlogBuild, steamApi64Dll),
Path.Combine(cwd, steamApi64Dll),
true
);
if (File.Exists(Path.Combine(nonlogBuildPath, steamApiDll)))
File.Move(
Path.Combine(nonlogBuildPath, steamApiDll),
Path.Combine(cwd, steamApiDll),
true
);
if (Directory.Exists(nonlogBuildPath))
Directory.Delete(nonlogBuildPath, true);
MyLogger.Log.Information("Extraction done!");
}
catch (Exception e)
{
Console.WriteLine(e);
throw;
} }
if (File.Exists(Path.Combine(nonlogBuildPath, steamApi64Dll)))
File.Move(
Path.Combine(cwd, nonlogBuild, steamApi64Dll),
Path.Combine(cwd, steamApi64Dll),
true
);
if (File.Exists(Path.Combine(nonlogBuildPath, steamApiDll)))
File.Move(
Path.Combine(nonlogBuildPath, steamApiDll),
Path.Combine(cwd, steamApiDll),
true
);
if (Directory.Exists(nonlogBuildPath))
Directory.Delete(nonlogBuildPath, true);
MyLogger.Log.Information("Extraction done!");
} }
} }
} }