Merge pull request #3 from beatmods-top/dev20230607

Add Assets Download Server Selection

Author: WGzeyu

ModAssistant/App.config

@@ -12,10 +12,10 @@
     <userSettings>
         <ModAssistant.Properties.Settings>
             <setting name="InstallFolder" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="StoreType" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="SaveSelected" serializeAs="String">
                 <value>False</value>
@@ -33,22 +33,19 @@
                 <value>False</value>
             </setting>
             <setting name="GameVersion" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="AllGameVersions" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="UpgradeRequired" serializeAs="String">
                 <value>True</value>
             </setting>
             <setting name="LastTab" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="SelectedTheme" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="AppliedAnniversaryTheme" serializeAs="String">
-                <value>False</value>
+                <value />
             </setting>
             <setting name="ReinstallInstalled" serializeAs="String">
                 <value>True</value>
@@ -57,17 +54,26 @@
                 <value>False</value>
             </setting>
             <setting name="LanguageCode" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="OCIWindow" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="DownloadServer" serializeAs="String">
                 <value>国际源@BeatMods</value>
             </setting>
             <setting name="Setting" serializeAs="String">
                 <value />
             </setting>
+            <setting name="AppliedAnniversaryTheme" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="AssetsDownloadServer" serializeAs="String">
+                <value>默认@default</value>
+            </setting>
+            <setting name="ZeyuCount" serializeAs="String">
+                <value />
+            </setting>
         </ModAssistant.Properties.Settings>
         <ModAssistant.Settings1>
             <setting name="InstallFolder" serializeAs="String">

ModAssistant/App.xaml.cs

@@ -52,9 +52,7 @@ private async void Application_Startup(object sender, StartupEventArgs e)
                 BeatSaberInstallDirectory = Utils.GetInstallDir();
 
             Languages.LoadLanguages();
