ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

externals: Don't crash the client if updating a plugin fails

Browse Source
This commit is contained in:
Owain van Brakel
2020-03-03 10:08:13 +01:00
parent 07fc29808f
commit 4465c035ba
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
View File

@@ -77,7 +77,7 @@ class ExternalPluginManager
{ {
public static ArrayList<ClassLoader> pluginClassLoaders = new ArrayList<>(); public static ArrayList<ClassLoader> pluginClassLoaders = new ArrayList<>();
private final PluginManager runelitePluginManager; private final PluginManager runelitePluginManager;
private final org.pf4j.PluginManager externalPluginManager; private org.pf4j.PluginManager externalPluginManager;
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
private final List<UpdateRepository> repositories = new ArrayList<>(); private final List<UpdateRepository> repositories = new ArrayList<>();
private final OpenOSRSConfig openOSRSConfig; private final OpenOSRSConfig openOSRSConfig;
@@ -104,6 +104,11 @@ class ExternalPluginManager
//noinspection ResultOfMethodCallIgnored //noinspection ResultOfMethodCallIgnored
EXTERNALPLUGIN_DIR.mkdirs(); EXTERNALPLUGIN_DIR.mkdirs();
initPluginManager();
}
private void initPluginManager()
{
boolean debug = RuneLiteProperties.getLauncherVersion() == null && RuneLiteProperties.getPluginPath() != null; boolean debug = RuneLiteProperties.getLauncherVersion() == null && RuneLiteProperties.getPluginPath() != null;
this.externalPluginManager = new DefaultPluginManager(debug ? Paths.get(RuneLiteProperties.getPluginPath() + File.separator + "release") : EXTERNALPLUGIN_DIR.toPath()) this.externalPluginManager = new DefaultPluginManager(debug ? Paths.get(RuneLiteProperties.getPluginPath() + File.separator + "release") : EXTERNALPLUGIN_DIR.toPath())
@@ -241,6 +246,8 @@ class ExternalPluginManager
{ {
try try
{ {
repositories.clear();
for (String keyval : openOSRSConfig.getExternalRepositories().split(";")) for (String keyval : openOSRSConfig.getExternalRepositories().split(";"))
{ {
String id = keyval.substring(0, keyval.lastIndexOf(":https")); String id = keyval.substring(0, keyval.lastIndexOf(":https"));
@@ -474,6 +481,21 @@ class ExternalPluginManager
for (PluginWrapper plugin : startedPlugins) for (PluginWrapper plugin : startedPlugins)
{ {
boolean depsLoaded = true;
for (PluginDependency dependency : plugin.getDescriptor().getDependencies())
{
if (startedPlugins.stream().noneMatch(pl -> pl.getPluginId().equals(dependency.getPluginId())))
{
depsLoaded = false;
}
}
if (!depsLoaded)
{
// This should never happen but can crash the client
continue;
}
scannedPlugins.addAll(loadPlugin(plugin.getPluginId())); scannedPlugins.addAll(loadPlugin(plugin.getPluginId()));
} }
@@ -673,6 +695,7 @@ class ExternalPluginManager
public void update() public void update()
{ {
boolean error = false;
if (updateManager.hasUpdates()) if (updateManager.hasUpdates())
{ {
List<PluginInfo> updates = updateManager.getUpdates(); List<PluginInfo> updates = updateManager.getUpdates();
@@ -687,14 +710,24 @@ class ExternalPluginManager
if (!updated) if (!updated)
{ {
log.warn("Cannot update plugin '{}'", plugin.id); log.warn("Cannot update plugin '{}'", plugin.id);
error = true;
} }
} }
catch (PluginRuntimeException ex) catch (PluginRuntimeException ex)
{ {
log.warn("Cannot update plugin '{}', the user probably has another client open", plugin.id); log.warn("Cannot update plugin '{}', the user probably has another client open", plugin.id);
error = true;
break;
} }
} }
} }
if (error)
{
initPluginManager();
startExternalUpdateManager();
startExternalPluginManager();
}
} }
public Set<String> getDependencies() public Set<String> getDependencies()