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

panic bugfix

Browse source
This commit is contained in:
ston1th 2019-05-30 16:03:51 +02:00
commit c8adfd2ef9
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/db/db.go
View file

@ -65,7 +65,7 @@ func New(cfg core.Config) (db *DB, err error) {
} }
_, err = db.CreatePage(core.IndexPage, core.WikiSection, welcome, defUser, core.Public) _, err = db.CreatePage(core.IndexPage, core.WikiSection, welcome, defUser, core.Public)
if err != nil { if err != errPageExists && err != nil {
return return
} }
err = db.RunMigrations() err = db.RunMigrations()

4
pkg/db/page.go
View file

@ -15,6 +15,7 @@ const pagePrefix = "page/"
var ( var (
errPageNotFound = store.ErrKeyNotFound errPageNotFound = store.ErrKeyNotFound
errPageExists = errors.New("db: page already exists")
errPermissionDenied = errors.New("db: permission denied") errPermissionDenied = errors.New("db: permission denied")
errInvalidPermission = errors.New("db: invalid permission") errInvalidPermission = errors.New("db: invalid permission")
errPrivateWikiPage = errors.New("db: private wiki pages are not allowed") errPrivateWikiPage = errors.New("db: private wiki pages are not allowed")
@ -140,6 +141,9 @@ func (db *DB) CreatePage(title, section, markdown, username string, p core.Permi
st := render.StoreTitle(section, render.Title(title)) st := render.StoreTitle(section, render.Title(title))
_, err = db.getPage(st, username) _, err = db.getPage(st, username)
if err != store.ErrKeyNotFound { if err != store.ErrKeyNotFound {
if err == nil {
err = errPageExists
}
return return
} }
s, err := db.GetSection(section) s, err := db.GetSection(section)