-
-            Options.Instance.DownloadServerSelectComboBox.ItemsSource = Options.serverList.ToList();
-            Options.Instance.DownloadServerSelectComboBox.SelectedIndex = Options.serverList.ToList().FindIndex((string server) => server == ModAssistant.Properties.Settings.Default.DownloadServer);
+            ModAssistant.ZeyuCount.loadData();
 
             while (string.IsNullOrEmpty(BeatSaberInstallDirectory))
             {
@@ -106,6 +104,18 @@ private async Task Init()
             if (GUI)
             {
                 window = new MainWindow();
+
+                ModAssistant.MainWindow.Instance.ModServersBox.ItemsSource = ModAssistant.MainWindow.serverList.ToList();
+                int DownloadServerIndex = ModAssistant.MainWindow.serverList.ToList().FindIndex((string server) => server == ModAssistant.Properties.Settings.Default.DownloadServer);
+                ModAssistant.MainWindow.Instance.ModServersBox.SelectedIndex = DownloadServerIndex == -1 ? 0 : DownloadServerIndex;
+
+                ModAssistant.MainWindow.Instance.AssetsServerBox.ItemsSource = ModAssistant.MainWindow.assetsServerList.ToList();
+                int AssetsDownloadServerIndex = ModAssistant.MainWindow.assetsServerList.ToList().FindIndex((string server) => server == ModAssistant.Properties.Settings.Default.AssetsDownloadServer);
+                ModAssistant.MainWindow.Instance.AssetsServerBox.SelectedIndex = AssetsDownloadServerIndex == -1 ? 0 : AssetsDownloadServerIndex;
+
+
+                Utils.UpdateCountIndicator();
+
                 window.Show();
             }
             else

ModAssistant/Classes/External Interfaces/BeatSaver.cs

@@ -5,33 +5,47 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http.Headers;
+using System.Security.Policy;
 using System.Threading.Tasks;
 using System.Web;
 using System.Windows;
+using System.Windows.Input;
 using static ModAssistant.Http;
 
 namespace ModAssistant.API
 {
     public class BeatSaver
     {
-        private const string BeatSaverURLPrefix = "https://api.beatsaver.com";
+        private static string BeatSaverURLPrefix { get =>
+            Properties.Settings.Default.AssetsDownloadServer == AssetsServer.Default ? ModAssistant.Utils.Constants.BeatSaverURLPrefix_default :
+                (Properties.Settings.Default.AssetsDownloadServer == AssetsServer.WGZeyu ? ModAssistant.Utils.Constants.BeatSaverURLPrefix_wgzeyu :
+                ModAssistant.Utils.Constants.BeatSaverURLPrefix_beatsaberchina);
+        }
+
+        private static string BeatSaverCDNURLPrefix
+        {
+            get =>
+            Properties.Settings.Default.AssetsDownloadServer == AssetsServer.Default ? ModAssistant.Utils.Constants.BeatSaverCDNURLPrefix_default :
+                (Properties.Settings.Default.AssetsDownloadServer == AssetsServer.WGZeyu ? ModAssistant.Utils.Constants.BeatSaverCDNURLPrefix_wgzeyu :
+                ModAssistant.Utils.Constants.BeatSaverCDNURLPrefix_beatsaberchina);
+        }
         private static readonly string CustomSongsFolder = Path.Combine("Beat Saber_Data", "CustomLevels");
         private static readonly string CustomWIPSongsFolder = Path.Combine("Beat Saber_Data", "CustomWIPLevels");
         private const bool BypassDownloadCounter = false;
 
-        public static async Task<BeatSaverMap> GetFromKey(string Key, bool showNotification = true)
+        public static async Task<BeatSaverMap> GetFromKey(string Key, bool showNotification = true, bool fromPlaylist = false)
         {
             if (showNotification && App.OCIWindow != "No" && App.OCIWindow != "Notify") OneClickInstaller.Status.Show();
-            return await GetMap(Key, "key", showNotification);
+            return await GetMap(Key, "key", showNotification, fromPlaylist);
         }
 
-        public static async Task<BeatSaverMap> GetFromHash(string Hash, bool showNotification = true)
+        public static async Task<BeatSaverMap> GetFromHash(string Hash, bool showNotification = true, bool fromPlaylist = false)
         {
             if (showNotification && App.OCIWindow != "No" && App.OCIWindow != "Notify") OneClickInstaller.Status.Show();
-            return await GetMap(Hash, "hash", showNotification);
+            return await GetMap(Hash, "hash", showNotification, fromPlaylist);
         }
 
-        private static async Task<BeatSaverMap> GetMap(string id, string type, bool showNotification)
+        private static async Task<BeatSaverMap> GetMap(string id, string type, bool showNotification, bool fromPlaylist = false)
         {
             string urlSegment;
             switch (type)
@@ -54,7 +68,12 @@ private static async Task<BeatSaverMap> GetMap(string id, string type, bool show
             if (showNotification) Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:Installing"), id)}");
             try
             {
-                BeatSaverApiResponse beatsaver = await GetResponse(BeatSaverURLPrefix + urlSegment + id);
+                var result = proxyURL("", true, fromPlaylist, showNotification);
+                if (result[1])
+                {
+                    Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:Fallback"), "默认@default")}");
+                }
+                BeatSaverApiResponse beatsaver = await GetResponse(result[0] + urlSegment + id);
                 if (beatsaver != null && beatsaver.map != null)
                 {
                     map.response = beatsaver;
@@ -71,14 +90,19 @@ private static async Task<BeatSaverMap> GetMap(string id, string type, bool show
                         }
                         map.HashToDownload = mapVersion.hash;
                     }
-                    map.Name = await InstallMap(map, showNotification);
+                    map.Name = await InstallMap(map, showNotification, fromPlaylist, result[1]);
+                    if (ModAssistant.Properties.Settings.Default.AssetsDownloadServer == "国内源@WGzeyu" && !result[1])
+                    {
+                        Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("MainWindow:AssetsServerLimitLabel"), ZeyuCount.getCount().ToString())}");
+                    }
                     map.Success = true;
                 }
             }
             catch (Exception e)
             {
-                ModAssistant.Utils.Log($"Failed downloading BeatSaver map: {id} | Error: {e.Message}", "ERROR");
+                ModAssistant.Utils.Log($"Failed downloading BeatSaver map: {id} | Error: {e.Message}\n{e.StackTrace}", "ERROR");
                 Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:Failed"), (map.Name ?? id))}");
+                Utils.SetMessage(e.Message);
                 App.CloseWindowOnFinish = false;
             }
             return map;
@@ -131,12 +155,19 @@ private static async Task<BeatSaverApiResponse> GetResponse(string url, bool sho
             }
         }
 
