mostly finished db pages

pkg/db/db.go

@@ -5,6 +5,7 @@ package db
 import (
 	"bytes"
 	"errors"
+	"git.giftfish.de/ston1th/gowiki/cache"
 	"github.com/boltdb/bolt"
 )
 
@@ -25,18 +26,14 @@ const (
 	maxSearchResult = 101
 )
 
-var (
-	errUserNotExists = dbErr("user does not exist")
-	errUserExists    = dbErr("user already exist")
-)
-
 func dbErr(i interface{}) error {
 	return fmt.Errorf("db: %s", i)
 }
 
 type BoltStore struct {
 	Marshaler
-	db *bolt.DB
+	db    *bolt.DB
+	cache *cache.Cache
 }
 
 func NewBoltStore() (bs *BoltStore, err error) {
@@ -48,14 +45,14 @@ func NewBoltStore() (bs *BoltStore, err error) {
 		if _, err := tx.CreateBucketIfNotExists([]byte(userTable)); err != nil {
 			return err
 		}
-		if _, err := tx.CreateBucketIfNotExists([]byte(pagesTable)); err != nil {
+		if _, err := tx.CreateBucketIfNotExists([]byte(pageTable)); err != nil {
 			return err
 		}
 		return nil
 	}); err != nil {
 		return
 	}
-	bs = &BoltStore{NewGOB(), db}
+	bs = &BoltStore{NewGOB(), db, cache.NewCache()}
 	if !bs.UserExists(defUser) {
 		err = bs.CreateUser(defUser, defPassword, true)
 		if err != nil {

pkg/db/helper.go

@@ -12,3 +12,13 @@ func validatePassword(pw string) (b []byte) {
 	b = hash.Sum(nil)
 	return
 }
+
+const timeFmt = "2006-01-02 15:04:05"
+
+func now() string {
+	return time.Now().Format(timeFmt)
+}
+
+func created(username string) string {
+	return username + " " + now()
+}

pkg/db/page.go

@@ -1,5 +1,11 @@
 package db
 
+import (
+	"git.giftfish.de/ston1th/gowiki/pkg/cache"
+	"git.giftfish.de/ston1th/gowiki/pkg/permission"
+	"git.giftfish.de/ston1th/gowiki/pkg/reneder"
+)
+
 type Article struct {
 	Title     string        `json:"title"`
 	LinkTitle string        `json:"-"`
@@ -12,31 +18,145 @@ type Article struct {
 	Public    bool          `json:"public"`
 }
 
-type Permission int
+type Page struct {
+	Title    string                `json:"title"`
+	Markdown string                `json:"markdown"`
+	Index    template.HTML         `json:"index"`
+	Text     template.HTML         `json:"text"`
+	Created  string                `json:"created"`
+	Updated  string                `json:"updated"`
+	Owner    string                `json:"owner"`
+	Perm     permission.Permission `json:"perm"`
+}
 
-const (
-	Public Permission = iota
-	Internal
-	Private
+var (
+	errPageNotFound      = dbErr("page not found")
+	errInvalidPermission = dbErr("invalid permission")
+	errPrivateWikiPage   = dbErr("private wiki pages are not allowed")
 )
 
-type Page struct {
-	Title    string        `json:"title"`
-	Markdown string        `json:"markdown"`
-	Index    template.HTML `json:"index"`
-	Text     template.HTML `json:"text"`
-	Created  string        `json:"created"`
-	Updated  string        `json:"updated"`
-	Perm     Permission    `json:"perm"`
-}
-
-func (bs *BoltStore) GetPage(title string) (p Page, err error) {
-	err = bs.db.View(func(tx *bolt.Tx) error {
-		v := tx.Bucket([]byte(pageTable)).Get([]byte(username))
-		if v == nil {
-			return errUserNotExists
+func (bs *BoltStore) GetPage(title, username string) (p *Page, err error) {
+	p = bs.cache.Get(title)
+	if p == nil {
+		p = new(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 err
 		}
-		return bs.Unmarshal(v, &u)
-	})
+		bs.cache.Add(title, p)
+	}
+	if !permission.Read(username, p) {
+		err = errPageNotFound
+	}
 	return
 }
+
+func (bs *BoltStore) pageExists(title, username string) (page *Page, err error) {
+	page, err = bs.GetPage(title)
+	if err != nil {
+		return
+	}
+	if !permission.Verify(username, page) {
+		err = errPageNotFound
+	}
+	return
+}
+
+func (bs *BoltStore) CreatePage(title, section, markdown, username string, perm int) (page *Page, err error) {
+	p := permission.Parse(perm)
+	if p == permission.Invalid {
+		err = errInvalidPermission
+		return
+	}
+	if section == wikiSection && p == permission.Private {
+		err = errPrivateWikiPage
+		return
+	}
+	st := storeTitle(section, title)
+	if _, err = bs.pageExists(st, username); err != nil {
+		return
+	}
+
+	page = &Page{
+		Title:    title,
+		Markdown: markdown,
+		Created:  created(username),
+		Owner:    username,
+		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)
+	})
+	if err != nil {
+		return
+	}
+
+	err = index.Add(title, search)
+	if err != nil {
+		return
+	}
+	cache.Add(st, page)
+	return
+}
+
+func (bs *BoltStore) UpdatePage(title, section, markdown, username string, perm int) (page *Page, err error) {
+	p := permission.Parse(perm)
+	if p == permission.Invalid {
+		err = errInvalidPermission
+		return
+	}
+	if section == wikiSection && p == permission.Private {
+		err = errPrivateWikiPage
+		return
+	}
+	st := storeTitle(section, title)
+	page, err = bs.pageExists(st, username)
+	if err != nil {
+		return
+	}
+
+	page.Markdown = markdown
+	page.Updated = created(username)
+	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)
+	})
+	if err != nil {
+		return
+	}
+
+	err = index.Add(title, search)
+	if err != nil {
+		return
+	}
+	cache.Add(st, page)
+	return
+}
+
+func (bs *BoltStore) DeletePage(title, section, username string) error {
+	st := storeTitle(section, title)
+	if _, err := bs.pageExists(st, username); err != nil {
+		return err
+	}
+	return bs.db.Update(func(tx *bolt.Tx) error {
+		return tx.Bucket([]byte(pageTable)).Delete([]byte(st))
+	})
+}

pkg/db/user.go

@@ -5,6 +5,11 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
+var (
+	errUserNotFound = dbErr("user not found")
+	errUserExists   = dbErr("user already exist")
+)
+
 func (bs *BoltStore) GetUsers() (users []User, err error) {
 	users, err = bs.DumpUsers()
 	for i := range users {