refact: Refactor the code

1: add boook mark shortcodes
2: auto copy shrotcodes from notion-site
3: auto copy shrotcodes static from notion-site

Author: nonacosa

cmd/root.go

@@ -2,13 +2,12 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/pkwenda/notion-site/pkg"
-	"log"
-	"os"
-
 	"github.com/joho/godotenv"
+	"github.com/pkwenda/notion-site/pkg"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"log"
+	"os"
 )
 
 var cfgFile string
@@ -26,6 +25,7 @@ var rootCmd = &cobra.Command{
 		}
 		api := pkg.NewAPI()
 		files := pkg.NewFiles(config)
+		files.CopyShortCodes(config.HomePath)
 		tm := pkg.New()
 		caches := pkg.NewNotionCaches()
 		ns := pkg.NewNotionSite(api, tm, files, config, caches)

notion-site.yaml

@@ -1,25 +1,23 @@
-#notion:
-#  databaseId: 2bd00e5dfff3449ba81e0142f8af9bbb
-#  filterProp: Status
-#  filterValue:
-#    - Finished
-#    - Published
-#    - RePublish
-#  publishedValue: Published
-#markdown:
-#  shortcodeSyntax: hugo
-#  homePath: ../compose/exampleSiteDev
-
-
-#blog
 notion:
-  databaseId: df7fb0e4e0114268b973f9d3e9a39982
+  databaseId: 2bd00e5dfff3449ba81e0142f8af9bbb
   filterProp: Status
   filterValue:
     - Finished
     - Published
     - RePublish
   publishedValue: Published
 markdown:
-  shortcodeSyntax: hugo
-  homePath: ../notion-hugo-website-builder
+  homePath: ../notion-site-doc
+
+
+#blog
+#notion:
+#  databaseId: df7fb0e4e0114268b973f9d3e9a39982
+#  filterProp: Status
+#  filterValue:
+#    - Finished
+#    - Published
+#    - RePublish
+#  publishedValue: Published
+#markdown:
+#  homePath: ../notion-hugo-website-builder

pkg/config.go

@@ -16,7 +16,6 @@ type Notion struct {
 }
 
 type Markdown struct {
-	ShortcodeSyntax string `yaml:"shortcodeSyntax"` // hugo,hexo,vuepress
 	HomePath        string `yaml:"homePath"`
 	ImagePublicLink string `yaml:"imagePublicLink"`
 
@@ -39,8 +38,7 @@ func DefaultConfigInit() error {
 			PublishedValue: "Published",
 		},
 		Markdown: Markdown{
-			ShortcodeSyntax: "hugo",
-			HomePath:        "",
+			HomePath: "",
 		},
 	}
 	out, err := yaml.Marshal(defaultCfg)

pkg/file.go

@@ -223,3 +223,57 @@ func (files *Files) saveTo(reader io.Reader, rawURL, distDir string) (string, er
 	_, err = io.Copy(out, reader)
 	return filename, err
 }
+
+func (files *Files) CopyShortCodes(home string) {
+	src := filepath.Join("pkg", "shortcodes")
+	dst := filepath.Join(home, "layouts", "shortcodes")
+	err := os.RemoveAll(dst)
+	if err != nil {
+		fmt.Errorf("couldn't del folder: %s", err)
+	}
+	files.copyDir(src, dst)
+	src = filepath.Join("pkg", "shortcodes", "static")
+	dst = filepath.Join(home, "static", "notion-site")
+	err = os.RemoveAll(dst)
+	if err != nil {
+		fmt.Errorf("couldn't del folder: %s", err)
+	}
+	files.copyDir(src, dst)
+}
+
+func (files *Files) copyDir(src, dst string) error {
+	_, err := os.Stat(src)
+	if err != nil {
+		return err
+	}
+	err = files.mkdirPath(dst)
+	if err != nil {
+		return err
+	}
+	err = filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() {
+			return nil
+		}
+		dstPath := filepath.Join(dst, path[len(src):])
+		return files.copyFile(path, dstPath)
+	})
+	return err
+}
+
+func (files *Files) copyFile(src, dst string) error {
+	srcFile, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer srcFile.Close()
+	dstFile, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer dstFile.Close()
+	_, err = io.Copy(dstFile, srcFile)
+	return err
+}

pkg/generator.go

