nested lists #26

neurosnap · May 18, 2022 · b216265 · b216265
1 parent d9c5abb
commit b216265
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/html/list.partial.tmpl b/html/list.partial.tmpl
@@ -1,5 +1,5 @@
 {{define "list"}}
-<ul style="list-style-type: {{.ListType}};">
+<ul style="list-style-type: {{.MetaData.ListType}};">
     {{range .Items}}
         {{if .IsText}}
             {{if .Value}}
@@ -20,16 +20,20 @@
         {{end}}
 
         {{if .IsHeaderOne}}
-        </ul><h2 class="text-xl font-bold">{{.Value}}</h2><ul style="list-style-type: {{$.ListType}};">
+        </ul><h2 class="text-xl font-bold">{{.Value}}</h2><ul style="list-style-type: {{$.MetaData.ListType}};">
         {{end}}
 
         {{if .IsHeaderTwo}}
-        </ul><h3 class="text-lg font-bold">{{.Value}}</h3><ul style="list-style-type: {{$.ListType}};">
+        </ul><h3 class="text-lg font-bold">{{.Value}}</h3><ul style="list-style-type: {{$.MetaData.ListType}};">
         {{end}}
 
         {{if .IsPre}}
         <li><pre>{{.Value}}</pre></li>
         {{end}}
+
+        {{if .IsChild}}
+        <li style="list-style: none;">{{template "list" .Children}}</li>
+        {{end}}
     {{end}}
 </ul>
 {{end}}
diff --git a/internal/api/main.go b/internal/api/main.go
@@ -66,7 +66,7 @@ type PostPageData struct {
 	Description  string
 	Username     string
 	BlogName     string
-	ListType     string
+	MetaData     *pkg.MetaData
 	Items        []*pkg.ListItem
 	PublishAtISO string
 	PublishAt    string
@@ -281,13 +281,13 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
 		URL:          template.URL(PostURL(post)),
 		BlogURL:      template.URL(internal.BlogURL(username)),
 		Description:  post.Description,
-		ListType:     parsedText.MetaData.ListType,
 		Title:        internal.FilenameToTitle(post.Filename, post.Title),
 		PublishAt:    post.PublishAt.Format("02 Jan, 2006"),
 		PublishAtISO: post.PublishAt.Format(time.RFC3339),
 		Username:     username,
 		BlogName:     blogName,
 		Items:        parsedText.Items,
+		MetaData:     parsedText.MetaData,
 	}
 
 	ts, err := renderTemplate([]string{
@@ -451,7 +451,7 @@ func rssBlogHandler(w http.ResponseWriter, r *http.Request) {
 		parsed := pkg.ParseText(post.Text)
 		var tpl bytes.Buffer
 		data := &PostPageData{
-			ListType: parsed.MetaData.ListType,
+			MetaData: parsed.MetaData,
 			Items:    parsed.Items,
 		}
 		if err := ts.Execute(&tpl, data); err != nil {
@@ -509,7 +509,7 @@ func rssHandler(w http.ResponseWriter, r *http.Request) {
 		parsed := pkg.ParseText(post.Text)
 		var tpl bytes.Buffer
 		data := &PostPageData{
-			ListType: parsed.MetaData.ListType,
+			MetaData: parsed.MetaData,
 			Items:    parsed.Items,
 		}
 		if err := ts.Execute(&tpl, data); err != nil {

diff --git a/pkg/parser.go b/pkg/parser.go
@@ -23,6 +23,8 @@ type ListItem struct {
 	IsHeaderTwo bool
 	IsImg       bool
 	IsPre       bool
+	IsChild     bool
+	Children    *ParsedText
 }
 
 type MetaData struct {
@@ -39,6 +41,8 @@ var imgToken = "=<"
 var headerOneToken = "#"
 var headerTwoToken = "##"
 var preToken = "```"
+var nestedSpaceToken = "  "
+var nestedTabToken = '\t'
 
 type SplitToken struct {
 	Key   string
@@ -132,6 +136,19 @@ func ParseText(text string) *ParsedText {
 			nextValue := strings.Replace(li.Value, preToken, "", 1)
 			prevItem.Value = fmt.Sprintf("%s\n%s", prevItem.Value, nextValue)
 			skip = true
+		} else if strings.HasPrefix(t, nestedSpaceToken) {
+			nextItem := ParseText(li.Value)
+
+			if prevItem.IsChild {
+				prevItem.Children.Items = append(prevItem.Children.Items, nextItem.Items...)
+				skip = true
+			} else {
+				li.IsChild = true
+				li.Children = &ParsedText{
+					MetaData: nextItem.MetaData,
+					Items:    nextItem.Items,
+				}
+			}
 		} else if strings.HasPrefix(li.Value, urlToken) {
 			li.IsURL = true
 			split := TextToSplitToken(strings.Replace(li.Value, urlToken, "", 1))