ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

split db and bolt to store interface

Browse source
This commit is contained in:
ston1th 2018-09-11 14:50:53 +02:00
commit 7e77fd7d27
14 changed files with 419 additions and 545 deletions
Download patch file Download diff file Expand all files Collapse all files

80
pkg/db/page.go
View file

@ -3,31 +3,22 @@ package db
import (
"git.giftfish.de/ston1th/gowiki/pkg/core"
"git.giftfish.de/ston1th/gowiki/pkg/render"
"git.giftfish.de/ston1th/gowiki/pkg/store"
"git.giftfish.de/ston1th/gowiki/pkg/util"
"github.com/boltdb/bolt"
)
var (
errPageNotFound = dbErr("page not found")
errPageNotFound = store.ErrKeyNotFound
errInvalidPermission = dbErr("invalid permission")
errPrivateWikiPage = dbErr("private wiki pages are not allowed")
)
func (bs *BoltStore) GetPage(title, username string) (p *core.Page, err error) {
p = bs.cache.Get(title)
func (db *DB) GetPage(title, username string) (p *core.Page, err error) {
p = db.cache.Get(title)
if p == nil {
p = new(core.Page)
err = bs.db.View(func(tx *bolt.Tx) error {
v := tx.Bucket([]byte(pageTable)).Get([]byte(title))
if v == nil {
return errPageNotFound
}
return bs.Unmarshal(v, p)
})
if err != nil {
return
}
bs.cache.Add(title, p)
err = db.pages.Get(title, p)
db.cache.Add(title, p)
}
if !core.ReadPerm(username, p) {
err = errPageNotFound
@ -35,14 +26,19 @@ func (bs *BoltStore) GetPage(title, username string) (p *core.Page, err error) {
return
}
// TODO access db not cache
func (bs *BoltStore) pageExists(title, username string) (p *core.Page, err error) {
p, err = bs.GetPage(title, username)
func (db *DB) pageExists(title, username string) (p *core.Page, err error) {
p = new(core.Page)
err = db.pages.Get(title, p)
if err != nil {
return
}
if !core.ReadPerm(username, p) {
err = errPageNotFound
}
return
}
func (bs *BoltStore) CreatePage(title, section, markdown, username string, perm int) (page *core.Page, err error) {
p := core.ParsePerm(perm)
func (db *DB) CreatePage(title, section, markdown, username string, p core.Permission) (page *core.Page, err error) {
if p == core.Invalid {
err = errInvalidPermission
return
@ -52,7 +48,7 @@ func (bs *BoltStore) CreatePage(title, section, markdown, username string, perm
return
}
st := util.StoreTitle(section, title)
if _, err = bs.pageExists(st, username); err != nil {
if _, err = db.pageExists(st, username); err != nil {
return
}
@ -65,26 +61,20 @@ func (bs *BoltStore) CreatePage(title, section, markdown, username string, perm
}
search := render.Render(page)
err = bs.db.Update(func(tx *bolt.Tx) error {
v, err := bs.Marshal(page)
if err != nil {
return err
}
return tx.Bucket([]byte(pageTable)).Put([]byte(st), v)
})
err = db.pages.Set(st, page)
if err != nil {
return
}
err = bs.index.Add(title, st, search)
err = db.Index.Add(title, st, search)
if err != nil {
return
}
bs.cache.Add(st, page)
db.cache.Add(st, page)
return
}
func (bs *BoltStore) UpdatePage(title, section, markdown, username string, perm int) (page *core.Page, err error) {
func (db *DB) UpdatePage(title, section, markdown, username string, perm int) (page *core.Page, err error) {
p := core.ParsePerm(perm)
if p == core.Invalid {
err = errInvalidPermission
@ -95,7 +85,7 @@ func (bs *BoltStore) UpdatePage(title, section, markdown, username string, perm
return
}
st := util.StoreTitle(section, title)
page, err = bs.pageExists(st, username)
page, err = db.pageExists(st, username)
if err != nil {
return
}
@ -105,34 +95,26 @@ func (bs *BoltStore) UpdatePage(title, section, markdown, username string, perm
page.Perm = p
search := render.Render(page)
err = bs.db.Update(func(tx *bolt.Tx) error {
v, err := bs.Marshal(page)
if err != nil {
return err
}
return tx.Bucket([]byte(pageTable)).Put([]byte(st), v)
})
err = db.pages.Set(st, page)
if err != nil {
return
}
err = bs.index.Add(title, st, search)
err = db.Index.Add(title, st, search)
if err != nil {
return
}
bs.cache.Add(st, page)
db.cache.Add(st, page)
return
}
func (bs *BoltStore) DeletePage(title, section, username string) error {
func (db *DB) DeletePage(title, section, username string) (err error) {
st := util.StoreTitle(section, title)
if _, err := bs.pageExists(st, username); err != nil {
return err
if _, err = db.pageExists(st, username); err != nil {
return
}
if err := bs.db.Update(func(tx *bolt.Tx) error {
return tx.Bucket([]byte(pageTable)).Delete([]byte(st))
}); err != nil {
return err
if err = db.pages.Delete(st); err != nil {
return
}
return bs.index.Delete(st)
return db.Index.Delete(st)
}