-        public static async Task<string> InstallMap(BeatSaverMap Map, bool showNotification = true)
+        public static async Task<string> InstallMap(BeatSaverMap Map, bool showNotification = true, bool fromPlaylist = false, bool fallback = false)
         {
             BeatSaverApiResponseMap responseMap = Map.response.map;
-            BeatSaverApiResponseMap.BeatsaverMapVersion mapVersion = responseMap.versions.Where(r => r.hash == Map.HashToDownload).First();
-            if (mapVersion == null)
+            BeatSaverApiResponseMap.BeatsaverMapVersion mapVersion = null;
+            try
             {
+                mapVersion = responseMap.versions.Where(r => r.hash == Map.HashToDownload).First();
+                if (mapVersion == null)
+                {
+                    throw new Exception("Could not find map version.");
+                }
+            }
+            catch (Exception) {
                 throw new Exception("Could not find map version.");
             }
 
@@ -152,11 +183,11 @@ public static async Task<string> InstallMap(BeatSaverMap Map, bool showNotificat
 #pragma warning disable CS0162 // Unreachable code detected
             if (BypassDownloadCounter)
             {
-                await Utils.DownloadAsset(mapVersion.downloadURL, targetSongDirectory, Map.HashToDownload + ".zip", mapName, showNotification, true);
+                await Utils.DownloadAsset(mapVersion.downloadURL, targetSongDirectory, Map.HashToDownload + ".zip", mapName, showNotification, true, false, fromPlaylist, fallback);
             }
             else
             {
-                await Utils.DownloadAsset(mapVersion.downloadURL, targetSongDirectory, Map.HashToDownload + ".zip", mapName, showNotification, true);
+                await Utils.DownloadAsset(mapVersion.downloadURL, targetSongDirectory, Map.HashToDownload + ".zip", mapName, showNotification, true, false, fromPlaylist, fallback);
             }
 #pragma warning restore CS0162 // Unreachable code detected
 
@@ -251,8 +282,11 @@ public static DateTime UnixTimestampToDateTime(double unixTime)
             return new DateTime(unixStart.Ticks + unixTimeStampInTicks, DateTimeKind.Utc);
         }
 
-        public static async Task Download(string url, string output, int retries = 3)
+        public static async Task Download(string url, string output, bool fromPlaylist, bool fallback = false, int retries = 3)
         {
+            var result = proxyURL(url, false, fromPlaylist);
+            url = result[0];
+            fallback = result[1];
             if (retries == 0)
             {
                 Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:RatelimitSkip"), url)}");
@@ -269,13 +303,18 @@ public static async Task Download(string url, string output, int retries = 3)
                 Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:RatelimitHit"), ratelimit.ResetTime.ToLocalTime())}");
 
                 await ratelimit.Wait();
-                await Download(url, output, retries - 1);
+                await Download(url, output, fromPlaylist, fallback, retries - 1);
             }
 
             using (var stream = await resp.Content.ReadAsStreamAsync())
             using (var fs = new FileStream(output, FileMode.OpenOrCreate, FileAccess.Write))
             {
                 await stream.CopyToAsync(fs);
+                if (fromPlaylist) {
+                    ModAssistant.ZeyuCount.downloadBeatsaverMultiple();
+                } else {
+                    ModAssistant.ZeyuCount.downloadBeatsaverSingle();
+                }
             }
         }
 
@@ -389,6 +428,25 @@ public class ParitySummary
                 public int resets { get; set; }
             }
         }
+
+        public static dynamic[] proxyURL(string url, bool api = false, bool fromPlaylist = false, bool showNotification = false) {
+            string ProxyURL = api ? BeatSaverURLPrefix : BeatSaverCDNURLPrefix;
+            bool fallback = false;
+
+            if (Properties.Settings.Default.AssetsDownloadServer == "国内源@WGzeyu" && ((fromPlaylist && !ModAssistant.ZeyuCount.checkBeatsaverMultiple()) || (!fromPlaylist && !ModAssistant.ZeyuCount.checkBeatsaverSingle())))
+            {
+                if (showNotification) Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:Fallback"), "默认@default")}");
+                ProxyURL = api ? ModAssistant.Utils.Constants.BeatSaverURLPrefix_default : ModAssistant.Utils.Constants.BeatSaverCDNURLPrefix_default;
+                fallback = true;
+            }
+
+            dynamic[] result = new dynamic[] { api ? ProxyURL : url.Replace("https://as.cdn.beatsaver.com", "https://cdn.beatsaver.com")
+                .Replace("https://na.cdn.beatsaver.com", "https://cdn.beatsaver.com")
+                .Replace("https://r2cdn.beatsaver.com", "https://cdn.beatsaver.com")
+                .Replace("https://cdn.beatsaver.com", ProxyURL), fallback};
+
+            return result;
+        }
     }
 }
 #pragma warning restore IDE1006 // Naming Styles