@@ -46,7 +46,7 @@ func Run(ns *NotionSite) error {
 
 func generate(ns *NotionSite, page notion.Page, blocks []notion.Block) error {
 	// Generate markdown content to the file
-	initNotionSite(ns, page)
+	initNotionSite(ns, page, blocks)
 
 	if ns.api.CheckHasChildDataBase(blocks, func(b bool, id string) {
 		// cache child database block id
@@ -78,16 +78,16 @@ func generate(ns *NotionSite, page notion.Page, blocks []notion.Block) error {
 	}
 
 	// todo edit frontMatter
-	if ns.config.Markdown.ShortcodeSyntax != "" {
-		ns.tm.EnableExtendedSyntax(ns.config.Markdown.ShortcodeSyntax)
-	}
+	//if ns.config.Markdown.ShortcodeSyntax != "" {
+	//	ns.tm.EnableExtendedSyntax(ns.config.Markdown.ShortcodeSyntax)
+	//}
 
 	//// todo how to support mention feature ???
-	//ns.currentBlocks, _ = syncMentionBlocks(ns.api.Client, blocks)
+
 	return ns.tm.GenerateTo(ns)
 }
 
-func initNotionSite(ns *NotionSite, page notion.Page) {
+func initNotionSite(ns *NotionSite, page notion.Page, blocks []notion.Block) {
 	// set current origin page
 	ns.currentPage = page
 	// set current notion page prop
@@ -96,7 +96,7 @@ func initNotionSite(ns *NotionSite, page notion.Page) {
 	// set notion site files info
 	ns.tm.NotionProps = ns.currentPageProp
 	ns.tm.Files = ns.files
-
+	ns.currentBlocks = blocks
 }
 
 func processDatabase(ns *NotionSite, id string) error {

pkg/markdown.go

@@ -20,7 +20,7 @@ import (
 var mdTemplatesFS embed.FS
 
 var (
-	extendedSyntaxBlocks            = []any{reflect.TypeOf(&notion.BookmarkBlock{}), reflect.TypeOf(&notion.CalloutBlock{})}
+	extendedSyntaxBlocks            = []any{reflect.TypeOf(&notion.CalloutBlock{})}
 	blockTypeInExtendedSyntaxBlocks = func(bType any) bool {
 		for _, blockType := range extendedSyntaxBlocks {
 			if blockType == bType {

pkg/shortcodes.go

@@ -23,8 +23,10 @@ func (tm *ToMarkdown) injectBookmarkInfo(bookmark *notion.BookmarkBlock, extra *
 			break
 		}
 	}
+	(*extra)["Url"] = og.URL
 	(*extra)["Title"] = og.Title
 	(*extra)["Description"] = og.Description
+	(*extra)["Icon"] = og.Favicon
 	return nil
 }
 

layouts/hugo/shortcodes/audio.html renamed to pkg/shortcodes/audio.html

@@ -13,7 +13,7 @@
 {{ end }}
 
 <div class="video-wrapper">
-    <iframe style="position: absolute; top: 0; left: 100; right:100; width: 80%; height: 80%; border:0;"
+    <iframe style="position: absolute; top: 0; width: 100%; height: 100%; border:0;"
             src="https://player.bilibili.com/player.html?{{ $basicQuery | safeURL }}&{{ $videoQuery | safeURL }}"
             scrolling="no"
             frameborder="no"

layouts/hugo/shortcodes/bilibili.html renamed to pkg/shortcodes/bilibili.html

@@ -0,0 +1,22 @@
+
+<link rel="preload" href="/notion-site/bookmark/bookmark.css" as="style">
+<link rel="stylesheet" href="/notion-site/bookmark/bookmark.css" data-n-g="">
+<a href="{{ .Get "url" }}" target="_blank" rel="noreferrer" class="">
+    <article class="flex justify-between h-40 rounded border border-gray-400 border-solid">
+        <div class="flex flex-col justify-between p-5  hover:bg-gray-100 w-3/5">
+            <h3 class="text-2xl truncate">{{ .Get "title" }} </h3>
+            <p class="overflow-hidden h-12 text-base text-gray-500">
+                {{ .Get "des" }}
+            </p>
+            <div class="flex items-center">
+                <img src="{{ .Get "icon" }}" class="h-6" alt="">
+                <p class="text-base truncate ml-2">
+                    {{ .Get "url" }}
+                </p>
+            </div>
+        </div>
+        <div class="w-2/5 h-full rounded">
+            <img src="{{ .Get "image" }}" class="object-cover w-full h-full" alt="">
+        </div>
+    </article>
+</a>