Merge pull request #147 from w568w/master

Fix #110 and #116

build.go

@@ -176,6 +176,9 @@ func Build() {
 	// Generate RSS page
 	wg.Add(1)
 	go GenerateRSS(visibleArticles)
+	// Generate sitemap page
+	wg.Add(1)
+	go GenerateSitemap(visibleArticles)
 	// Generate article list JSON
 	wg.Add(1)
 	go GenerateJSON(visibleArticles)

go.mod

@@ -22,6 +22,8 @@ require (
 	github.com/facebookgo/testname v0.0.0-20150612200628-5443337c3a12 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/snabb/diagio v1.0.1 // indirect
+	github.com/snabb/sitemap v1.0.2 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	golang.org/x/sys v0.1.0 // indirect
 )

go.sum

@@ -29,6 +29,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/snabb/diagio v1.0.1 h1:l7HODYLuGuPfom3Rbm/HHdp1RdrVyAy5iWEzLkRXlH0=
+github.com/snabb/diagio v1.0.1/go.mod h1:ZyGaWFhfBVqstGUw6laYetzeTwZ2xxVPqTALx1QQa1w=
+github.com/snabb/sitemap v1.0.2 h1:Qam349AjWdPRxx51Wv8rMoMQuAnj3JcIFahtmZxm7jk=
+github.com/snabb/sitemap v1.0.2/go.mod h1:sVjDylXD+ZHu+xplNJZ8o5GMfbxNEx+lGVg7YUuXnac=
 github.com/urfave/cli/v2 v2.24.2 h1:q1VA+ofZ8SWfEKB9xXHUD4QZaeI9e+ItEqSbfH2JBXk=
 github.com/urfave/cli/v2 v2.24.2/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=

main.go

@@ -43,6 +43,7 @@ toc: {{.Toc}}
 )
 
 var globalConfig *GlobalConfig
