diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index e9c72a0..5e9878e 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -27,8 +27,13 @@ val owner = params("owner") val repository = params("repository") val content = params("content") + val enableWikiLink = params("enableWikiLink").toBoolean + val enableCommitLink = params("enableCommitLink").toBoolean + val enableIssueLink = params("enableIssueLink").toBoolean + contentType = "text/html" - view.helpers.markdown(content, getRepository(owner, repository, servletContext).get, true) + view.helpers.markdown(content, getRepository(owner, repository, servletContext).get, + enableWikiLink, enableCommitLink, enableIssueLink) }) /** diff --git a/src/main/scala/view/Markdown.scala b/src/main/scala/view/Markdown.scala index e0d30e2..800e00b 100644 --- a/src/main/scala/view/Markdown.scala +++ b/src/main/scala/view/Markdown.scala @@ -12,19 +12,19 @@ * Converts Markdown of Wiki pages to HTML. */ def toHtml(markdown: String, repository: service.RepositoryService.RepositoryInfo, - wikiLink: Boolean)(implicit context: app.Context): String = { + enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): String = { val rootNode = new PegDownProcessor( Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES ).parseMarkdown(markdown.toCharArray) - new GitBucketHtmlSerializer(markdown, wikiLink, context, repository).toHtml(rootNode) + new GitBucketHtmlSerializer(markdown, context, repository, enableWikiLink, enableCommitLink, enableIssueLink).toHtml(rootNode) } } -class GitBucketLinkRender(wikiLink: Boolean, context: app.Context, - repository: service.RepositoryService.RepositoryInfo) extends LinkRenderer { +class GitBucketLinkRender(context: app.Context, repository: service.RepositoryService.RepositoryInfo, + enableWikiLink: Boolean) extends LinkRenderer { override def render(node: WikiLinkNode): Rendering = { - if(wikiLink){ + if(enableWikiLink){ super.render(node) } else { try { @@ -62,30 +62,32 @@ } } -// /** -// * Converts the issue number and the commit id to the link. -// */ -// private def markdownFilter(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = { -// value -// .replaceAll("#([0-9]+)", "[$0](%s/%s/%s/issue/$1)".format(context.path, repository.owner, repository.name)) -// .replaceAll("[0-9a-f]{40}", "[$0](%s/%s/%s/commit/$0)".format(context.path, repository.owner, repository.name)) -// } - -class GitBucketHtmlSerializer(markdown: String, wikiLink: Boolean, context: app.Context, repository: service.RepositoryService.RepositoryInfo) - extends ToHtmlSerializer( - new GitBucketLinkRender(wikiLink, context, repository), +class GitBucketHtmlSerializer(markdown: String, context: app.Context, repository: service.RepositoryService.RepositoryInfo, + enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean) extends ToHtmlSerializer( + new GitBucketLinkRender(context, repository, enableWikiLink), Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava ) { + + override def toHtml(rootNode: RootNode): String = { + val html = super.toHtml(rootNode) + if(enableIssueLink){ + // convert marked issue id to link. + html.replaceAll("#\\{\\{\\{\\{([0-9]+)\\}\\}\\}\\}", + "#$1".format(context.path, repository.owner, repository.name)) + } else html + } + override def visit(node: TextNode) { // convert commit id to link. - val text = node.getText.replaceAll("[0-9a-f]{40}", + val text1 = if(enableCommitLink) node.getText.replaceAll("[0-9a-f]{40}", "$0".format(context.path, repository.owner, repository.name)) + else node.getText - // convert issue id to link + // mark issue id to link val startIndex = node.getStartIndex - val text2 = if(startIndex > 0 && markdown.charAt(startIndex - 1) == '#'){ - text.replaceFirst("^([0-9]+)", "$0".format(context.path, repository.owner, repository.name)) - } else text + val text2 = if(enableIssueLink && startIndex > 0 && markdown.charAt(startIndex - 1) == '#'){ + text1.replaceFirst("^([0-9]+)", "{{{{$0}}}}") + } else text1 if (abbreviations.isEmpty) { printer.print(text2) @@ -94,7 +96,13 @@ } } - override def visit(node: SpecialTextNode) { - printer.printEncoded(node.getText) + override def visit(node: HeaderNode) { + if(enableIssueLink && markdown.substring(node.getStartIndex, node.getEndIndex).startsWith("#")){ + printer.print("#" * node.getLevel) + visitChildren(node) + } else { + printTag(node, "h" + node.getLevel) + } } + } \ No newline at end of file diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index 2a3d888..8ecead7 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -1,13 +1,8 @@ package view import java.util.Date import java.text.SimpleDateFormat - import twirl.api.Html -import org.pegdown._ -import org.pegdown.LinkRenderer.Rendering -import org.pegdown.ast.WikiLinkNode - object helpers { /** @@ -27,8 +22,9 @@ /** * Converts Markdown of Wiki pages to HTML. */ - def markdown(value: String, repository: service.RepositoryService.RepositoryInfo, wikiLink: Boolean)(implicit context: app.Context): twirl.api.Html = { - Html(Markdown.toHtml(value, repository, wikiLink)) + def markdown(value: String, repository: service.RepositoryService.RepositoryInfo, + enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): Html = { + Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink)) } /** diff --git a/src/main/twirl/preview.scala.html b/src/main/twirl/preview.scala.html index 58c7072..eabf8e7 100644 --- a/src/main/twirl/preview.scala.html +++ b/src/main/twirl/preview.scala.html @@ -1,4 +1,5 @@ -@(repository: service.RepositoryService.RepositoryInfo, content: String, style: String = "")(implicit context: app.Context) +@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean, + enableCommitLink: Boolean, enableIssueLink: Boolean, style: String = "")(implicit context: app.Context) @import context._
- @helpers.markdown(page.content, repository, true) + @helpers.markdown(page.content, repository, true, false, false)
Last edited by @page.committer at @helpers.datetime(page.time) diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html index ed5dc24..63a5bc1 100644 --- a/src/main/twirl/wiki/wikiedit.scala.html +++ b/src/main/twirl/wiki/wikiedit.scala.html @@ -21,7 +21,7 @@
- @html.preview(repository, page.map(_.content).getOrElse(""), "width: 900px; height: 400px;") + @html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;")