Page editing works.

This commit is contained in:
takezoe
2013-05-02 04:28:27 +09:00
parent 03f4a63dbd
commit 1909fc605a
3 changed files with 46 additions and 10 deletions

View File

@@ -1,9 +1,19 @@
package app package app
import util.{WikiUtil, JGitUtil} import util.{WikiUtil, JGitUtil}
import jp.sf.amateras.scalatra.forms._
class WikiController extends ControllerBase { class WikiController extends ControllerBase {
case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String)
val form = mapping(
"pageName" -> trim(label("Page name" , text(required, maxlength(40)))),
"content" -> trim(label("Content" , text(required))),
"message" -> trim(label("Message" , optional(text()))),
"currentPageName" -> trim(label("Current page name" , text(required)))
)(WikiPageEditForm.apply)
get("/:owner/:repository/wiki"){ get("/:owner/:repository/wiki"){
val owner = params("owner") val owner = params("owner")
val repository = params("repository") val repository = params("repository")
@@ -32,4 +42,15 @@ class WikiController extends ControllerBase {
WikiUtil.getPage(owner, repository, page), WikiUtil.getPage(owner, repository, page),
JGitUtil.getRepositoryInfo(owner, repository, servletContext)) JGitUtil.getRepositoryInfo(owner, repository, servletContext))
} }
post("/:owner/:repository/wiki/:page/_edit", form){ form =>
val owner = params("owner")
val repository = params("repository")
val page = params("page")
WikiUtil.savePage(owner, repository, form.currentPageName, form.pageName,
form.content, LoginUser, form.message.getOrElse(""))
redirect("%s/%s/wiki/%s".format(owner, repository, page))
}
} }

View File

@@ -46,7 +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") savePage(owner, repository, "Home", "Home", "Welcome to the %s wiki!!".format(repository), owner, "Initial Commit")
} }
} }
@@ -54,7 +54,9 @@ object WikiUtil {
* Returns the wiki page. * Returns the wiki page.
*/ */
def getPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = { def getPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
// TODO create wiki repository in the repository setting changing.
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 + ".md").map { file => JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
@@ -76,7 +78,10 @@ object WikiUtil {
/** /**
* Save the wiki page. * Save the wiki page.
*/ */
def savePage(owner: String, repository: String, pageName: String, content: String, committer: String, message: String): Unit = { def savePage(owner: String, repository: String, currentPageName: String, newPageName: String,
content: String, committer: String, message: String): Unit = {
// TODO create wiki repository in the repository setting changing.
createWikiRepository(owner, repository) createWikiRepository(owner, repository)
val workDir = getWikiWorkDir(owner, repository) val workDir = getWikiWorkDir(owner, repository)
@@ -87,12 +92,17 @@ object WikiUtil {
} }
// write as file // write as file
val file = new File(workDir, pageName + ".md") val cloned = Git.open(workDir)
val file = new File(workDir, newPageName + ".md")
FileUtils.writeStringToFile(file, content, "UTF-8") FileUtils.writeStringToFile(file, content, "UTF-8")
cloned.add.addFilepattern(file.getName).call
// delete file
if(currentPageName != newPageName){
cloned.rm.addFilepattern(currentPageName + ".md")
}
// commit and push // commit and push
val cloned = Git.open(workDir)
cloned.add.addFilepattern(file.getName).call
cloned.commit.setAuthor(committer, committer + "@devnull").setMessage(message).call cloned.commit.setAuthor(committer, committer + "@devnull").setMessage(message).call
cloned.push.call cloned.push.call
} }

View File

@@ -22,10 +22,15 @@
</div> </div>
</li> </li>
</ul> </ul>
<input type="text" name="page" value="@pageName" style="width: 900px; font-weight: bold;"/> <form action="_edit" method="POST" validate="true">
<span id="error-pageName" class="error-message"></span>
<input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;"/>
<span id="error-content" class="error-message"></span>
<textarea name="content" style="width: 900px; height: 400px;">@page.content</textarea> <textarea name="content" style="width: 900px; height: 400px;">@page.content</textarea>
<input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/> <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
<input type="hidden" name="currentPageName" value="@pageName"/>
<input type="submit" value="Save" class="btn btn-primary"> <input type="submit" value="Save" class="btn btn-primary">
<input type="button" value="Preview" class="btn"> <input type="button" value="Preview" class="btn">
</form>
} }
} }