From 44145e0b9c29ef9f1d2010fff2aa5f55cb2f43e6 Mon Sep 17 00:00:00 2001
From: Perfare <hjyqwert@126.com>
Date: Sat, 19 Mar 2022 06:40:51 +0800
Subject: [PATCH] using IProgress

---
 AssetStudio/IProgress.cs             | 17 -----------------
 AssetStudio/Progress.cs              |  6 ++++--
 AssetStudioGUI/AssetStudioGUIForm.cs |  2 +-
 AssetStudioGUI/GUIProgress.cs        | 23 -----------------------
 4 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 AssetStudio/IProgress.cs
 delete mode 100644 AssetStudioGUI/GUIProgress.cs

diff --git a/AssetStudio/IProgress.cs b/AssetStudio/IProgress.cs
deleted file mode 100644
index ab203ec..0000000
--- a/AssetStudio/IProgress.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AssetStudio
-{
-    public interface IProgress
-    {
-        void Report(int value);
-    }
-
-    public sealed class DummyProgress : IProgress
-    {
-        public void Report(int value) { }
-    }
-}
diff --git a/AssetStudio/Progress.cs b/AssetStudio/Progress.cs
index a197fe2..93db838 100644
--- a/AssetStudio/Progress.cs
+++ b/AssetStudio/Progress.cs
@@ -1,8 +1,10 @@
-namespace AssetStudio
+using System;
+
+namespace AssetStudio
 {
     public static class Progress
     {
-        public static IProgress Default = new DummyProgress();
+        public static IProgress<int> Default = new Progress<int>();
         private static int preValue;
 
         public static void Reset()
diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs
index a48fb8f..8dc3a21 100644
--- a/AssetStudioGUI/AssetStudioGUIForm.cs
+++ b/AssetStudioGUI/AssetStudioGUIForm.cs
@@ -107,7 +107,7 @@ namespace AssetStudioGUI
 
             logger = new GUILogger(StatusStripUpdate);
             Logger.Default = logger;
-            Progress.Default = new GUIProgress(SetProgressBarValue);
+            Progress.Default = new Progress<int>(SetProgressBarValue);
             Studio.StatusStripUpdate = StatusStripUpdate;
         }
 
diff --git a/AssetStudioGUI/GUIProgress.cs b/AssetStudioGUI/GUIProgress.cs
deleted file mode 100644
index 7efe200..0000000
--- a/AssetStudioGUI/GUIProgress.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using AssetStudio;
-
-namespace AssetStudioGUI
-{
-    class GUIProgress : IProgress
-    {
-        private Action<int> action;
-
-        public GUIProgress(Action<int> action)
-        {
-            this.action = action;
-        }
-
-        public void Report(int value)
-        {
-            action(value);
-        }
-    }
-}