Support relative links in asciidoc files.

src/main/scala/app/RepositoryViewerController.scala

@@ -268,15 +268,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
         val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
         // get specified commit
-        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
-          defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit =>
+        JGitUtil.getDefaultBranch(git, repository, revstr).map {
+          case (objectId, revision) =>
+            defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
               // get files
               val files = JGitUtil.getFileList(git, revision, path)
+              val parentPath = if (path == ".") Nil else path.split("/").toList
               // process README.md or README.markdown
               val readme = files.find { file =>
                 readmeFiles.contains(file.name.toLowerCase)
               }.map { file =>
-              file -> StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
+                val path = (file.name :: parentPath.reverse).reverse
+                path -> StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
               }
 
             repo.html.files(revision, repository,

src/main/scala/view/Asciidoc.scala

@@ -17,7 +17,7 @@ object Asciidoc {
   /**
    * Converts Markdown of Wiki pages to HTML.
    */
-  def toHtml(asciidoc: String, branch: String, repository: service.RepositoryService.RepositoryInfo,
+  def toHtml(filePath: List[String], asciidoc: String, branch: String, repository: service.RepositoryService.RepositoryInfo,
              enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
 
     val options = OptionsBuilder.options()
@@ -27,8 +27,11 @@ object Asciidoc {
     options.attributes(attributes.get())
     val rendered = asciidoctor.render(asciidoc, options)
 
-    // this is always relative to the base dir of the repo, as we currently only render README files.
-    val relativeUrlPrefix = s"${helpers.url(repository)}/blob/${branch}/"
+    val path = filePath.reverse.tail.reverse match {
+      case Nil => ""
+      case p => p.mkString("", "/", "/")
+    }
+    val relativeUrlPrefix = s"${helpers.url(repository)}/blob/${branch}/${path}"
     prefixRelativeUrls(rendered, relativeUrlPrefix)
   }
 

src/main/scala/view/helpers.scala

@@ -27,12 +27,12 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def plural(count: Int, singular: String, plural: String = ""): String =
     if(count == 1) singular else if(plural.isEmpty) singular + "s" else plural
 
-  private[this] val renderersBySuffix: Seq[(String, (String, String, service.RepositoryService.RepositoryInfo, Boolean, Boolean, app.Context) => Html)] =
+  private[this] val renderersBySuffix: Seq[(String, (List[String], String, String, service.RepositoryService.RepositoryInfo, Boolean, Boolean, app.Context) => Html)] =
     Seq(
-      ".md" -> ((fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
-      ".markdown" -> ((fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
-      ".adoc" -> ((fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => asciidoc(fileContent,  branch, repository, enableWikiLink, enableRefsLink)(context)),
-      ".asciidoc" -> ((fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => asciidoc(fileContent,  branch, repository, enableWikiLink, enableRefsLink)(context))
+      ".md" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
+      ".markdown" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
+      ".adoc" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => asciidoc(filePath, fileContent,  branch, repository, enableWikiLink, enableRefsLink)(context)),
+      ".asciidoc" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => asciidoc(filePath, fileContent,  branch, repository, enableWikiLink, enableRefsLink)(context))
     )
 
   def renderableSuffixes: Seq[String] = renderersBySuffix.map(_._1)
@@ -44,13 +44,13 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
                enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html =
     Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
 
-  def renderMarkup(fileName: String, fileContent: String, branch: String,
+  def renderMarkup(filePath: List[String], fileContent: String, branch: String,
                    repository: service.RepositoryService.RepositoryInfo,
                    enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
 
-    val fileNameLower = fileName.toLowerCase
+    val fileNameLower = filePath.reverse.head.toLowerCase
     renderersBySuffix.find { case (suffix, _) => fileNameLower.endsWith(suffix) } match {
-      case Some((_, handler)) => handler(fileContent, branch, repository, enableWikiLink, enableRefsLink, context)
+      case Some((_, handler)) => handler(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context)
       case None => Html(
         s"<tt>${
           fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
@@ -59,9 +59,9 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     }
   }
 
-  def asciidoc(value: String, branch: String, repository: service.RepositoryService.RepositoryInfo,
+  def asciidoc(filePath: List[String], value: String, branch: String, repository: service.RepositoryService.RepositoryInfo,
                enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html =
-    Html(Asciidoc.toHtml(value, branch, repository, enableWikiLink, enableRefsLink))
+    Html(Asciidoc.toHtml(filePath, value, branch, repository, enableWikiLink, enableRefsLink))
 
   /**
    * Returns &lt;img&gt; which displays the avatar icon for the given user name.

src/main/twirl/repo/blob.scala.html

@@ -39,7 +39,7 @@
         @if(content.viewType == "text"){
           @defining(pathList.reverse.head) { file =>
             @if(renderableSuffixes.find(suffix => file.toLowerCase.endsWith(suffix))) {
-              @renderMarkup(file, content.content.get, branch, repository, false, false)
+              @renderMarkup(pathList, content.content.get, branch, repository, false, false)
             } else {
               <pre class="prettyprint linenums blob">@content.content.get</pre>
             }

src/main/twirl/repo/files.scala.html

@@ -3,7 +3,7 @@
   pathList: List[String],
   latestCommit: util.JGitUtil.CommitInfo,
   files: List[util.JGitUtil.FileInfo],
-  readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context)
+  readme: Option[(List[String], String)])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@@ -77,10 +77,10 @@
     </table>
   </div>
   
-  @readme.map { case(file, content) =>
+  @readme.map { case(filePath, content) =>
   <div id="readme" class="box">
-    <div class="box-header">@file.name</div>
-    <div class="box-content markdown-body">@renderMarkup(file.name, content, branch, repository, false, false)</div>
+    <div class="box-header">@filePath.reverse.head</div>
+    <div class="box-content markdown-body">@renderMarkup(filePath, content, branch, repository, false, false)</div>
   </div>
   }
 }