#10: limit level of subdirctory probing

Author: xrfang

README.md

@@ -33,11 +33,11 @@ OPTIONS:
 
 ```json
 {
-    "main_css":"default.css",
-    "code_css":"highlight.css",
-    "port": 0,
-    "quit": 9,
-    "rev": 33
+    "main_css": "default.css",
+    "code_css": "highlight.css",
+    "port":     0,
+    "recurse":  2,
+    "rev":      39
 }
 ```
 
@@ -46,7 +46,7 @@ Options are:
 * **main_css**: name of the primary stylesheet
 * **code_css**: stylesheet for [syntax highlighting](https://highlightjs.org/)
 * **port**: HTTP port, 0 means auto select
-* **quit**: delay before quit the local server
+* **recurse**: level of sub-directories to search for markdown files (1~9, default 2)
 * **rev**: revision of **MDV** that generated this config file
 
 Usually, there is no need to edit this config file, except that you may want to use a new stylesheet. Alternatively, you can also edit the `default.css` file directly to tweak display effects. Also, there is a `highlight.css` which is the stylesheet for [syntax highlighting](https://highlightjs.org/).

collection.go

@@ -23,57 +23,78 @@ func (c collection) CurrentPath() string {
 	return filepath.Join(c.Path, c.CurrentFile())
 }
 
-func collect(root string) (col *collection, err error) {
+func iter(path string, level int) []string {
+	d, err := os.Open(path)
+	assert(err)
+	defer d.Close()
+	fis, err := d.ReadDir(0)
+	assert(err)
+	sub := make(map[string][]string)
+	var items []string
+	for _, fi := range fis {
+		fp := filepath.Join(path, fi.Name())
+		if fi.IsDir() {
+			if !strings.HasSuffix(fp, string(os.PathSeparator)) {
+				fp += string(os.PathSeparator)
+			}
+			items = append(items, fp)
+			if level > 0 {
+				sub[fp] = iter(fp, level-1)
+			}
+			continue
+		}
+		ext := strings.ToLower(filepath.Ext(fi.Name()))
+		if ext == ".md" {
+			items = append(items, fp)
+		}
+	}
+	sort.Strings(items)
+	var files []string
+	for _, fn := range items {
+		if strings.HasSuffix(fn, string(os.PathSeparator)) {
+			files = append(files, sub[fn]...)
+			continue
+		}
+		files = append(files, fn)
+	}
+	return files
+}
+
+func collect(entry string, depth int) (col *collection, err error) {
+	if depth < 1 || depth > 9 {
+		depth = 2
+	}
 	defer func() {
 		if e := recover(); e != nil {
 			err = e.(error)
 		}
 	}()
-	root, err = filepath.Abs(root)
+	entry, err = filepath.Abs(entry)
 	assert(err)
-	st, err := os.Stat(root)
+	root := entry
+	st, err := os.Stat(entry)
 	assert(err)
-	col = new(collection)
-	col.Files = []string{}
-	if st.IsDir() {
-		col.Path = root
-		col.Index = 0
-		filepath.Walk(root, func(p string, fi os.FileInfo, e error) error {
-			assert(err)
-			if !fi.IsDir() && strings.ToLower(filepath.Ext(p)) == ".md" {
-				col.Files = append(col.Files, p[len(col.Path)+1:])
-			}
-			return nil
-		})
-	} else {
-		col.Path = filepath.Dir(root)
-		col.Index = -1
-		filepath.Walk(col.Path, func(p string, fi os.FileInfo, e error) error {
-			assert(err)
-			if !fi.IsDir() && strings.ToLower(filepath.Ext(p)) == ".md" {
-				col.Files = append(col.Files, p[len(col.Path)+1:])
-			}
-			return nil
-		})
+	if !st.IsDir() {
+		root = filepath.Dir(entry)
 	}
-	sort.Slice(col.Files, func(i, j int) bool {
-		return strings.ToLower(col.Files[i]) < strings.ToLower(col.Files[j])
-	})
-	if col.Index < 0 {
-		bn := filepath.Base(root)
-		for i, f := range col.Files {
-			if f == bn {
-				col.Index = i
-				break
+	if !strings.HasSuffix(root, string(os.PathSeparator)) {
+		root += string(os.PathSeparator)
+	}
+	files := iter(root, depth-1)
+	var idx int
+	if len(files) == 0 {
+		idx = -1
+	} else {
+		for i := range files {
+			if files[i] == entry {
+				idx = i
 			}
+			files[i] = files[i][len(root):]
 		}
-		if col.Index < 0 {
-			col.Files = append([]string{bn}, col.Files...)
-			col.Index = 0
-		}
-	}
-	if len(col.Files) == 0 {
-		col.Index = -1
 	}
-	return col, nil
+	return &collection{
+		Path:  root,
+		Files: files,
+		Index: idx,
+	}, nil
 }

conf.go

@@ -13,6 +13,7 @@ type (
 	config struct {
 		MainCSS string `json:"main_css"`
 		CodeCSS string `json:"code_css"`
+		Recurse int    `json:"recurse"`
 		Port    int    `json:"port"`
 		Rev     int    `json:"rev"`
 		dir     string
@@ -58,6 +59,7 @@ var cf config
 func init() {
 	cf.MainCSS = "default.css"
 	cf.CodeCSS = "highlight.css"
+	cf.Recurse = 2
 	dir, err := os.UserConfigDir()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)

main.go

@@ -46,7 +46,7 @@ func main() {
 	root, _ := fs.Sub(res, "resources")
 	extract(root, "default.css")
 	extract(root, "highlight.css")
-	col, err := collect(flag.Arg(0))
+	col, err := collect(flag.Arg(0), cf.Recurse)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)