mirror of
https://github.com/schollz/cowyo.git
synced 2023-08-10 21:13:00 +03:00
Added current version number information (really lazily)
This commit is contained in:
parent
1ac06efc51
commit
189adc2fe2
8
db.go
8
db.go
@ -43,7 +43,7 @@ type WikiData struct {
|
||||
Locked string
|
||||
}
|
||||
|
||||
func getCurrentText(title string, version int) (string, []versionsInfo, bool, time.Duration, bool, string) {
|
||||
func getCurrentText(title string, version int) (string, []versionsInfo, bool, time.Duration, bool, string, int) {
|
||||
Open(RuntimeArgs.DatabaseLocation)
|
||||
defer Close()
|
||||
title = strings.ToLower(title)
|
||||
@ -53,8 +53,9 @@ func getCurrentText(title string, version int) (string, []versionsInfo, bool, ti
|
||||
currentText := ""
|
||||
encrypted := false
|
||||
locked := ""
|
||||
currentVersionNum := -1
|
||||
if !open {
|
||||
return currentText, vi, isCurrent, totalTime, encrypted, locked
|
||||
return currentText, vi, isCurrent, totalTime, encrypted, locked, currentVersionNum
|
||||
}
|
||||
err := db.View(func(tx *bolt.Tx) error {
|
||||
var err error
|
||||
@ -75,6 +76,7 @@ func getCurrentText(title string, version int) (string, []versionsInfo, bool, ti
|
||||
currentText = p.CurrentText
|
||||
encrypted = p.Encrypted
|
||||
locked = p.Locked
|
||||
currentVersionNum = len(p.Diffs) - 1
|
||||
if version > -1 && version < len(p.Diffs) {
|
||||
// get that version of text instead
|
||||
currentText = rebuildTextsToDiffN(p, version)
|
||||
@ -87,7 +89,7 @@ func getCurrentText(title string, version int) (string, []versionsInfo, bool, ti
|
||||
if err != nil {
|
||||
fmt.Printf("Could not get WikiData: %s", err)
|
||||
}
|
||||
return currentText, vi, isCurrent, totalTime, encrypted, locked
|
||||
return currentText, vi, isCurrent, totalTime, encrypted, locked, currentVersionNum
|
||||
}
|
||||
|
||||
func (p *WikiData) load(title string) error {
|
||||
|
31
routes.go
31
routes.go
@ -93,7 +93,7 @@ func encryptionRoute(c *gin.Context) {
|
||||
if option == "/decrypt" {
|
||||
if c.BindJSON(&jsonLoad) == nil {
|
||||
var err error
|
||||
currentText, _, _, _, encrypted, _ := getCurrentText(title, -1)
|
||||
currentText, _, _, _, encrypted, _, _ := getCurrentText(title, -1)
|
||||
if encrypted == true {
|
||||
currentText, err = decryptString(currentText, jsonLoad.Password)
|
||||
if err != nil {
|
||||
@ -241,7 +241,7 @@ func editNote(c *gin.Context) {
|
||||
} else {
|
||||
version := c.DefaultQuery("version", "-1")
|
||||
versionNum, _ := strconv.Atoi(version)
|
||||
currentText, versions, currentVersion, totalTime, encrypted, locked := getCurrentText(title, versionNum)
|
||||
currentText, versions, currentVersion, totalTime, encrypted, locked, currentVersionNum := getCurrentText(title, versionNum)
|
||||
if strings.Contains(c.Request.Header.Get("User-Agent"), "curl/") {
|
||||
c.Data(200, "text/plain", []byte(currentText))
|
||||
return
|
||||
@ -262,17 +262,18 @@ func editNote(c *gin.Context) {
|
||||
|
||||
CodeType := getCodeType(title)
|
||||
c.HTML(http.StatusOK, "index.tmpl", gin.H{
|
||||
"Title": title,
|
||||
"WikiName": RuntimeArgs.WikiName,
|
||||
"ExternalIP": RuntimeArgs.ExternalIP,
|
||||
"CurrentText": currentText,
|
||||
"NumRows": numRows,
|
||||
"Versions": versions,
|
||||
"TotalTime": totalTimeString,
|
||||
"SocketType": RuntimeArgs.Socket,
|
||||
"NoEdit": !currentVersion,
|
||||
"Coding": len(CodeType) > 0,
|
||||
"CodeType": CodeType,
|
||||
"Title": title,
|
||||
"WikiName": RuntimeArgs.WikiName,
|
||||
"ExternalIP": RuntimeArgs.ExternalIP,
|
||||
"CurrentText": currentText,
|
||||
"CurrentVersionNum": currentVersionNum,
|
||||
"NumRows": numRows,
|
||||
"Versions": versions,
|
||||
"TotalTime": totalTimeString,
|
||||
"SocketType": RuntimeArgs.Socket,
|
||||
"NoEdit": !currentVersion,
|
||||
"Coding": len(CodeType) > 0,
|
||||
"CodeType": CodeType,
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -287,7 +288,7 @@ func everythingElse(c *gin.Context) {
|
||||
if strings.ToLower(title) == "help" {
|
||||
versionNum = -1
|
||||
}
|
||||
currentText, versions, _, totalTime, encrypted, locked := getCurrentText(title, versionNum)
|
||||
currentText, versions, _, totalTime, encrypted, locked, _ := getCurrentText(title, versionNum)
|
||||
if (strings.Contains(currentText, "self-destruct\n") || strings.Contains(currentText, "\nself-destruct")) && strings.ToLower(title) != "help" {
|
||||
currentText = strings.Replace(currentText, "self-destruct\n", `> *This page has been deleted, you cannot return after closing.*`+"\n", 1)
|
||||
currentText = strings.Replace(currentText, "\nself-destruct", "\n"+`> *This page has been deleted, you cannot return after closing.*`, 1)
|
||||
@ -301,7 +302,7 @@ func everythingElse(c *gin.Context) {
|
||||
if strings.ToLower(title) == "help" {
|
||||
versionNum = -1
|
||||
}
|
||||
currentText, _, _, _, _, _ := getCurrentText(title, versionNum)
|
||||
currentText, _, _, _, _, _, _ := getCurrentText(title, versionNum)
|
||||
c.Writer.Header().Set("Content-Type", contentType(title))
|
||||
c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
c.Writer.Header().Set("Access-Control-Max-Age", "86400")
|
||||
|
@ -86,6 +86,7 @@
|
||||
<li class="dropdown active">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" class="active"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li class="dropdown-header">Version: #{{ .CurrentVersionNum }}</li>
|
||||
<li class="dropdown-header">Time edited: {{ .TotalTime }}</li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li class="dropdown-header">Other versions</li>
|
||||
|
Loading…
Reference in New Issue
Block a user