fix iroiro

Signed-off-by: gotti <18141824+gotti@users.noreply.github.com>

Author: gotti

cmd/serverside/main.go

@@ -21,7 +21,11 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	data, err := g.Generate()
+	pages, err := framework.LoadLocalPages()
+	if err != nil {
+		panic(err)
+	}
+	data, err := g.Generate(&pages)
 	if err != nil {
 		panic(err)
 	}
@@ -39,12 +43,5 @@ func main() {
 		}
 		w.Write([]byte(d))
 	})
-	http.HandleFunc("/upload", func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "POST" {
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			w.Write([]byte("Method not allowed"))
-			return
-		}
-	})
 	http.ListenAndServe(":8080", nil)
 }

cmd/static-generate/main.go

@@ -27,7 +27,12 @@ func main() {
 		panic(err)
 	}
 	// data is a map of path to content
-	data, err := g.Generate()
+
+	pages, err := framework.LoadLocalPages()
+	if err != nil {
+		panic(err)
+	}
+	data, err := g.Generate(&pages)
 	if err != nil {
 		panic(err)
 	}

pkg/framework/framework.go

@@ -44,27 +44,23 @@ func NewGenerator(iadd []IndexingAddon, radd []ReplaceAddon, tadd []TemplateAddo
 }
 
 // Generate generates the pages
-func (g *Generator) Generate() (map[string]string, error) {
+func (g *Generator) Generate(pages *Pages) (map[string]string, error) {
 	ret := make(map[string]string)
-	pages, err := Load()
-	if err != nil {
-		return nil, fmt.Errorf("error loading pages: %w", err)
-	}
 	for _, i := range g.indexingAddon {
-		npages, err := i.GenerateIndexes(&pages)
+		npages, err := i.GenerateIndexes(pages)
 		if err != nil {
 			return nil, fmt.Errorf("error generating indexes: %w", err)
 		}
-		pages = *npages
+		pages = npages
 	}
 	for _, r := range g.replaceAddon {
-		npages, err := r.ReplacePages(&pages)
+		npages, err := r.ReplacePages(pages)
 		if err != nil {
 			return nil, fmt.Errorf("error replacing pages: %w", err)
 		}
-		pages = *npages
+		pages = npages
 	}
-	for _, p := range pages {
+	for _, p := range *pages {
 		html := p.Contents.ToHTML()
 		for _, t := range g.templateAddon {
 			npage, err := t.GeneratePage(p, template.HTML(html))
@@ -99,7 +95,7 @@ type Page struct {
 	Path     string
 }
 
-func Load() (Pages, error) {
+func LoadLocalPages() (Pages, error) {
 	parser := mdparser.NewLineParser(nil)
 	pages := NewPages()
 	filepath.WalkDir("pages", func(path string, d os.DirEntry, err error) error {
@@ -139,7 +135,6 @@ func Load() (Pages, error) {
 		//get filename
 		filename := filepath.Base(path)
 
-
 		_, ok := pages[path]
 		if ok {
 			fmt.Printf("duplicated filename!!!, filename=%v\n", filename)