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

Merge pull request #288 from lefou/asciidoctorj

Browse Source 
Support AsciiDoc markup for all files + Plain text Readme's
This commit is contained in:
Naoki Takezoe
2014-04-04 13:09:45 +09:00
parent 91bd9d1111 c9a1515d1f
commit f8b6b1ebf8
6 changed files with 112 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -252,7 +252,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
}
private val readmeFiles = Seq("readme.md", "readme.markdown")
private val readmeFiles = view.helpers.renderableSuffixes.map(suffix => s"readme${suffix}") ++ Seq("readme.txt", "readme")
/**
* Provides HTML of the file list.
@@ -270,14 +270,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
//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 =>
// get files
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.getContentFromId(
val path = (file.name :: parentPath.reverse).reverse
path -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
}