Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 01:15:44 +01:00
Code Issues Packages Projects Releases Activity

Make updatable plugins installable

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-09-11 15:05:25 +02:00
parent 202a638a0f
commit a7cb1d3116
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -178,22 +178,18 @@ public class DefaultPluginManager implements PluginManager {
private List<AvailablePlugin> collectPluginsToInstall(String name) { private List<AvailablePlugin> collectPluginsToInstall(String name) {
List<AvailablePlugin> plugins = new ArrayList<>(); List<AvailablePlugin> plugins = new ArrayList<>();
collectPluginsToInstall(plugins, name); collectPluginsToInstall(plugins, name, true);
return plugins; return plugins;
} }
private boolean isInstalledOrPending(String name) { private void collectPluginsToInstall(List<AvailablePlugin> plugins, String name, boolean isUpdate) {
return getInstalled(name).isPresent() || getPending(name).isPresent(); if (!isInstalledOrPending(name) || isUpdate && isUpdatable(name)) {
}
private void collectPluginsToInstall(List<AvailablePlugin> plugins, String name) {
if (!isInstalledOrPending(name)) {
AvailablePlugin plugin = getAvailable(name).orElseThrow(() -> NotFoundException.notFound(entity(AvailablePlugin.class, name))); AvailablePlugin plugin = getAvailable(name).orElseThrow(() -> NotFoundException.notFound(entity(AvailablePlugin.class, name)));
Set<String> dependencies = plugin.getDescriptor().getDependencies(); Set<String> dependencies = plugin.getDescriptor().getDependencies();
if (dependencies != null) { if (dependencies != null) {
for (String dependency: dependencies){ for (String dependency: dependencies){
collectPluginsToInstall(plugins, dependency); collectPluginsToInstall(plugins, dependency, false);
} }
} }
@@ -202,4 +198,12 @@ public class DefaultPluginManager implements PluginManager {
LOG.info("plugin {} is already installed or installation is pending, skipping installation", name); LOG.info("plugin {} is already installed or installation is pending, skipping installation", name);
} }
} }
private boolean isInstalledOrPending(String name) {
return getInstalled(name).isPresent() || getPending(name).isPresent();
}
private boolean isUpdatable(String name) {
return getAvailable(name).isPresent() && !getPending(name).isPresent();
}
} }