danog/gojekyll
1
0
Fork 0
mirror of https://github.com/danog/gojekyll.git synced 2024-11-30 07:08:59 +01:00
Code Issues Projects Releases Wiki Activity

Better reload

Browse Source
This commit is contained in:
Oliver Steele 2017-08-08 19:44:04 -04:00
parent 5a5193f441
commit 9a4759b0a5
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/watcher.go
View File

@ -28,6 +28,11 @@ func (s *Server) watchReload() error {
urls[url] = true
}
}
if site.RequiresFullReload(change.Paths) {
for u := range site.Routes {
urls[u] = true
}
}
// reload the site
s.reload(change)
// tell the pages their files (may have) changed

16
site/rebuild.go
View File

@ -35,7 +35,7 @@ func (s *Site) WatchRebuild() (<-chan interface{}, error) {
// Reloaded returns the same or a new site reading the same source directory, configuration file, and load flags.
// build --incremental and site --incremental use this.
func (s *Site) Reloaded(paths []string) (*Site, error) {
if s.requiresFullReload(paths) {
if s.RequiresFullReload(paths) {
copy, err := FromDirectory(s.SourceDir(), s.flags)
if err != nil {
return nil, err
@ -63,7 +63,7 @@ func (s *Site) processFilesEvent(fileset FilesEvent, messages chan<- interface{}
// reloads and rebuilds the site; returns a copy and count
func (s *Site) rebuild(paths []string) (r *Site, n int, err error) {
if s.requiresFullReload(paths) {
if s.RequiresFullReload(paths) {
r, err = s.Reloaded(paths)
if err != nil {
return
@ -89,7 +89,7 @@ func (s *Site) rebuild(paths []string) (r *Site, n int, err error) {
return
}
// Return true if a source file requires a full reload / rebuild.
// RequiresFullReload returns true if a source file requires a full reload / rebuild.
//
// This is always true outside of incremental mode, since even a
// static asset can cause pages to change if they reference its
@ -97,21 +97,23 @@ func (s *Site) rebuild(paths []string) (r *Site, n int, err error) {
//
// This function works on relative paths. It does not work for theme
// sources.
func (s *Site) requiresFullReload(paths []string) bool {
func (s *Site) RequiresFullReload(paths []string) bool {
for _, path := range paths {
switch {
case s.config.IsConfigPath(path):
return true
case s.Exclude(path):
return false
continue
case !s.config.Incremental:
return true
case strings.HasPrefix(path, s.config.SassDir()):
return true
case strings.HasPrefix(path, s.config.DataDir):
return true
case strings.HasPrefix(path, s.config.IncludesDir):
return true
case strings.HasPrefix(path, s.config.LayoutsDir):
return true
case strings.HasPrefix(path, s.config.SassDir()):
return true
}
}
return false