+var themeConfig *ThemeConfig
 var rootPath string
 
 func main() {
@@ -187,8 +188,8 @@ func ParseGlobalConfigByCli(c *cli.Context, develop bool) {
 
 func ParseGlobalConfigWrap(root string, develop bool) {
 	rootPath = root
-	globalConfig = ParseGlobalConfig(filepath.Join(rootPath, "config.yml"), develop)
-	if globalConfig == nil {
+	globalConfig, themeConfig = ParseGlobalConfig(filepath.Join(rootPath, "config.yml"), develop)
+	if globalConfig == nil || themeConfig == nil {
 		return
 	}
 }

parse.go

@@ -148,12 +148,12 @@ func ReplaceRootFlag(content string) string {
 	return strings.Replace(content, "-/", globalConfig.Site.Root+"/", -1)
 }
 
-func ParseGlobalConfig(configPath string, develop bool) *GlobalConfig {
+func ParseGlobalConfig(configPath string, develop bool) (*GlobalConfig, *ThemeConfig) {
 	var config *GlobalConfig
 	// Parse Global Config
 	data, err := os.ReadFile(configPath)
 	if err != nil {
-		return nil
+		return nil, nil
 	}
 	if err = yaml.Unmarshal(data, &config); err != nil {
 		Fatal(err.Error())
@@ -181,7 +181,7 @@ func ParseGlobalConfig(configPath string, develop bool) *GlobalConfig {
 	for item, langItem := range themeConfig.Lang {
 		config.I18n[item] = langItem[config.Site.Lang]
 	}
-	return config
+	return config, themeConfig
 }
 
 func ParseThemeConfig(configPath string) *ThemeConfig {

render.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"html/template"
 	"os"
@@ -9,6 +10,7 @@ import (
 	"time"
 
 	"github.com/gorilla/feeds"
+	"github.com/snabb/sitemap"
 )
 
 type Data interface{}
@@ -130,6 +132,46 @@ func GenerateRSS(articles Collections) {
 	}
 }
 
+// Generate sitemap page
+func GenerateSitemap(articles Collections) {
+	defer wg.Done()
+
+	if globalConfig.Site.Url != "" {
+		sm := sitemap.New()
+
+		globalModTime := time.Now()
+		sm.Add(&sitemap.URL{
+			Loc:        globalConfig.Site.Url,
+			LastMod:    &globalModTime,
+			ChangeFreq: sitemap.Weekly,
+		})
+
+		for _, item := range articles {
+			article := item.(Article)
+
+			var lastModTime time.Time
+			if article.MTime.After(article.Time) {
+				lastModTime = article.MTime
+			} else {
+				lastModTime = article.Time
+			}
+
+			sm.Add(&sitemap.URL{
+				Loc:        globalConfig.Site.Url + "/" + article.Link,
+				LastMod:    &lastModTime,
+				ChangeFreq: sitemap.Weekly,
+			})
+		}
+
+		var sitemap bytes.Buffer
+		sm.WriteTo(&sitemap)
+		err := os.WriteFile(filepath.Join(publicPath, "sitemap.xml"), sitemap.Bytes(), 0644)
+		if err != nil {
+			Fatal(err.Error())
+		}
+	}
+}
+
 // Generate article list page
 func RenderArticleList(rootPath string, articles Collections, tagName string) {
 	defer wg.Done()

serve.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 	"path/filepath"
+	"reflect"
 
 	"github.com/InkProject/ink.go"
 	"github.com/facebookgo/symwalk"
@@ -13,12 +14,61 @@ import (
 var watcher *fsnotify.Watcher
 var conn *websocket.Conn
 
+func buildWatchList() (files []string, dirs []string) {
+	dirs = []string{
+		filepath.Join(rootPath, "source"),
+	}
+	files = []string{
+		filepath.Join(rootPath, "config.yml"),
+		filepath.Join(themePath),
+	}
+
+	// Add files and directories defined in theme's config.yml to watcher
+	for _, themeCopiedPath := range themeConfig.Copy {
+		if themeCopiedPath != "" {
+			fullPath := filepath.Join(themePath, themeCopiedPath)
+			s, err := os.Stat(fullPath)
+			if s == nil || err != nil {
+				continue
+			}
+
+			if s.IsDir() {
+				dirs = append(dirs, fullPath)
+			} else {
+				files = append(files, fullPath)
+			}
+		}
+	}
+	return files, dirs
+}
+
+// Add files and dirs to watcher
+func configureWatcher(watcher *fsnotify.Watcher, files []string, dirs []string) error {
+	for _, source := range dirs {
+		symwalk.Walk(source, func(path string, f os.FileInfo, err error) error {
+			if f != nil && f.IsDir() {
+				if err := watcher.Add(path); err != nil {
+					Warn(err.Error())
+				}
+			}
+			return nil
+		})
+	}
+	for _, source := range files {
+		if err := watcher.Add(source); err != nil {
+			Warn(err.Error())
+		}
+	}
+	return nil
+}
+
 func Watch() {
 	// Listen watched file change event
 	if watcher != nil {
 		watcher.Close()
 	}
 	watcher, _ = fsnotify.NewWatcher()
+	files, dirs := buildWatchList()
 	go func() {
 		for {
 			select {
@@ -27,6 +77,15 @@ func Watch() {
 					// Handle when file change
 					Log(event.Name)
 					ParseGlobalConfigWrap(rootPath, true)
+
+					newFiles, newDirs := buildWatchList()
+					// If file list changed, reconfigure watcher
+					if !reflect.DeepEqual(files, newFiles) || !reflect.DeepEqual(dirs, newDirs) {
+						configureWatcher(watcher, newFiles, newDirs)
+						files = newFiles
+						dirs = newDirs
+					}
+
 					Build()
 					if conn != nil {
 						if err := conn.WriteMessage(websocket.TextMessage, []byte("change")); err != nil {
@@ -39,29 +98,7 @@ func Watch() {
 			}
 		}
 	}()
-	var dirs = []string{
-		filepath.Join(rootPath, "source"),
-		filepath.Join(themePath, "bundle"),
-	}
-	var files = []string{
-		filepath.Join(rootPath, "config.yml"),
-		filepath.Join(themePath),
-	}
-	for _, source := range dirs {
-		symwalk.Walk(source, func(path string, f os.FileInfo, err error) error {
-			if f.IsDir() {
-				if err := watcher.Add(path); err != nil {
-					Warn(err.Error())
-				}
-			}
-			return nil
-		})
-	}
-	for _, source := range files {
-		if err := watcher.Add(source); err != nil {
-			Warn(err.Error())
-		}
-	}
+	configureWatcher(watcher, files, dirs)
 }
 
 func Websocket(ctx *ink.Context) {