ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-22 08:29:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

don't count downloads for updates

Browse source
This commit is contained in:
goat 2020-09-09 12:42:11 +02:00
parent 345334aee1
commit 7c6f5425eb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Plugin/PluginRepository.cs
View file

@ -15,7 +15,7 @@ namespace Dalamud.Plugin
internal class PluginRepository internal class PluginRepository
{ {
private string PluginRepoBaseUrl => "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/testing/plugins/{0}/latest.zip"; private string PluginRepoBaseUrl => "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/testing/plugins/{0}/latest.zip";
private string PluginFunctionBaseUrl => "https://us-central1-xl-functions.cloudfunctions.net/download-plugin/?plugin={0}"; private string PluginFunctionBaseUrl => "https://us-central1-xl-functions.cloudfunctions.net/download-plugin/?plugin={0}&isUpdate={1}";
private string PluginMasterUrl => "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/" + (this.dalamud.Configuration.DoPluginTest ? "testing/" : "master/") + "pluginmaster.json"; private string PluginMasterUrl => "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/" + (this.dalamud.Configuration.DoPluginTest ? "testing/" : "master/") + "pluginmaster.json";
@ -66,7 +66,7 @@ namespace Dalamud.Plugin
}); });
} }
public bool InstallPlugin(PluginDefinition definition, bool enableAfterInstall = true) { public bool InstallPlugin(PluginDefinition definition, bool enableAfterInstall = true, bool isUpdate = false) {
try try
{ {
var outputDir = new DirectoryInfo(Path.Combine(this.pluginDirectory, definition.InternalName, definition.AssemblyVersion)); var outputDir = new DirectoryInfo(Path.Combine(this.pluginDirectory, definition.InternalName, definition.AssemblyVersion));
@ -99,7 +99,7 @@ namespace Dalamud.Plugin
using var client = new WebClient(); using var client = new WebClient();
var url = this.dalamud.Configuration.DoPluginTest ? PluginRepoBaseUrl : PluginFunctionBaseUrl; var url = this.dalamud.Configuration.DoPluginTest ? PluginRepoBaseUrl : PluginFunctionBaseUrl;
url = string.Format(url, definition.InternalName); url = string.Format(url, definition.InternalName, isUpdate);
Log.Information("Downloading plugin to {0} from {1}", path, url); Log.Information("Downloading plugin to {0} from {1}", path, url);
client.DownloadFile(url, path); client.DownloadFile(url, path);
@ -211,7 +211,7 @@ namespace Dalamud.Plugin
Log.Error(ex, "Plugin disable old versions failed"); Log.Error(ex, "Plugin disable old versions failed");
} }
var installSuccess = InstallPlugin(remoteInfo, wasEnabled); var installSuccess = InstallPlugin(remoteInfo, wasEnabled, true);
if (!installSuccess) { if (!installSuccess) {
Log.Error("InstallPlugin failed."); Log.Error("InstallPlugin failed.");