split db and bolt to store interface

pkg/db/db.go

@@ -5,20 +5,20 @@ package db
 import (
 	"fmt"
 	"git.giftfish.de/ston1th/gowiki/pkg/cache"
+	"git.giftfish.de/ston1th/gowiki/pkg/core"
 	"git.giftfish.de/ston1th/gowiki/pkg/index"
-	"github.com/boltdb/bolt"
+	"git.giftfish.de/ston1th/gowiki/pkg/store"
+	"git.giftfish.de/ston1th/gowiki/pkg/util"
 )
 
 const (
-	dbFile       = "gowiki.db"
-	defUser      = "admin"
-	defPassword  = "gowiki"
-	userTable    = "user"
-	pageTable    = "page"
-	snippetTable = "snippet"
-	bcryptCost   = 13
-	indexName    = "Index"
-	welcome      = `# Welcome to GoWiki
+	defUser     = "admin"
+	defPassword = "gowiki"
+	usersFile   = "users.db"
+	pagesFile   = "pages.db"
+	bcryptCost  = 13
+	indexName   = "Index"
+	welcome     = `# Welcome to GoWiki
 This is the [Index](/wiki/Index) page.  
 You can customize it how you like.`
 	wikiSection = "wiki"
@@ -33,47 +33,56 @@ func dbErr(i interface{}) error {
 	return fmt.Errorf("db: %s", i)
 }
 
-type BoltStore struct {
-	Marshaler
-	db    *bolt.DB
+type DB struct {
+	pages store.Store
+	users store.Store
 	cache *cache.Cache
-	index *index.Index
+	Index *index.Index
 }
 
-// TODO create initial wiki page
-// TODO init index
+func NewDB(indexPath string) (db *DB, err error) {
+	db = &DB{cache: cache.NewCache()}
+	db.Index, err = index.NewIndex(indexPath)
+	if err != nil {
+		return
+	}
 
-func NewBoltStore(indexPath string) (bs *BoltStore, err error) {
-	db, err := bolt.Open(dbFile, 0666, nil)
+	db.users, err = store.NewBoltStore(usersFile, nil)
 	if err != nil {
 		return
 	}
-	if err = db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucketIfNotExists([]byte(userTable)); err != nil {
-			return err
-		}
-		if _, err := tx.CreateBucketIfNotExists([]byte(pageTable)); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		return
-	}
-	i, err := index.NewIndex(indexPath)
-	if err != nil {
-		return
-	}
-	bs = &BoltStore{NewGOB(), db, cache.NewCache(), i}
-	if bs.UserExists(defUser) == nil {
-		err = bs.CreateUser(defUser, defPassword, true)
+	if db.UserExists(defUser) != nil {
+		err = db.CreateUser(defUser, defPassword, true)
+		if err != nil {
+			return
+		}
+	}
+	err = db.UnlockUser(defUser)
+	if err != nil {
+		return
+	}
+
+	db.pages, err = store.NewBoltStore(pagesFile, nil)
+	if err != nil {
+		return
+	}
+	if _, err = db.pageExists(util.StoreTitle(wikiSection, indexName), defUser); err != nil {
+		_, err = db.CreatePage(indexName, wikiSection, welcome, defUser, core.Public)
 		if err != nil {
 			return
 		}
 	}
-	bs.UnlockUser(defUser)
 	return
 }
 
-func (bs *BoltStore) Close() error {
-	return bs.db.Close()
+func (db *DB) Close() error {
+	err := db.pages.Close()
+	if err != nil {
+		return err
+	}
+	err = db.users.Close()
+	if err != nil {
+		return err
+	}
+	return db.Index.Close()
 }