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

JSON response support for plug-ins

Browse Source
This commit is contained in:
Naoki Takezoe
2014-08-03 23:59:56 +09:00
parent 93cc1be166
commit 1ca55805b5
1 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/scala/servlet/PluginActionInvokeFilter.scala
View File

@@ -8,6 +8,8 @@ import service.{AccountService, RepositoryService, SystemSettingsService}
import model.{Account, Session} import model.{Account, Session}
import util.{JGitUtil, Keys} import util.{JGitUtil, Keys}
import plugin.PluginConnectionHolder import plugin.PluginConnectionHolder
import service.RepositoryService.RepositoryInfo
import service.SystemSettingsService.SystemSettings
class PluginActionInvokeFilter extends Filter with SystemSettingsService with RepositoryService with AccountService { class PluginActionInvokeFilter extends Filter with SystemSettingsService with RepositoryService with AccountService {
@@ -31,18 +33,14 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
private def processGlobalAction(path: String, request: HttpServletRequest, response: HttpServletResponse): Boolean = { private def processGlobalAction(path: String, request: HttpServletRequest, response: HttpServletResponse): Boolean = {
plugin.PluginSystem.globalActions.find(_.path == path).map { action => plugin.PluginSystem.globalActions.find(_.path == path).map { action =>
val result = action.function(request, response) val result = action.function(request, response)
val systemSettings = loadSystemSettings()
result match { result match {
case x: String => { case x: String => renderGlobalHtml(request, response, systemSettings, x)
response.setContentType("text/html; charset=UTF-8") case x: org.mozilla.javascript.NativeObject => {
val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account] x.get("format") match {
implicit val context = app.Context(loadSystemSettings(), Option(loginAccount), request) case "html" => renderGlobalHtml(request, response, systemSettings, x.get("body").toString)
val html = _root_.html.main("GitBucket", None)(Html(x)) case "json" => renderJson(request, response, x.get("body").toString)
IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
} }
case x => {
// TODO returns as JSON?
response.setContentType("application/json; charset=UTF-8")
} }
} }
true true
@@ -66,17 +64,12 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
PluginConnectionHolder.threadLocal.remove() PluginConnectionHolder.threadLocal.remove()
} }
result match { result match {
case x: String => { case x: String => renderRepositoryHtml(request, response, systemSettings, repository, x)
response.setContentType("text/html; charset=UTF-8") case x: org.mozilla.javascript.NativeObject => {
val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account] x.get("format") match {
implicit val context = app.Context(systemSettings, Option(loginAccount), request) case "html" => renderRepositoryHtml(request, response, systemSettings, repository, x.get("body").toString)
val html = _root_.html.main("GitBucket", None)(_root_.html.menu("", repository)(Html(x))) // TODO specify active side menu case "json" => renderJson(request, response, x.get("body").toString)
IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
} }
case x => {
// TODO returns as JSON?
response.setContentType("application/json; charset=UTF-8")
} }
} }
true true
@@ -85,4 +78,27 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
} else false } else false
} }
private def renderGlobalHtml(request: HttpServletRequest, response: HttpServletResponse,
systemSettings: SystemSettings, body: String): Unit = {
response.setContentType("text/html; charset=UTF-8")
val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
implicit val context = app.Context(systemSettings, Option(loginAccount), request)
val html = _root_.html.main("GitBucket", None)(Html(body))
IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
}
private def renderRepositoryHtml(request: HttpServletRequest, response: HttpServletResponse,
systemSettings: SystemSettings, repository: RepositoryInfo, body: String): Unit = {
response.setContentType("text/html; charset=UTF-8")
val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
implicit val context = app.Context(systemSettings, Option(loginAccount), request)
val html = _root_.html.main("GitBucket", None)(_root_.html.menu("", repository)(Html(body))) // TODO specify active side menu
IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
}
private def renderJson(request: HttpServletRequest, response: HttpServletResponse, body: String): Unit = {
response.setContentType("application/json; charset=UTF-8")
IOUtils.write(body.getBytes("UTF-8"), response.getOutputStream)
}
} }