wiki: finish new

1 files changed, 58 insertions, 3 deletions

diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go
index 30bd7b63c7..4ea41b347e 100644
--- a/routers/repo/wiki.go
+++ b/routers/repo/wiki.go
@@ -5,6 +5,10 @@
 package repo
 
 import (
+	"io/ioutil"
+
+	"github.com/gogits/git-shell"
+
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
 	"github.com/gogits/gogs/modules/base"
@@ -18,17 +22,68 @@ const (
 )
 
 func Wiki(ctx *middleware.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.wiki")
 	ctx.Data["PageIsWiki"] = true
 
 	if !ctx.Repo.Repository.HasWiki() {
+		ctx.Data["Title"] = ctx.Tr("repo.wiki")
 		ctx.HTML(200, WIKI_START)
 		return
 	}
 
+	wikiRepo, err := git.OpenRepository(ctx.Repo.Repository.WikiPath())
+	if err != nil {
+		ctx.Handle(500, "OpenRepository", err)
+		return
+	}
+	commit, err := wikiRepo.GetCommitOfBranch("master")
+	if err != nil {
+		ctx.Handle(500, "GetCommitOfBranch", err)
+		return
+	}
+
+	page := models.ToWikiPageName(ctx.Params(":page"))
+	if len(page) == 0 {
+		page = "Home"
+	}
+	ctx.Data["Title"] = page
+	ctx.Data["RequireHighlightJS"] = true
+
+	blob, err := commit.GetBlobByPath(page + ".md")
+	if err != nil {
+		if git.IsErrNotExist(err) {
+			ctx.Redirect(ctx.Repo.RepoLink + "/wiki/_list")
+		} else {
+			ctx.Handle(500, "GetBlobByPath", err)
+		}
+		return
+	}
+	r, err := blob.Data()
+	if err != nil {
+		ctx.Handle(500, "Data", err)
+		return
+	}
+	data, err := ioutil.ReadAll(r)
+	if err != nil {
+		ctx.Handle(500, "ReadAll", err)
+		return
+	}
+	ctx.Data["Content"] = string(base.RenderMarkdown(data, ctx.Repo.RepoLink))
+
+	// Get last change information.
+	lastCommit, err := wikiRepo.GetCommitByPath(page + ".md")
+	if err != nil {
+		ctx.Handle(500, "GetCommitByPath", err)
+		return
+	}
+	ctx.Data["Author"] = lastCommit.Author
+
 	ctx.HTML(200, WIKI_VIEW)
 }
 
+func WikiList(ctx *middleware.Context) {
+
+}
+
 func NewWiki(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
 	ctx.Data["PageIsWiki"] = true
@@ -51,12 +106,12 @@ func NewWikiPost(ctx *middleware.Context, form auth.NewWikiForm) {
 		return
 	}
 
-	if err := ctx.Repo.Repository.AddWikiPage(form.Title, form.Content, form.Message); err != nil {
+	if err := ctx.Repo.Repository.AddWikiPage(ctx.User, form.Title, form.Content, form.Message); err != nil {
 		ctx.Handle(500, "AddWikiPage", err)
 		return
 	}
 
-	ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + models.ToWikiPageName(form.Title))
+	ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + models.ToWikiPageURL(form.Title))
 }
 
 func EditWiki(ctx *middleware.Context) {