From e8385d829b9bd37eeddbe67dd8e25d7839d22cd3 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Sun, 13 Dec 2020 21:17:40 +0100 Subject: [PATCH] fix: remove bodge, fix testing plugins --- Dalamud/Plugin/PluginRepository.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Dalamud/Plugin/PluginRepository.cs b/Dalamud/Plugin/PluginRepository.cs index 8c56fb313..ef06fec30 100644 --- a/Dalamud/Plugin/PluginRepository.cs +++ b/Dalamud/Plugin/PluginRepository.cs @@ -15,8 +15,6 @@ namespace Dalamud.Plugin internal class PluginRepository { private string PluginFunctionBaseUrl => "https://us-central1-xl-functions.cloudfunctions.net/download-plugin/?plugin={0}&isUpdate={1}&isTesting={2}"; private string PluginMasterUrl => "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/master/pluginmaster.json"; - private string PluginJsonUrl = - "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/master/{0}/{1}/{1}.json"; private readonly Dalamud dalamud; @@ -70,11 +68,6 @@ namespace Dalamud.Plugin try { using var client = new WebClient(); - // We need to redownload the json, for the eventuality of the zip having changed after PM download - definition = JsonConvert.DeserializeObject( - client.DownloadString(string.Format(this.PluginJsonUrl, fromTesting ? "testing" : "plugins", - definition.InternalName))); - var outputDir = new DirectoryInfo(Path.Combine(this.pluginDirectory, definition.InternalName, fromTesting ? definition.TestingAssemblyVersion : definition.AssemblyVersion)); var dllFile = new FileInfo(Path.Combine(outputDir.FullName, $"{definition.InternalName}.dll")); var disabledFile = new FileInfo(Path.Combine(outputDir.FullName, ".disabled"));