From 3ecb0c505ecdd698bc130b78a3bf5a66c964b4a3 Mon Sep 17 00:00:00 2001
From: KedamaOvO <moe@mao-yu.net>
Date: Tue, 17 Sep 2019 15:24:47 +0800
Subject: [PATCH] add PublicOsuBotTransferWarpper

---
 OsuApi.cs                              | 31 +++++-----------------
 RealTimePPDisplayer.csproj             |  1 +
 Warpper/PublicOsuBotTransferWarpper.cs | 36 ++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 24 deletions(-)
 create mode 100644 Warpper/PublicOsuBotTransferWarpper.cs

diff --git a/OsuApi.cs b/OsuApi.cs
index c4348da..b4ece54 100644
--- a/OsuApi.cs
+++ b/OsuApi.cs
@@ -1,6 +1,6 @@
 using OsuRTDataProvider.Listen;
 using OsuRTDataProvider.Mods;
-using PublicOsuBotTransfer;
+using RealTimePPDisplayer.Warpper;
 using Sync;
 using System;
 using System.Collections.Generic;
@@ -36,42 +36,25 @@ public class BeatPerformance
 
     static class OsuApi
     {
-        private static PublicOsuBotTransferPlugin s_pobt;
-        static bool Init()
-        {
-            if (SyncHost.Instance.EnumPluings().FirstOrDefault(p => p.Name == "PublicOsuBotTransferPlugin") is PublicOsuBotTransferPlugin pobt)
-            {
-                if (pobt.GetType().Assembly.GetName().Version >= Version.Parse("1.3.0"))
-                {
-                    s_pobt = pobt;
-                    return true;
-                }
-                else
-                {
-                    Sync.Tools.IO.DefaultIO.WriteColor(DefaultLanguage.HINT_POBT_VERSION_LOWER, ConsoleColor.Yellow);
-                    return false;
-                }
-            }
-
-            return false;
-        }
+        public static PublicOsuBotTransferWarpper publicOsuBotTransferWarpper;
 
         public static List<BeatPerformance> GetBp(string player,OsuPlayMode mode)
         {
             HttpWebRequest req;
             if(Setting.ByCuteSyncProxy)
             {
-                if (s_pobt == null)
+                if (publicOsuBotTransferWarpper == null)
                 {
-                    if (!Init())
+                    publicOsuBotTransferWarpper = new PublicOsuBotTransferWarpper();
+                    if (!publicOsuBotTransferWarpper.Init())
                         return null;
                 }
-                if(s_pobt.Username != player)
+                if(publicOsuBotTransferWarpper.Username != player)
                 {
                     Sync.Tools.IO.DefaultIO.WriteColor(DefaultLanguage.HINT_CANNOT_WATCH_OTHER_PLAYER, ConsoleColor.Yellow);
                     return null;
                 }
-                req = (HttpWebRequest)WebRequest.Create($"https://osubot.kedamaovo.moe/osuapi/bp?k={s_pobt.Token}&u={player}&type=string&limit=100&m={(uint)mode}");
+                req = (HttpWebRequest)WebRequest.Create($"https://osubot.kedamaovo.moe/osuapi/bp?k={publicOsuBotTransferWarpper.Token}&u={player}&type=string&limit=100&m={(uint)mode}");
             }
             else
             {
diff --git a/RealTimePPDisplayer.csproj b/RealTimePPDisplayer.csproj
index 8a105c9..1ff70d9 100644
--- a/RealTimePPDisplayer.csproj
+++ b/RealTimePPDisplayer.csproj
@@ -106,6 +106,7 @@
     <Compile Include="Displayer\View\PPWindow.xaml.cs">
       <DependentUpon>PPWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Warpper\PublicOsuBotTransferWarpper.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\osuSync\OfficalPlugins\ConfigGUI\ConfigGUI.csproj">
diff --git a/Warpper/PublicOsuBotTransferWarpper.cs b/Warpper/PublicOsuBotTransferWarpper.cs
new file mode 100644
index 0000000..9f181de
--- /dev/null
+++ b/Warpper/PublicOsuBotTransferWarpper.cs
@@ -0,0 +1,36 @@
+using PublicOsuBotTransfer;
+using Sync;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RealTimePPDisplayer.Warpper
+{
+    class PublicOsuBotTransferWarpper
+    {
+        private PublicOsuBotTransferPlugin s_pobt;
+        public string Token => s_pobt.Token;
+        public string Username => s_pobt.Username;
+
+        public bool Init()
+        {
+            if (SyncHost.Instance.EnumPluings().FirstOrDefault(p => p.Name == "PublicOsuBotTransferPlugin") is PublicOsuBotTransferPlugin pobt)
+            {
+                if (pobt.GetType().Assembly.GetName().Version >= Version.Parse("1.3.0"))
+                {
+                    s_pobt = pobt;
+                    return true;
+                }
+                else
+                {
+                    Sync.Tools.IO.DefaultIO.WriteColor(DefaultLanguage.HINT_POBT_VERSION_LOWER, ConsoleColor.Yellow);
+                    return false;
+                }
+            }
+
+            return false;
+        }
+    }
+}