mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-05-03 09:00:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hugolib, commands: Improve live-reload on directory structure changes

Browse source 
This issue is more visible now that we support nested sections.

This commit makes operations like pasting new content folders or deleting content folders during server watch just work.

Fixes #3570
This commit is contained in:
Bjørn Erik Pedersen 2017-06-08 20:00:05 +02:00
parent b39689393c
commit fe901b8119
4 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hugolib/page.go
View file

@ -322,6 +322,18 @@ func (ps Pages) FindPagePosByFilePath(inPath string) int {
return -1
}
func (ps Pages) FindPagePosByFilePathPrefix(prefix string) int {
if prefix == "" {
return -1
}
for i, x := range ps {
if strings.HasPrefix(x.Source.Path(), prefix) {
return i
}
}
return -1
}
// FindPagePos Given a page, it will find the position in Pages
// will return -1 if not found
func (ps Pages) FindPagePos(page *Page) int {

12
hugolib/page_collections.go
View file

@ -137,6 +137,18 @@ func (c *PageCollections) addPage(page *Page) {
c.rawAllPages = append(c.rawAllPages, page)
}
// When we get a REMOVE event we're not always getting all the individual files,
// so we need to remove all below a given path.
func (c *PageCollections) removePageByPathPrefix(path string) {
for {
i := c.rawAllPages.FindPagePosByFilePathPrefix(path)
if i == -1 {
break
}
c.rawAllPages = append(c.rawAllPages[:i], c.rawAllPages[i+1:]...)
}
}
func (c *PageCollections) removePageByPath(path string) {
if i := c.rawAllPages.FindPagePosByFilePath(path); i >= 0 {
c.rawAllPages = append(c.rawAllPages[:i], c.rawAllPages[i+1:]...)

10
hugolib/site.go
View file

@ -667,11 +667,11 @@ func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
seen[ev] = true
if s.isContentDirEvent(ev) {
logger.Println("Source changed", ev.Name)
logger.Println("Source changed", ev)
sourceChanged = append(sourceChanged, ev)
}
if s.isLayoutDirEvent(ev) {
logger.Println("Template changed", ev.Name)
logger.Println("Template changed", ev)
tmplChanged = append(tmplChanged, ev)
if strings.Contains(ev.Name, "shortcodes") {
@ -682,11 +682,11 @@ func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
}
}
if s.isDataDirEvent(ev) {
logger.Println("Data changed", ev.Name)
logger.Println("Data changed", ev)
dataChanged = append(dataChanged, ev)
}
if s.isI18nEvent(ev) {
logger.Println("i18n changed", ev.Name)
logger.Println("i18n changed", ev)
i18nChanged = append(dataChanged, ev)
}
}
@ -761,7 +761,7 @@ func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
if ev.Op&fsnotify.Remove == fsnotify.Remove {
//remove the file & a create will follow
path, _ := helpers.GetRelativePath(ev.Name, s.getContentDir(ev.Name))
s.removePageByPath(path)
s.removePageByPathPrefix(path)
continue
}