ModAssistant/Classes/External Interfaces/ModelSaber.cs

@@ -1,34 +1,61 @@
 using System;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace ModAssistant.API
 {
     class ModelSaber
     {
-        private const string ModelSaberURLPrefix = "https://modelsaber.com/files/";
+        private static string ModelSaberURLPrefix
+        {
+            get =>
+            Properties.Settings.Default.AssetsDownloadServer == AssetsServer.Default ? ModAssistant.Utils.Constants.ModelSaberURLPrefix_default :
+                (Properties.Settings.Default.AssetsDownloadServer == AssetsServer.WGZeyu ? ModAssistant.Utils.Constants.ModelSaberURLPrefix_wgzeyu :
+                ModAssistant.Utils.Constants.ModelSaberURLPrefix_beatsaberchina);
+        }
         private const string CustomAvatarsFolder = "CustomAvatars";
         private const string CustomSabersFolder = "CustomSabers";
         private const string CustomPlatformsFolder = "CustomPlatforms";
         private const string CustomBloqsFolder = "CustomNotes";
 
         public static async Task GetModel(Uri uri)
         {
+            string proxyURL = ModelSaberURLPrefix;
+            bool throughProxy = true;
+            bool fallback = false;
+
+            if (Properties.Settings.Default.AssetsDownloadServer == "国内源@WGzeyu" && !ModAssistant.ZeyuCount.checkModelSaberSingle())
+            {
+                proxyURL = ModAssistant.Utils.Constants.ModelSaberURLPrefix_default;
+                Utils.SetMessage($"{string.Format((string)Application.Current.FindResource("OneClick:Fallback"), "默认@default")}");
+                throughProxy = false;
+                fallback = true;
+            }
+
             switch (uri.Host)
             {
                 case "avatar":
-                    await Utils.DownloadAsset(ModelSaberURLPrefix + uri.Host + uri.AbsolutePath, CustomAvatarsFolder);
+                    await Utils.DownloadAsset(proxyURL + uri.Host + uri.AbsolutePath, CustomAvatarsFolder, null, null, true, false, false, throughProxy, fallback);
                     break;
                 case "saber":
-                    await Utils.DownloadAsset(ModelSaberURLPrefix + uri.Host + uri.AbsolutePath, CustomSabersFolder);
+                    await Utils.DownloadAsset(proxyURL + uri.Host + uri.AbsolutePath, CustomSabersFolder, null, null, true, false, false, throughProxy, fallback);
                     break;
                 case "platform":
-                    await Utils.DownloadAsset(ModelSaberURLPrefix + uri.Host + uri.AbsolutePath, CustomPlatformsFolder);
+                    await Utils.DownloadAsset(proxyURL + uri.Host + uri.AbsolutePath, CustomPlatformsFolder, null, null, true, false, false, throughProxy, fallback);
                     break;
                 case "bloq":
-                    await Utils.DownloadAsset(ModelSaberURLPrefix + uri.Host + uri.AbsolutePath, CustomBloqsFolder);
+                    await Utils.DownloadAsset(proxyURL + uri.Host + uri.AbsolutePath, CustomBloqsFolder, null, null, true, false, false, throughProxy, fallback);
                     break;
             }
         }
+        public static string proxyURL()
+        {
+            if (Properties.Settings.Default.AssetsDownloadServer == "国内源@WGzeyu" && !ModAssistant.ZeyuCount.checkModelSaberSingle())
+            {
+                return ModAssistant.Utils.Constants.ModelSaberURLPrefix_default;
+            }
 
+            return ModelSaberURLPrefix;
+        }
     }
 }