Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-04 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance plugin install / uninstall process

Browse Source
This commit is contained in:
Naoki Takezoe
2018-06-11 13:36:53 +09:00
parent 5fc3ce34a3
commit ed7bb495ca
3 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
View File

@@ -364,17 +364,15 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
redirect("/admin/plugins")
})
post("/admin/plugins/:pluginId/:version/_uninstall")(adminOnly {
post("/admin/plugins/:pluginId/_uninstall")(adminOnly { // TODO Is version unnecessary?
val pluginId = params("pluginId")
val version = params("version")
PluginRegistry()
.getPlugins()
.collect { case plugin if (plugin.pluginId == pluginId && plugin.pluginVersion == version) => plugin }
.foreach { _ =>
if (PluginRegistry().getPlugins().exists(_.pluginId == pluginId)) {
PluginRegistry
.uninstall(pluginId, request.getServletContext, loadSystemSettings(), request2Session(request).conn)
flash += "info" -> s"${pluginId} was uninstalled."
}
redirect("/admin/plugins")
})
@@ -389,6 +387,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
case (meta, version) =>
version.foreach { version =>
PluginRegistry.install(
pluginId,
new java.net.URL(version.url),
request.getServletContext,
loadSystemSettings(),

30
src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
View File

@@ -225,37 +225,37 @@ object PluginRegistry {
*/
def uninstall(pluginId: String, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit =
synchronized {
instance
.getPlugins()
.collect { case plugin if plugin.pluginId == pluginId => plugin }
.foreach { plugin =>
// try {
// plugin.pluginClass.uninstall(instance, context, settings)
// } catch {
// case e: Exception =>
// logger.error(s"Error during uninstalling plugin: ${plugin.pluginJar.getName}", e)
// }
shutdown(context, settings)
new File(PluginHome)
.listFiles((_: File, name: String) => {
name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar")
})
.foreach { file =>
file.delete()
}
.foreach(_.delete())
instance = new PluginRegistry()
initialize(context, settings, conn)
}
}
/**
* Install a plugin from a specified jar file.
*/
def install(url: java.net.URL, context: ServletContext, settings: SystemSettings, conn: java.sql.Connection): Unit =
def install(
pluginId: String,
url: java.net.URL,
context: ServletContext,
settings: SystemSettings,
conn: java.sql.Connection
): Unit =
synchronized {
shutdown(context, settings)
new File(PluginHome)
.listFiles((_: File, name: String) => {
name.startsWith(s"gitbucket-${pluginId}-plugin") && name.endsWith(".jar")
})
.foreach(_.delete())
val in = url.openStream()
FileUtils.copyToFile(in, new File(PluginHome, new File(url.getFile).getName))
instance = new PluginRegistry()

29
src/main/twirl/gitbucket/core/admin/plugins.scala.html
View File

@@ -16,21 +16,19 @@
@plugins.map { case (plugin, enabled, updatableVersion) =>
<div class="panel panel-default">
<div class="panel-heading strong" id="@plugin.pluginId">
<form method="POST" class="pull-right">
@if(enabled){
@if(updatableVersion.isEmpty){
<form action="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_uninstall" method="POST" class="pull-right uninstall-form">
<input type="submit" value="Uninstall" class="btn btn-danger btn-sm" style="position: relative; top: -5px; left: 10px;" data-name="@plugin.pluginName">
</form>
} else {
<form action="@{context.path}/admin/plugins/@{plugin.pluginId}/@{updatableVersion}/_install" method="POST" class="pull-right install-form">
<input type="submit" value="Update" class="btn btn-primary btn-sm" style="position: relative; top: -5px; left: 10px;" data-name="@plugin.pluginName">
</form>
@if(updatableVersion.nonEmpty){
<input type="submit" value="Update" class="btn btn-success btn-sm update-plugin" style="position: relative; top: -5px; left: 10px;"
data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/@{updatableVersion}/_install">
}
<input type="submit" value="Uninstall" class="btn btn-danger btn-sm uninstall-plugin" style="position: relative; top: -5px; left: 10px;"
data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/_uninstall">
} else {
<form action="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_install" method="POST" class="pull-right install-form">
<input type="submit" value="Install" class="btn btn-success btn-sm" style="position: relative; top: -5px; left: 10px;" data-name="@plugin.pluginName">
</form>
<input type="submit" value="Install" class="btn btn-success btn-sm install-plugin" style="position: relative; top: -5px; left: 10px;"
data-name="@plugin.pluginName" formaction="@{context.path}/admin/plugins/@{plugin.pluginId}/@{plugin.pluginVersion}/_install">
}
</form>
@plugin.pluginName
</div>
<div class="panel-body">
@@ -60,14 +58,19 @@
}
<script>
$(function(){
$('.uninstall-form').click(function(e){
$('.uninstall-plugin').click(function(e){
var name = $(e.target).data('name');
return confirm('Uninstall ' + name + '. Are you sure?');
});
$('.install-form').click(function(e){
$('.install-plugin').click(function(e){
var name = $(e.target).data('name');
return confirm('Install ' + name + '. Are you sure?');
});
$('.update-plugin').click(function(e){
var name = $(e.target).data('name');
return confirm('Update ' + name + '. Are you sure?');
});
});
</script>