From 9e655c497beb327d756c860578d2852a18833554 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Tue, 9 Feb 2016 18:44:00 -0500 Subject: [PATCH] Added versioning to view Former-commit-id: 68a23d84e8fe85c29b6acba7e54fda26b06c81a9 [formerly c437e34b2c74ca9295a1eefdbcd3b2856f9470b6] [formerly 70504642b2871a600d5150081c13b3fc8c14e578 [formerly 2fe84ff14842a8e8670560e7ec0d857a7a18997b [formerly f6cb43310665302793e6be1cd924f0b1f07761de]]] Former-commit-id: b23ed0e48e0e8db9786bf91a101cf28c6012fd82 [formerly f34f0ad3994ebe5b00cceb4d2052e4b1c55b7796] Former-commit-id: 2c5902a86996f9287c0890b32945987085428ef7 Former-commit-id: 529e6c591846f6bc1cc4fcae63727a3e36c5c279 --- routes.go | 19 +++++++++---------- templates/view.tmpl | 12 +++++++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/routes.go b/routes.go index 7a5a9a0..2607a59 100644 --- a/routes.go +++ b/routes.go @@ -65,14 +65,12 @@ func everythingElse(c *gin.Context) { option := c.Param("option") title := c.Param("title") if option == "/view" { - var p CowyoData - err := p.load(strings.ToLower(title)) - if err != nil { - panic(err) - } - renderMarkdown(c, p.CurrentText, title) + version := c.DefaultQuery("version", "-1") + versionNum, _ := strconv.Atoi(version) + currentText, versions, _ := getCurrentText(title, versionNum) + renderMarkdown(c, currentText, title, versions) } else if title == "ls" && option == "/"+RuntimeArgs.AdminKey && len(RuntimeArgs.AdminKey) > 1 { - renderMarkdown(c, listEverything(), "Everything") + renderMarkdown(c, listEverything(), "ls", nil) } else if option == "/list" { renderList(c, title) } else if title == "static" { @@ -91,7 +89,7 @@ func serveStaticFile(c *gin.Context, option string) { } } -func renderMarkdown(c *gin.Context, currentText string, title string) { +func renderMarkdown(c *gin.Context, currentText string, title string, versions []versionsInfo) { fmt.Println(currentText) unsafe := blackfriday.MarkdownCommon([]byte(currentText)) fmt.Println(string(unsafe)) @@ -113,8 +111,9 @@ func renderMarkdown(c *gin.Context, currentText string, title string) { html2 = strings.Replace(html2, "$", "$", -1) c.HTML(http.StatusOK, "view.tmpl", gin.H{ - "Title": title, - "Body": template.HTML([]byte(html2)), + "Title": title, + "Body": template.HTML([]byte(html2)), + "Versions": versions, }) } diff --git a/templates/view.tmpl b/templates/view.tmpl index 255b598..579fa07 100644 --- a/templates/view.tmpl +++ b/templates/view.tmpl @@ -29,7 +29,17 @@