From 9659b4de0ee1c979ca3f4367863c1243f52ac502 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 15 Sep 2016 16:20:00 -0700
Subject: [PATCH] [ZipFile, ZipFileEntry, FileTools] Move more things around

---
 SabreTools.Helper/Objects/ZipFIle.cs      | 10 +++++-----
 SabreTools.Helper/Objects/ZipFileEntry.cs | 12 +++++++++++-
 SabreTools.Helper/Tools/FileTools.cs      |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/SabreTools.Helper/Objects/ZipFIle.cs b/SabreTools.Helper/Objects/ZipFIle.cs
index 654cf5f0..45579273 100644
--- a/SabreTools.Helper/Objects/ZipFIle.cs
+++ b/SabreTools.Helper/Objects/ZipFIle.cs
@@ -1,12 +1,8 @@
-using Ionic.Crc;
-using Ionic.Zlib;
-using OCRC;
+using OCRC;
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace SabreTools.Helper
 {
@@ -52,6 +48,10 @@ namespace SabreTools.Helper
 		{
 			get { return _zipStatus; }
 		}
+		public List<ZipFileEntry> Entries
+		{
+			get { return _entries; }
+		}
 		public int EntriesCount
 		{
 			get { return _entries.Count; }
diff --git a/SabreTools.Helper/Objects/ZipFileEntry.cs b/SabreTools.Helper/Objects/ZipFileEntry.cs
index d9f54ffb..7e8eb0bd 100644
--- a/SabreTools.Helper/Objects/ZipFileEntry.cs
+++ b/SabreTools.Helper/Objects/ZipFileEntry.cs
@@ -13,7 +13,7 @@ namespace SabreTools.Helper
 	/// Based on work by GordonJ for RomVault
 	/// https://github.com/gjefferyes/RomVault/blob/master/ROMVault2/SupportedFiles/Zip/zipFile.cs
 	/// </remarks>
-	public class ZipFileEntry
+	public class ZipFileEntry : IEquatable<ZipFileEntry>
 	{
 		#region Private instance variables
 
@@ -155,6 +155,16 @@ namespace SabreTools.Helper
 
 		#endregion
 
+		/// <summary>
+		/// Check if an entry equals another (use only name for now)
+		/// </summary>
+		/// <param name="zfe"></param>
+		/// <returns></returns>
+		public bool Equals(ZipFileEntry zfe)
+		{
+			return (String.Equals(_fileName, zfe.FileName, StringComparison.InvariantCultureIgnoreCase));
+		}
+
 		/// <summary>
 		/// Read the central directory entry from the input stream
 		/// </summary>
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index 4f882ee3..26c562eb 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -1,10 +1,10 @@
-using OCRC;
+//using Ionic.Zlib;
+using OCRC;
 using SharpCompress.Archive;
 using SharpCompress.Archive.SevenZip;
 using SharpCompress.Common;
 using SharpCompress.Reader;
 using System;
-//using Ionic.Zlib;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;