From 26023801000d84117e3b679627e8f77a449c5d93 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Wed, 6 Jun 2018 13:45:05 -0400 Subject: [PATCH] refactor: IcdZip Unzip raises an exception instead of generating a message --- ICD.Common.Utils/IO/Compression/IcdZip.cs | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/ICD.Common.Utils/IO/Compression/IcdZip.cs b/ICD.Common.Utils/IO/Compression/IcdZip.cs index 2e10201..384fd53 100644 --- a/ICD.Common.Utils/IO/Compression/IcdZip.cs +++ b/ICD.Common.Utils/IO/Compression/IcdZip.cs @@ -23,27 +23,16 @@ namespace ICD.Common.Utils.IO.Compression /// /// /// - /// - public static bool Unzip(string path, string outputPath, out string message) + public static void Unzip(string path, string outputPath) { - try - { #if SIMPLSHARP - CrestronZIP.ResultCode result = CrestronZIP.Unzip(path, outputPath); - message = result.ToString(); - return result == CrestronZIP.ResultCode.ZR_OK; + CrestronZIP.ResultCode result = CrestronZIP.Unzip(path, outputPath); + if (result != CrestronZIP.ResultCode.ZR_OK) + throw new InvalidOperationException(result.ToString()); #else - using (ZipArchive archive = ZipFile.Open(path, ZipArchiveMode.Read)) - archive.ExtractToDirectory(outputPath); - message = "Success"; - return true; + using (ZipArchive archive = ZipFile.Open(path, ZipArchiveMode.Read)) + archive.ExtractToDirectory(outputPath); #endif - } - catch (Exception e) - { - message = e.Message; - return false; - } } ///