Merge pull request halfrost#98 from halfrost/collapsed_menu

[Breaking Change] Collapsed menu halfrost#55

Author: halfrost

README.md

@@ -74,12 +74,12 @@ var (
 	}
 )
 
-func getChapterFourFileOrder() []string {
-	solutions := util.LoadChapterFourDir()
+func getChapterFourFileOrder() ([]string, []int) {
+	solutions, solutionIds := util.LoadChapterFourDir()
 	chapterFourFileOrder := []string{"_index"}
 	chapterFourFileOrder = append(chapterFourFileOrder, solutions...)
-	fmt.Printf("ChapterFour 中包括 _index 有 %v 个文件\n", len(chapterFourFileOrder))
-	return chapterFourFileOrder
+	fmt.Printf("ChapterFour 中包括 _index 有 %v 个文件, len(id) = %v\n", len(chapterFourFileOrder), len(solutionIds))
+	return chapterFourFileOrder, solutionIds
 }
 
 func newLabelCommand() *cobra.Command {
@@ -123,57 +123,75 @@ func newDeletePreNext() *cobra.Command {
 
 func addPreNext() {
 	// Chpater one add pre-next
-	addPreNextLabel(chapterOneFileOrder, []string{}, "", "ChapterOne", "ChapterTwo")
+	addPreNextLabel(chapterOneFileOrder, []string{}, []int{}, "", "ChapterOne", "ChapterTwo")
 	// Chpater two add pre-next
-	addPreNextLabel(chapterTwoFileOrder, chapterOneFileOrder, "ChapterOne", "ChapterTwo", "ChapterThree")
+	addPreNextLabel(chapterTwoFileOrder, chapterOneFileOrder, []int{}, "ChapterOne", "ChapterTwo", "ChapterThree")
 	// Chpater three add pre-next
-	addPreNextLabel(chapterThreeFileOrder, chapterTwoFileOrder, "ChapterTwo", "ChapterThree", "ChapterFour")
+	addPreNextLabel(chapterThreeFileOrder, chapterTwoFileOrder, []int{}, "ChapterTwo", "ChapterThree", "ChapterFour")
 	// Chpater four add pre-next
 	//fmt.Printf("%v\n", getChapterFourFileOrder())
-	addPreNextLabel(getChapterFourFileOrder(), chapterThreeFileOrder, "ChapterThree", "ChapterFour", "")
+	chapterFourFileOrder, solutionIds := getChapterFourFileOrder()
+	addPreNextLabel(chapterFourFileOrder, chapterThreeFileOrder, solutionIds, "ChapterThree", "ChapterFour", "")
 }
 
-func addPreNextLabel(order, preOrder []string, preChapter, chapter, nextChapter string) {
+func addPreNextLabel(order, preOrder []string, chapterFourIds []int, preChapter, chapter, nextChapter string) {
 	var (
 		exist bool
 		err   error
 		res   []byte
 		count int
 	)
-	for index, v := range order {
+	for index, path := range order {
 		tmp := ""
 		if index == 0 {
 			if chapter == "ChapterOne" {
 				// 第一页不需要“上一章”
 				tmp = "\n\n" + delLine + fmt.Sprintf("<p align = \"right\"><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1])
 			} else {
-				tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一章</a></p>\n", preChapter, preOrder[len(preOrder)-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1]) + preNextFotter
+				if chapter == "ChapterFour" {
+					tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一章</a></p>\n", preChapter, preOrder[len(preOrder)-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/%v/\">下一页➡️</a></p>\n", chapter, util.GetChpaterFourFileNum(chapterFourIds[(index-1)+1]), order[index+1]) + preNextFotter
+				} else {
+					tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一章</a></p>\n", preChapter, preOrder[len(preOrder)-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1]) + preNextFotter
+				}
 			}
 		} else if index == len(order)-1 {
 			if chapter == "ChapterFour" {
 				// 最后一页不需要“下一页”
-				tmp = "\n\n" + delLine + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一页</a></p>\n", chapter, order[index-1])
+				tmp = "\n\n" + delLine + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/%v/\">⬅️上一页</a></p>\n", chapter, util.GetChpaterFourFileNum(chapterFourIds[(index-1)-1]), order[index-1])
 			} else {
 				tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一页</a></p>\n", chapter, order[index-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/\">下一章➡️</a></p>\n", nextChapter) + preNextFotter
 			}
 		} else if index == 1 {
-			tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/\">⬅️上一页</a></p>\n", chapter) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1]) + preNextFotter
+			if chapter == "ChapterFour" {
+				tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/\">⬅️上一页</a></p>\n", chapter) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/%v/\">下一页➡️</a></p>\n", chapter, util.GetChpaterFourFileNum(chapterFourIds[(index-1)+1]), order[index+1]) + preNextFotter
+			} else {
+				tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/\">⬅️上一页</a></p>\n", chapter) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1]) + preNextFotter
+			}
 		} else {
-			tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一页</a></p>\n", chapter, order[index-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1]) + preNextFotter
+			if chapter == "ChapterFour" {
+				tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/%v/\">⬅️上一页</a></p>\n", chapter, util.GetChpaterFourFileNum(chapterFourIds[(index-1)-1]), order[index-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/%v/\">下一页➡️</a></p>\n", chapter, util.GetChpaterFourFileNum(chapterFourIds[(index-1)+1]), order[index+1]) + preNextFotter
+			} else {
+				tmp = "\n\n" + preNextHeader + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">⬅️上一页</a></p>\n", chapter, order[index-1]) + fmt.Sprintf("<p><a href=\"https://books.halfrost.com/leetcode/%v/%v/\">下一页➡️</a></p>\n", chapter, order[index+1]) + preNextFotter
+			}
 		}
