Implementing Wiki part.

This commit is contained in:
takezoe
2013-05-02 02:32:19 +09:00
parent 1961a430c9
commit ea4d736931
4 changed files with 28 additions and 8 deletions

View File

@@ -8,7 +8,9 @@ class WikiController extends ControllerBase {
val owner = params("owner") val owner = params("owner")
val repository = params("repository") val repository = params("repository")
html.wiki(WikiUtil.getPage(owner, repository, "Home"), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) html.wiki("Home",
WikiUtil.getPage(owner, repository, "Home"),
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
} }
} }

View File

@@ -13,8 +13,10 @@ object WikiUtil {
* *
* @param name the page name * @param name the page name
* @param content the page content * @param content the page content
* @param committer the last committer
* @param time the last modified time
*/ */
case class WikiPageInfo(name: String, content: String) case class WikiPageInfo(name: String, content: String, committer: String, time: Date)
/** /**
* The model for wiki page history. * The model for wiki page history.
@@ -44,6 +46,7 @@ object WikiUtil {
if(!dir.exists){ if(!dir.exists){
val repo = new RepositoryBuilder().setGitDir(dir).setBare.build val repo = new RepositoryBuilder().setGitDir(dir).setBare.build
repo.create repo.create
savePage(owner, repository, "Home", "Welcome to the %s wiki!!".format(repository), owner, "Initial Commit")
} }
} }
@@ -54,8 +57,8 @@ object WikiUtil {
createWikiRepository(owner, repository) createWikiRepository(owner, repository)
val git = Git.open(getWikiRepositoryDir(owner, repository)) val git = Git.open(getWikiRepositoryDir(owner, repository))
try { try {
JGitUtil.getFileList(git, "master", ".").find(_.name == pageName).map { file => JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8")) WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time)
} }
} catch { } catch {
// TODO no commit, but it should not judge by exception. // TODO no commit, but it should not judge by exception.

View File

@@ -18,6 +18,12 @@ object helpers {
def format(value: String): twirl.api.Html = twirl.api.Html( def format(value: String): twirl.api.Html = twirl.api.Html(
value.replaceAll(" ", "&nbsp;").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;").replaceAll("\n", "<br>")) value.replaceAll(" ", "&nbsp;").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;").replaceAll("\n", "<br>"))
def markdown(value: String): twirl.api.Html = {
import org.pegdown._
val html = new PegDownProcessor().markdownToHtml(value)
twirl.api.Html(html)
}
/** /**
* Cut the given string by specified length. * Cut the given string by specified length.
*/ */

View File

@@ -1,11 +1,20 @@
@(page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context) @(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
@main("Wiki"){ @import view.helpers
@main(pageName + " - " + repository.owner + "/" + repository.name){
@header("wiki", repository) @header("wiki", repository)
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li><a href="">Home</a></li> <li class="active"><a href="">Home</a></li>
<li><a href="">Pages</a></li> <li><a href="">Pages</a></li>
<li><a href="">Wiki History</a></li> <li><a href="">Wiki History</a></li>
<li><a href="">Git Access</a></li> <li><a href="">Git Access</a></li>
</ul> </ul>
xxxx @page.map { page =>
<h1 class="wiki-title">@pageName</h1>
<div class="markdown-body">
@helpers.markdown(page.content)
</div>
<div class="small">
<span class="description">Last Edited by @page.committer at @helpers.datetime(page.time)</span>
</div>
}
} }