peter/wiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move loading of backrefs

Browse Source
This commit is contained in:
Peter Stuifzand 2021-01-17 14:16:06 +01:00
parent aa663484bc
commit f7b1935ce3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
file.go
View File

@ -155,21 +155,16 @@ func (fp *FilePages) Get(title string) Page {
sw.Start("Get " + title) sw.Start("Get " + title)
defer sw.Stop() defer sw.Stop()
refs, err := getBackrefs(fp, title)
if err != nil {
refs = nil
}
blocks, err := loadBlocks(fp.dirname, title) blocks, err := loadBlocks(fp.dirname, title)
if err != nil { if err != nil {
return fp.oldPagesBackend(title, blocks, refs) return fp.oldPagesBackend(title, blocks)
} }
// Blocks based pages // Blocks based pages
return fp.blocksBackendGet(title, blocks, refs) return fp.blocksBackendGet(title, blocks)
} }
func (fp *FilePages) blocksBackendGet(name string, blocks BlockResponse, refs map[string][]Backref) Page { func (fp *FilePages) blocksBackendGet(name string, blocks BlockResponse) Page {
buf := bytes.Buffer{} buf := bytes.Buffer{}
current := blocks.PageID current := blocks.PageID
listItems := convertBlocksToListItems(current, blocks, 0) listItems := convertBlocksToListItems(current, blocks, 0)
@ -182,6 +177,11 @@ func (fp *FilePages) blocksBackendGet(name string, blocks BlockResponse, refs ma
log.Printf("while encoding blocks: %s", err) log.Printf("while encoding blocks: %s", err)
} }
refs, err := getBackrefs(fp, name)
if err != nil {
refs = nil
}
return Page{ return Page{
Name: name, Name: name,
Title: blocks.Texts[name], Title: blocks.Texts[name],
@ -192,10 +192,15 @@ func (fp *FilePages) blocksBackendGet(name string, blocks BlockResponse, refs ma
} }
} }
func (fp *FilePages) oldPagesBackend(title string, blocks BlockResponse, refs map[string][]Backref) Page { func (fp *FilePages) oldPagesBackend(title string, blocks BlockResponse) Page {
name := strings.Replace(title, " ", "_", -1) name := strings.Replace(title, " ", "_", -1)
title = strings.Replace(title, "_", " ", -1) title = strings.Replace(title, "_", " ", -1)
refs, err := getBackrefs(fp, name)
if err != nil {
refs = nil
}
f, err := os.Open(filepath.Join(fp.dirname, name)) f, err := os.Open(filepath.Join(fp.dirname, name))
if err != nil { if err != nil {
log.Printf("while opening file in oldPagesBackend: %s", err) log.Printf("while opening file in oldPagesBackend: %s", err)