From e63469d2490d3f7533410c69587e52659c1c8ba6 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:38:24 -0500
Subject: [PATCH] Consolidate ChatCompression, ChatFormat, and TimestampFormat
 into Enums.cs

---
 .../Modes/Arguments/ChatDownloadArgs.cs       |  2 +-
 .../Modes/Arguments/ChatUpdateArgs.cs         |  2 +-
 TwitchDownloaderCLI/Modes/DownloadChat.cs     |  1 -
 TwitchDownloaderCLI/Modes/UpdateChat.cs       |  2 +-
 TwitchDownloaderCore/Chat/ChatCompression.cs  |  9 -------
 TwitchDownloaderCore/Chat/ChatFormat.cs       |  9 -------
 TwitchDownloaderCore/Chat/TimestampFormat.cs  | 10 --------
 .../Options/ChatDownloadOptions.cs            |  2 +-
 .../Options/ChatUpdateOptions.cs              |  2 +-
 TwitchDownloaderCore/Tools/Enums.cs           | 24 +++++++++++++++++++
 10 files changed, 29 insertions(+), 34 deletions(-)
 delete mode 100644 TwitchDownloaderCore/Chat/ChatCompression.cs
 delete mode 100644 TwitchDownloaderCore/Chat/ChatFormat.cs
 delete mode 100644 TwitchDownloaderCore/Chat/TimestampFormat.cs
 create mode 100644 TwitchDownloaderCore/Tools/Enums.cs

diff --git a/TwitchDownloaderCLI/Modes/Arguments/ChatDownloadArgs.cs b/TwitchDownloaderCLI/Modes/Arguments/ChatDownloadArgs.cs
index 6e4d5a10..b83b7ae7 100644
--- a/TwitchDownloaderCLI/Modes/Arguments/ChatDownloadArgs.cs
+++ b/TwitchDownloaderCLI/Modes/Arguments/ChatDownloadArgs.cs
@@ -1,5 +1,5 @@
 using CommandLine;
-using TwitchDownloaderCore.Chat;
+using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCLI.Modes.Arguments
 {
diff --git a/TwitchDownloaderCLI/Modes/Arguments/ChatUpdateArgs.cs b/TwitchDownloaderCLI/Modes/Arguments/ChatUpdateArgs.cs
index 0ebd86f8..507291cb 100644
--- a/TwitchDownloaderCLI/Modes/Arguments/ChatUpdateArgs.cs
+++ b/TwitchDownloaderCLI/Modes/Arguments/ChatUpdateArgs.cs
@@ -1,5 +1,5 @@
 using CommandLine;
-using TwitchDownloaderCore.Chat;
+using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCLI.Modes.Arguments
 {
diff --git a/TwitchDownloaderCLI/Modes/DownloadChat.cs b/TwitchDownloaderCLI/Modes/DownloadChat.cs
index cf6bb9a9..bd6a2159 100644
--- a/TwitchDownloaderCLI/Modes/DownloadChat.cs
+++ b/TwitchDownloaderCLI/Modes/DownloadChat.cs
@@ -4,7 +4,6 @@
 using TwitchDownloaderCLI.Modes.Arguments;
 using TwitchDownloaderCLI.Tools;
 using TwitchDownloaderCore;
-using TwitchDownloaderCore.Chat;
 using TwitchDownloaderCore.Options;
 using TwitchDownloaderCore.Tools;
 
diff --git a/TwitchDownloaderCLI/Modes/UpdateChat.cs b/TwitchDownloaderCLI/Modes/UpdateChat.cs
index bc214f9c..926e92e6 100644
--- a/TwitchDownloaderCLI/Modes/UpdateChat.cs
+++ b/TwitchDownloaderCLI/Modes/UpdateChat.cs
@@ -4,8 +4,8 @@
 using TwitchDownloaderCLI.Modes.Arguments;
 using TwitchDownloaderCLI.Tools;
 using TwitchDownloaderCore;
-using TwitchDownloaderCore.Chat;
 using TwitchDownloaderCore.Options;
+using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCLI.Modes
 {
diff --git a/TwitchDownloaderCore/Chat/ChatCompression.cs b/TwitchDownloaderCore/Chat/ChatCompression.cs
deleted file mode 100644
index 1f6bf04c..00000000
--- a/TwitchDownloaderCore/Chat/ChatCompression.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace TwitchDownloaderCore.Chat
-{
-    // TODO: Add Bzip2 and possibly 7Zip support
-    public enum ChatCompression
-    {
-        None,
-        Gzip
-    }
-}
diff --git a/TwitchDownloaderCore/Chat/ChatFormat.cs b/TwitchDownloaderCore/Chat/ChatFormat.cs
deleted file mode 100644
index 814e49e8..00000000
--- a/TwitchDownloaderCore/Chat/ChatFormat.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace TwitchDownloaderCore.Chat
-{
-    public enum ChatFormat
-    {
-        Json,
-        Text,
-        Html
-    }
-}
diff --git a/TwitchDownloaderCore/Chat/TimestampFormat.cs b/TwitchDownloaderCore/Chat/TimestampFormat.cs
deleted file mode 100644
index 5386f812..00000000
--- a/TwitchDownloaderCore/Chat/TimestampFormat.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace TwitchDownloaderCore.Chat
-{
-    public enum TimestampFormat
-    {
-        Utc,
-        Relative,
-        None,
-        UtcFull
-    }
-}
diff --git a/TwitchDownloaderCore/Options/ChatDownloadOptions.cs b/TwitchDownloaderCore/Options/ChatDownloadOptions.cs
index ee7c2c2b..7491a2bc 100644
--- a/TwitchDownloaderCore/Options/ChatDownloadOptions.cs
+++ b/TwitchDownloaderCore/Options/ChatDownloadOptions.cs
@@ -1,4 +1,4 @@
-using TwitchDownloaderCore.Chat;
+using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCore.Options
 {
diff --git a/TwitchDownloaderCore/Options/ChatUpdateOptions.cs b/TwitchDownloaderCore/Options/ChatUpdateOptions.cs
index 6b0eac01..fc4c1d51 100644
--- a/TwitchDownloaderCore/Options/ChatUpdateOptions.cs
+++ b/TwitchDownloaderCore/Options/ChatUpdateOptions.cs
@@ -1,4 +1,4 @@
-using TwitchDownloaderCore.Chat;
+using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCore.Options
 {
diff --git a/TwitchDownloaderCore/Tools/Enums.cs b/TwitchDownloaderCore/Tools/Enums.cs
new file mode 100644
index 00000000..1d2a4b94
--- /dev/null
+++ b/TwitchDownloaderCore/Tools/Enums.cs
@@ -0,0 +1,24 @@
+namespace TwitchDownloaderCore.Tools
+{
+    // TODO: Add Bzip2 and possibly 7Zip support
+    public enum ChatCompression
+    {
+        None,
+        Gzip
+    }
+
+    public enum ChatFormat
+    {
+        Json,
+        Text,
+        Html
+    }
+
+    public enum TimestampFormat
+    {
+        Utc,
+        Relative,
+        None,
+        UtcFull
+    }
+}
\ No newline at end of file