ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-24 05:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "fix: edge case for plugin installs with old PM"

Browse source
This commit is contained in:
Aireil 2020-12-14 02:08:46 +01:00
parent f8e5728985
commit d7bc391bff
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/Plugin/PluginRepository.cs
View file

@ -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;
@ -68,13 +66,6 @@ namespace Dalamud.Plugin
public bool InstallPlugin(PluginDefinition definition, bool enableAfterInstall = true, bool isUpdate = false, bool fromTesting = false) {
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<PluginDefinition>(
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"));
@ -101,6 +92,8 @@ namespace Dalamud.Plugin
}
var path = Path.GetTempFileName();
using var client = new WebClient();
var doTestingDownload = false;
if ((Version.TryParse(definition.TestingAssemblyVersion, out var testingAssemblyVer) || definition.IsTestingExclusive)