mirror/cowyo
1
0
Fork 0
mirror of https://github.com/schollz/cowyo.git synced 2023-08-10 21:13:00 +03:00
Code Issues Projects Releases Wiki Activity

Check if opened

Browse Source
This commit is contained in:
Zack Scholl 2016-03-14 15:36:01 -04:00
parent 3dc0ea7524
commit 3ef10c9466
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db.go
View File

@ -43,11 +43,10 @@ type WikiData struct {
}
func hasPassword(title string) (bool, error) {
Open(RuntimeArgs.DatabaseLocation)
defer Close()
title = strings.ToLower(title)
if !open {
return false, fmt.Errorf("db must be opened before loading")
Open(RuntimeArgs.DatabaseLocation)
defer Close()
}
hasPassword := false
err := db.View(func(tx *bolt.Tx) error {
@ -126,11 +125,10 @@ func getCurrentText(title string, version int) (string, []versionsInfo, bool, ti
}
func (p *WikiData) load(title string) error {
Open(RuntimeArgs.DatabaseLocation)
defer Close()
title = strings.ToLower(title)
if !open {
return fmt.Errorf("db must be opened before loading!")
Open(RuntimeArgs.DatabaseLocation)
defer Close()
}
err := db.View(func(tx *bolt.Tx) error {
var err error
@ -162,10 +160,9 @@ func (p *WikiData) load(title string) error {
}
func (p *WikiData) save(newText string) error {
Open(RuntimeArgs.DatabaseLocation)
defer Close()
if !open {
return fmt.Errorf("db must be opened before saving")
Open(RuntimeArgs.DatabaseLocation)
defer Close()
}
err := db.Update(func(tx *bolt.Tx) error {
bucket, err := tx.CreateBucketIfNotExists([]byte("datas"))

4
main.go
View File

@ -61,9 +61,7 @@ Options:`)
if *dumpDataset {
fmt.Println("Dumping data to 'dump' folder...")
Open(RuntimeArgs.DatabaseLocation)
dumpEverything()
Close()
os.Exit(1)
}
@ -87,7 +85,7 @@ Options:`)
panic(err)
}
Close()
// Default page
aboutFile, _ := ioutil.ReadFile(path.Join(RuntimeArgs.SourcePath, "templates/aboutpage.md"))
p := WikiData{"help", "", []string{}, []string{}, false}