ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 04:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: correctly download plugins after 3rd party changes

Browse source
This commit is contained in:
goat 2020-12-14 18:29:46 +01:00
parent 078dea73fc
commit eaecea0abc
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Dalamud/Plugin/PluginDefinition.cs
View file

@ -82,5 +82,20 @@ namespace Dalamud.Plugin
/// Domain of the origin repo /// Domain of the origin repo
/// </summary> /// </summary>
public string FromRepo { get; set; } public string FromRepo { get; set; }
/// <summary>
/// Download link used to install the plugin.
/// </summary>
public string DownloadLinkInstall { get; set; }
/// <summary>
/// Download link used to update the plugin.
/// </summary>
public string DownloadLinkUpdate { get; set; }
/// <summary>
/// Download link used to get testing versions of the plugin.
/// </summary>
public string DownloadLinkTesting { get; set; }
} }
} }

7
Dalamud/Plugin/PluginRepository.cs
View file

@ -14,7 +14,6 @@ using Serilog;
namespace Dalamud.Plugin namespace Dalamud.Plugin
{ {
internal class PluginRepository { 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://goatcorp.github.io/DalamudPlugins/pluginmaster.json"; private string PluginMasterUrl => "https://goatcorp.github.io/DalamudPlugins/pluginmaster.json";
private readonly Dalamud dalamud; private readonly Dalamud dalamud;
@ -118,7 +117,11 @@ namespace Dalamud.Plugin
doTestingDownload = testingAssemblyVer > Version.Parse(definition.AssemblyVersion) || definition.IsTestingExclusive; doTestingDownload = testingAssemblyVer > Version.Parse(definition.AssemblyVersion) || definition.IsTestingExclusive;
} }
var url = string.Format(PluginFunctionBaseUrl, definition.InternalName, isUpdate, doTestingDownload); var url = definition.DownloadLinkInstall;
if (doTestingDownload)
url = definition.DownloadLinkTesting;
else if (isUpdate)
url = definition.DownloadLinkUpdate;
Log.Information("Downloading plugin to {0} from {1} doTestingDownload:{2} isTestingExclusive:{3}", path, url, doTestingDownload, definition.IsTestingExclusive); Log.Information("Downloading plugin to {0} from {1} doTestingDownload:{2} isTestingExclusive:{3}", path, url, doTestingDownload, definition.IsTestingExclusive);