-		exist, err = needAdd(fmt.Sprintf("../website/content/%v/%v.md", chapter, v))
+
+		if chapter == "ChapterFour" && index > 0 {
+			path = fmt.Sprintf("%v/%v", util.GetChpaterFourFileNum(chapterFourIds[(index-1)]), path)
+		}
+
+		exist, err = needAdd(fmt.Sprintf("../website/content/%v/%v.md", chapter, path))
 		if err != nil {
 			fmt.Println(err)
 			return
 		}
 		// 当前没有上一页和下一页，才添加
 		if !exist && err == nil {
-			res, err = eofAdd(fmt.Sprintf("../website/content/%v/%v.md", chapter, v), tmp)
+			res, err = eofAdd(fmt.Sprintf("../website/content/%v/%v.md", chapter, path), tmp)
 			if err != nil {
 				fmt.Println(err)
 				return
 			}
-			util.WriteFile(fmt.Sprintf("../website/content/%v/%v.md", chapter, v), res)
+			util.WriteFile(fmt.Sprintf("../website/content/%v/%v.md", chapter, path), res)
 			count++
 		}
 	}
@@ -205,30 +223,35 @@ func eofAdd(filePath string, labelString string) ([]byte, error) {
 
 func delPreNext() {
 	// Chpater one del pre-next
-	delPreNextLabel(chapterOneFileOrder, "ChapterOne")
+	delPreNextLabel(chapterOneFileOrder, []int{}, "ChapterOne")
 	// Chpater two del pre-next
-	delPreNextLabel(chapterTwoFileOrder, "ChapterTwo")
+	delPreNextLabel(chapterTwoFileOrder, []int{}, "ChapterTwo")
 	// Chpater three del pre-next
-	delPreNextLabel(chapterThreeFileOrder, "ChapterThree")
+	delPreNextLabel(chapterThreeFileOrder, []int{}, "ChapterThree")
 	// Chpater four del pre-next
-	delPreNextLabel(getChapterFourFileOrder(), "ChapterFour")
+	chapterFourFileOrder, solutionIds := getChapterFourFileOrder()
+	delPreNextLabel(chapterFourFileOrder, solutionIds, "ChapterFour")
 }
 
-func delPreNextLabel(order []string, chapter string) {
+func delPreNextLabel(order []string, chapterFourIds []int, chapter string) {
 	count := 0
-	for index, v := range order {
+	for index, path := range order {
 		lineNum := 5
 		if index == 0 && chapter == "ChapterOne" || index == len(order)-1 && chapter == "ChapterFour" {
 			lineNum = 3
 		}
-		exist, err := needAdd(fmt.Sprintf("../website/content/%v/%v.md", chapter, v))
+		if chapter == "ChapterFour" && index > 0 {
+			path = fmt.Sprintf("%v/%v", util.GetChpaterFourFileNum(chapterFourIds[(index-1)]), path)
+		}
+
+		exist, err := needAdd(fmt.Sprintf("../website/content/%v/%v.md", chapter, path))
 		if err != nil {
 			fmt.Println(err)
 			return
 		}
 		// 存在才删除
 		if exist && err == nil {
-			removeLine(fmt.Sprintf("../website/content/%v/%v.md", chapter, v), lineNum+1)
+			removeLine(fmt.Sprintf("../website/content/%v/%v.md", chapter, path), lineNum+1)
 			count++
 		}
 	}

ctl/label.go

@@ -130,9 +130,9 @@ func GenerateTagMdRows(solutionIds []int, metaMap map[int]TagList, mdrows []Mdro
 			s6 := strings.Replace(s5, ",", "", -1)
 			s7 := strings.Replace(s6, "?", "", -1)
 			if internal {
-				tmp.SolutionPath = fmt.Sprintf("[Go]({{< relref \"/ChapterFour/%v.md\" >}})", fmt.Sprintf("%04d.%v", int(row.FrontendQuestionID), s7))
+				tmp.SolutionPath = fmt.Sprintf("[Go]({{< relref \"/ChapterFour/%v/%v.md\" >}})", util.GetChpaterFourFileNum(int(row.FrontendQuestionID)), fmt.Sprintf("%04d.%v", int(row.FrontendQuestionID), s7))
 			} else {
-				tmp.SolutionPath = fmt.Sprintf("[Go](https://books.halfrost.com/leetcode/ChapterFour/%v)", fmt.Sprintf("%04d.%v", int(row.FrontendQuestionID), s7))
+				tmp.SolutionPath = fmt.Sprintf("[Go](https://books.halfrost.com/leetcode/ChapterFour/%v/%v)", util.GetChpaterFourFileNum(int(row.FrontendQuestionID)), fmt.Sprintf("%04d.%v", int(row.FrontendQuestionID), s7))
 			}
 			tmp.Acceptance = row.Acceptance
 			tmp.Difficulty = row.Difficulty

ctl/models/tagproblem.go

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"os"
 	"regexp"
+	"strconv"
 	"strings"
 )
 
@@ -59,7 +60,7 @@ func generatePDF() {
 	// 先删除 pre-next
 	delPreNext()
 
-	chapterFourFileOrder := util.LoadChapterFourDir()
+	chapterFourFileOrder, _ := util.LoadChapterFourDir()
 	totalSolutions = len(chapterFourFileOrder)
 	midVersion = totalSolutions / 100
 	lastVersion = totalSolutions % 100
@@ -102,7 +103,17 @@ func loadChapter(order []string, path, chapter string) ([]byte, error) {
 			// 清理不支持的特殊 MarkDown 语法
 			tmp, err = clean(fmt.Sprintf("%v/%v/%v.md", path, chapter, v))
 		} else {
-			tmp, err = util.LoadFile(fmt.Sprintf("%v/%v/%v.md", path, chapter, v))
+			if chapter == "ChapterFour" {
+				if v[4] == '.' {
+					num, err := strconv.Atoi(v[:4])
+					if err != nil {
+						fmt.Println(err)
+					}
+					tmp, err = util.LoadFile(fmt.Sprintf("%v/%v/%v/%v.md", path, chapter, util.GetChpaterFourFileNum(num), v))
+				}
+			} else {
+				tmp, err = util.LoadFile(fmt.Sprintf("%v/%v/%v.md", path, chapter, v))
+			}
 		}
 		if err != nil {
 			fmt.Println(err)
@@ -126,7 +137,7 @@ func prepare(path string) {
 		fmt.Println(err)
 	}
 	for _, v := range chapterOneFileOrder {
-		removeHeader(fmt.Sprintf("../website/content/ChapterOne/%v.md", v), fmt.Sprintf("./pdftemp/ChapterOne/%v.md", v), 4)
+		removeHeader(fmt.Sprintf("../website/content/ChapterOne/%v.md", v), fmt.Sprintf("./pdftemp/ChapterOne/%v.md", v), 5)
 	}
 
 	err = os.MkdirAll("./pdftemp/ChapterTwo", os.ModePerm)
@@ -138,22 +149,22 @@ func prepare(path string) {
 	util.CopyFile("./pdftemp/ChapterTwo/_index.md", "../website/content/ChapterTwo/_index.md")
 
 	for _, v := range chapterTwoFileOrder {
-		removeHeader(fmt.Sprintf("./pdftemp/ChapterTwo/%v.md", v), fmt.Sprintf("./pdftemp/ChapterTwo/%v.md", v), 4)
+		removeHeader(fmt.Sprintf("./pdftemp/ChapterTwo/%v.md", v), fmt.Sprintf("./pdftemp/ChapterTwo/%v.md", v), 5)
 	}
 
 	err = os.MkdirAll("./pdftemp/ChapterThree", os.ModePerm)
 	if err != nil {
 		fmt.Println(err)
 	}
 	for _, v := range chapterThreeFileOrder {
-		removeHeader(fmt.Sprintf("../website/content/ChapterThree/%v.md", v), fmt.Sprintf("./pdftemp/ChapterThree/%v.md", v), 4)
+		removeHeader(fmt.Sprintf("../website/content/ChapterThree/%v.md", v), fmt.Sprintf("./pdftemp/ChapterThree/%v.md", v), 5)
 	}
 
 	err = os.MkdirAll("./pdftemp/ChapterFour", os.ModePerm)
 	if err != nil {
 		fmt.Println(err)
 	}
-	removeHeader(fmt.Sprintf("../website/content/ChapterFour/_index.md"), fmt.Sprintf("./pdftemp/ChapterFour/_index.md"), 4)
+	removeHeader(fmt.Sprintf("../website/content/ChapterFour/_index.md"), fmt.Sprintf("./pdftemp/ChapterFour/_index.md"), 5)
 }
 
 func clean(filePath string) ([]byte, error) {

ctl/pdf.go

@@ -18,7 +18,8 @@ func newRefresh() *cobra.Command {
 }
 
 func refresh() {
-	buildBookMenu()
+	//buildBookMenu()
+	copyLackFile()
 	delPreNext()
 	buildREADME()
 	buildChapterTwo(true)

ctl/refresh.go

@@ -4,15 +4,16 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	m "github.com/halfrost/LeetCode-Go/ctl/models"
-	"github.com/halfrost/LeetCode-Go/ctl/util"
-	"github.com/spf13/cobra"
 	"io"
 	"os"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
+
+	m "github.com/halfrost/LeetCode-Go/ctl/models"
+	"github.com/halfrost/LeetCode-Go/ctl/util"
+	"github.com/spf13/cobra"
 )
 
 var (
@@ -33,7 +34,7 @@ func newBuildCommand() *cobra.Command {
 	mc.AddCommand(
 		newBuildREADME(),
 		newBuildChapterTwo(),
-		newBuildMenu(),
+		// newBuildMenu(),
 	)
 	return mc
 }
@@ -263,8 +264,21 @@ func renderChapterTwo(filePath string, tls m.TagLists) ([]byte, error) {
 }
 
 func buildBookMenu() {
+	copyLackFile()
+	// 按照模板重新渲染 Menu
+	res, err := renderBookMenu("./template/menu.md")
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	util.WriteFile("../website/content/menu/index.md", res)
+	fmt.Println("generate Menu successful")
+}
+
+// 拷贝 leetcode 目录下的题解 README 文件至第四章对应文件夹中
+func copyLackFile() {
 	solutionIds, soName, _ := util.LoadSolutionsDir()
-	ch4Ids, _ := util.LoadChapterFourIds()
+	_, ch4Ids := util.LoadChapterFourDir()
 
 	needCopy := []string{}
 	for i := 0; i < len(solutionIds); i++ {
@@ -275,28 +289,31 @@ func buildBookMenu() {
 	if len(needCopy) > 0 {
 		fmt.Printf("有 %v 道题需要拷贝到第四章中\n", len(needCopy))
 		for i := 0; i < len(needCopy); i++ {
-			util.CopyFile(fmt.Sprintf("../website/content/ChapterFour/%v.md", needCopy[i]), fmt.Sprintf("../leetcode/%v/README.md", needCopy[i]))
+			if needCopy[i][4] == '.' {
+				tmp, err := strconv.Atoi(needCopy[i][:4])
+				if err != nil {
+					fmt.Println(err)
+				}
+				err = os.MkdirAll(fmt.Sprintf("../website/content/ChapterFour/%v", util.GetChpaterFourFileNum(tmp)), os.ModePerm)
+				if err != nil {
+					fmt.Println(err)
+				}
+				util.CopyFile(fmt.Sprintf("../website/content/ChapterFour/%v/%v.md", util.GetChpaterFourFileNum(tmp), needCopy[i]), fmt.Sprintf("../leetcode/%v/README.md", needCopy[i]))
+				util.CopyFile(fmt.Sprintf("../website/content/ChapterFour/%v/_index.md", util.GetChpaterFourFileNum(tmp)), "./template/collapseSection.md")
+			}
 		}
 	} else {
 		fmt.Printf("【第四章没有需要添加的题解，已经完整了】\n")
 	}
-
-	// 按照模板重新渲染 Menu
-	res, err := renderBookMenu("./template/menu.md")
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	util.WriteFile("../website/content/menu/index.md", res)
-	fmt.Println("generate Menu successful")
 }
 
 func generateMenu() string {
 	res := ""
 	res += menuLine(chapterOneMenuOrder, "ChapterOne")
 	res += menuLine(chapterTwoFileOrder, "ChapterTwo")
 	res += menuLine(chapterThreeFileOrder, "ChapterThree")
-	res += menuLine(getChapterFourFileOrder(), "ChapterFour")
+	chapterFourFileOrder, _ := getChapterFourFileOrder()
+	res += menuLine(chapterFourFileOrder, "ChapterFour")
 	return res
 }
 

ctl/render.go

@@ -1,6 +1,7 @@
 ---
-title: Array
+title: 2.01 Array
 type: docs
+weight: 1
 ---
 
 # Array

ctl/template/Array.md

@@ -1,6 +1,7 @@
 ---
-title: Backtracking
+title: 2.08 ✅ Backtracking
 type: docs
+weight: 8
 ---
 
 # Backtracking

ctl/template/Backtracking.md

@@ -1,6 +1,7 @@
 ---
-title: Binary Indexed Tree
+title: 2.19 ✅ Binary Indexed Tree
 type: docs
+weight: 19
 ---
 
 # Binary Indexed Tree

ctl/template/Binary_Indexed_Tree.md

@@ -1,6 +1,7 @@
 ---
-title: Binary Search
+title: 2.11 Binary Search
 type: docs
+weight: 11
 ---
 
 # Binary Search