pietroppeter · pietroppeter · Jun 4, 2021 · Jun 1, 2021 · Jun 1, 2021 · Jun 1, 2021
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,2 @@
-!docs/.gitignore
-!docs/css
-!docs/FontAwesome
-!docs/fonts
-!docs/js
 docs/
-book/book.json
+book/book.json
diff --git a/book/document.mustache b/book/document.mustache
@@ -22,29 +22,29 @@
 
         {{&favicon_escaped}}
         {{#favicon_svg}}
-        <link rel="icon" href="{{ path_to_root }}favicon.svg">
+        <link rel="icon" href="{{ path_to_root }}assets/favicon.svg">
         {{/favicon_svg}}
         {{#favicon_png}}
-        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
+        <link rel="shortcut icon" href="{{ path_to_root }}assets/favicon.png">
         {{/favicon_png}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/variables.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/general.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/chrome.css">
         {{#print_enable}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/print.css" media="print">
         {{/print_enable}}
 
         <!-- Fonts -->
-        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.min.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/FontAwesome/css/font-awesome.min.css">
         {{#copy_fonts}}
-        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/fonts/fonts.css">
         {{/copy_fonts}}
 
         <!-- Highlight.js Stylesheets - I could use nimib native highlight but let's keep it for styling... -->
-        <link rel="stylesheet" href="{{ path_to_root }}css/highlight.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/tomorrow-night.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/ayu-highlight.css">
-        
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/highlight.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/tomorrow-night.css">
+        <link rel="stylesheet" href="{{ path_to_root }}assets/css/ayu-highlight.css">
+
         <!-- Custom theme stylesheets - why the "../"? -->
         {{#additional_css}}
         <link rel="stylesheet" href="../{{ path_to_root }}{{ . }}">
@@ -58,7 +58,7 @@
     <body>
         <!-- Provide site root to javascript -->
         <script type="text/javascript">
-            var path_to_root = "{{ path_to_root }}";
+            var path_to_root = "{{ path_to_root }}/assets";
             var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
         </script>
 
@@ -311,4 +311,4 @@
         {{/is_print}}
 
     </body>
-</html>
+</html>
diff --git a/book/index.nim b/book/index.nim
@@ -10,4 +10,4 @@ proc readFileUntil(filename: string, text: string): string =
     result &= line & '\n'
 
 nbText: "../README.md".readFileUntil("<!--SKIP")
-nbSave
+nbSave
diff --git a/genbook.nim b/genbook.nim
@@ -1,5 +1,7 @@
 import nimibook, os # os is used inside Toc DSL
 
+initBook
+
 var book = newBookFromToc("nimibook", "book"):
   section("Introduction", "index"): # .nim extension is optional
     entry("Content", "content")
@@ -13,4 +15,4 @@ var book = newBookFromToc("nimibook", "book"):
     draft("Draft chapter", "draft.md")
 
 book.git_repository_url = "https://github.com/pietroppeter/nimibook"
-nbBookTasks
+nbBookTasks
diff --git a/nimibook.nimble b/nimibook.nimble
@@ -14,27 +14,32 @@ requires "nimib >= 0.1.2"
 requires "jsony >= 1.0.1"
 
 import os
+
 task genbook, "build book":
   selfExec(" r -d:release genbook.nim")
 
 task dumpbook, "dump book.json":
   selfExec(" r -d:release -d:dumpBook genbook.nim")
 
 task cleanbook, "remove all files created during build":
+  # Since assets now gets populated, I think we can just delete everything in docs
+  rmDir("docs")
+  mkDir("docs")
+
   # todo: it should remove all files and directories not tracked in git from docs
-  for file in walkDirRec("docs"):
-    if file.endsWith(".html"):
-      rmFile(file)
-      echo "removed ", file
-  for file in ["book/book.json"]: # hardcoded files to remove (one for now)
-    if fileExists(file):
-      rmFile(file)
-      echo "removed ", file
-  # if by mistake I create html in book folder, remove them
-  for file in walkDirRec("book"):
-    if file.endsWith(".html"):
-      rmFile(file)
-      echo "removed ", file
+  # for file in walkDirRec("docs"):
+  #   if file.endsWith(".html"):
+  #     rmFile(file)
+  #     echo "removed ", file
+  # for file in ["book/book.json"]: # hardcoded files to remove (one for now)
+  #   if fileExists(file):
+  #     rmFile(file)
+  #     echo "removed ", file
+  # # if by mistake I create html in book folder, remove them
+  # for file in walkDirRec("book"):
+  #   if file.endsWith(".html"):
+  #     rmFile(file)
+  #     echo "removed ", file
 
 
 task srcpretty, "run nimpretty on nim files in src folder":

diff --git a/docs/FontAwesome/css/font-awesome.min.css → ...sets/FontAwesome/css/font-awesome.min.css b/docs/FontAwesome/css/font-awesome.min.css → ...sets/FontAwesome/css/font-awesome.min.css
diff --git a/docs/FontAwesome/fonts/FontAwesome.otf → .../assets/FontAwesome/fonts/FontAwesome.otf b/docs/FontAwesome/fonts/FontAwesome.otf → .../assets/FontAwesome/fonts/FontAwesome.otf
diff --git a/...FontAwesome/fonts/fontawesome-webfont.eot → ...FontAwesome/fonts/fontawesome-webfont.eot b/...FontAwesome/fonts/fontawesome-webfont.eot → ...FontAwesome/fonts/fontawesome-webfont.eot
diff --git a/...FontAwesome/fonts/fontawesome-webfont.svg → ...FontAwesome/fonts/fontawesome-webfont.svg b/...FontAwesome/fonts/fontawesome-webfont.svg → ...FontAwesome/fonts/fontawesome-webfont.svg
diff --git a/...FontAwesome/fonts/fontawesome-webfont.ttf → ...FontAwesome/fonts/fontawesome-webfont.ttf b/...FontAwesome/fonts/fontawesome-webfont.ttf → ...FontAwesome/fonts/fontawesome-webfont.ttf
diff --git a/...ontAwesome/fonts/fontawesome-webfont.woff → ...ontAwesome/fonts/fontawesome-webfont.woff b/...ontAwesome/fonts/fontawesome-webfont.woff → ...ontAwesome/fonts/fontawesome-webfont.woff
diff --git a/...ntAwesome/fonts/fontawesome-webfont.woff2 → ...ntAwesome/fonts/fontawesome-webfont.woff2 b/...ntAwesome/fonts/fontawesome-webfont.woff2 → ...ntAwesome/fonts/fontawesome-webfont.woff2
diff --git a/docs/css/ayu-highlight.css → src/nimibook/assets/css/ayu-highlight.css b/docs/css/ayu-highlight.css → src/nimibook/assets/css/ayu-highlight.css
diff --git a/docs/css/chrome.css → src/nimibook/assets/css/chrome.css b/docs/css/chrome.css → src/nimibook/assets/css/chrome.css
diff --git a/docs/css/general.css → src/nimibook/assets/css/general.css b/docs/css/general.css → src/nimibook/assets/css/general.css
diff --git a/docs/css/highlight.css → src/nimibook/assets/css/highlight.css b/docs/css/highlight.css → src/nimibook/assets/css/highlight.css
diff --git a/docs/css/print.css → src/nimibook/assets/css/print.css b/docs/css/print.css → src/nimibook/assets/css/print.css
diff --git a/docs/css/tomorrow-night.css → src/nimibook/assets/css/tomorrow-night.css b/docs/css/tomorrow-night.css → src/nimibook/assets/css/tomorrow-night.css
diff --git a/docs/css/variables.css → src/nimibook/assets/css/variables.css b/docs/css/variables.css → src/nimibook/assets/css/variables.css
diff --git a/docs/fonts/OPEN-SANS-LICENSE.txt → ...mibook/assets/fonts/OPEN-SANS-LICENSE.txt b/docs/fonts/OPEN-SANS-LICENSE.txt → ...mibook/assets/fonts/OPEN-SANS-LICENSE.txt
diff --git a/docs/fonts/SOURCE-CODE-PRO-LICENSE.txt → .../assets/fonts/SOURCE-CODE-PRO-LICENSE.txt b/docs/fonts/SOURCE-CODE-PRO-LICENSE.txt → .../assets/fonts/SOURCE-CODE-PRO-LICENSE.txt
diff --git a/docs/fonts/fonts.css → src/nimibook/assets/fonts/fonts.css b/docs/fonts/fonts.css → src/nimibook/assets/fonts/fonts.css
diff --git a/docs/fonts/mod.rs → src/nimibook/assets/fonts/mod.rs b/docs/fonts/mod.rs → src/nimibook/assets/fonts/mod.rs
diff --git a/...onts/open-sans-v17-all-charsets-300.woff2 → ...onts/open-sans-v17-all-charsets-300.woff2 b/...onts/open-sans-v17-all-charsets-300.woff2 → ...onts/open-sans-v17-all-charsets-300.woff2
diff --git a/...pen-sans-v17-all-charsets-300italic.woff2 → ...pen-sans-v17-all-charsets-300italic.woff2 b/...pen-sans-v17-all-charsets-300italic.woff2 → ...pen-sans-v17-all-charsets-300italic.woff2
diff --git a/...onts/open-sans-v17-all-charsets-600.woff2 → ...onts/open-sans-v17-all-charsets-600.woff2 b/...onts/open-sans-v17-all-charsets-600.woff2 → ...onts/open-sans-v17-all-charsets-600.woff2
diff --git a/...pen-sans-v17-all-charsets-600italic.woff2 → ...pen-sans-v17-all-charsets-600italic.woff2 b/...pen-sans-v17-all-charsets-600italic.woff2 → ...pen-sans-v17-all-charsets-600italic.woff2
diff --git a/...onts/open-sans-v17-all-charsets-700.woff2 → ...onts/open-sans-v17-all-charsets-700.woff2 b/...onts/open-sans-v17-all-charsets-700.woff2 → ...onts/open-sans-v17-all-charsets-700.woff2
diff --git a/...pen-sans-v17-all-charsets-700italic.woff2 → ...pen-sans-v17-all-charsets-700italic.woff2 b/...pen-sans-v17-all-charsets-700italic.woff2 → ...pen-sans-v17-all-charsets-700italic.woff2
diff --git a/...onts/open-sans-v17-all-charsets-800.woff2 → ...onts/open-sans-v17-all-charsets-800.woff2 b/...onts/open-sans-v17-all-charsets-800.woff2 → ...onts/open-sans-v17-all-charsets-800.woff2
diff --git a/...pen-sans-v17-all-charsets-800italic.woff2 → ...pen-sans-v17-all-charsets-800italic.woff2 b/...pen-sans-v17-all-charsets-800italic.woff2 → ...pen-sans-v17-all-charsets-800italic.woff2
diff --git a/...s/open-sans-v17-all-charsets-italic.woff2 → ...s/open-sans-v17-all-charsets-italic.woff2 b/...s/open-sans-v17-all-charsets-italic.woff2 → ...s/open-sans-v17-all-charsets-italic.woff2
diff --git a/.../open-sans-v17-all-charsets-regular.woff2 → .../open-sans-v17-all-charsets-regular.woff2 b/.../open-sans-v17-all-charsets-regular.woff2 → .../open-sans-v17-all-charsets-regular.woff2
diff --git a/...ource-code-pro-v11-all-charsets-500.woff2 → ...ource-code-pro-v11-all-charsets-500.woff2 b/...ource-code-pro-v11-all-charsets-500.woff2 → ...ource-code-pro-v11-all-charsets-500.woff2
diff --git a/docs/js/book.js → src/nimibook/assets/js/book.js b/docs/js/book.js → src/nimibook/assets/js/book.js
diff --git a/docs/js/clipboard.min.js → src/nimibook/assets/js/clipboard.min.js b/docs/js/clipboard.min.js → src/nimibook/assets/js/clipboard.min.js
diff --git a/docs/js/highlight.js → src/nimibook/assets/js/highlight.js b/docs/js/highlight.js → src/nimibook/assets/js/highlight.js
diff --git a/src/nimibook/books.nim b/src/nimibook/books.nim
@@ -1,5 +1,5 @@
 import std / os
-import nimibook /  [types, entries]
+import nimibook / [types, entries]
 import jsony
 
 # fix for jsony: quote in string. https://github.com/treeform/jsony/issues/14

diff --git a/src/nimibook/defaults.nim b/src/nimibook/defaults.nim
@@ -7,4 +7,4 @@ proc setDefaults*(book: var Book) =
   book.preferred_dark_theme = "navy"
   book.theme_option = {"light": "Light (default)", "rust": "Rust", "coal": "Coal", "navy": "Navy", "ayu": "Ayu"}.toTable
   book.favicon_escaped = """<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2280%22>🐳</text></svg>">"""
-  book.git_repository_icon = "fa-github"
+  book.git_repository_icon = "fa-github"
diff --git a/src/nimibook/docs.nim b/src/nimibook/docs.nim
@@ -20,17 +20,14 @@ proc useNimibook*(nbDoc: var NbDoc) =
   # debugEcho "Current directory: ", getCurrentDir()
   # debugEcho "Output file: ", nbDoc.filename
 
-
   # templates are in nbSrcDir
   nbDoc.templateDirs = @[nbSrcDir.string]
   nbDoc.context["title"] = nbDoc.context["here_path"]
 
   # load book object
+  var book : Book
   let bookPath = "../book/book.json"
-  if not bookPath.fileExists:
-    withDir("..".AbsoluteDir): # todo: add a withDir for RelativeDir in nimib /paths
-      discard execShellCmd("nimble dumpbook")
-  var book = load(bookPath)
+  book = load(bookPath)
 
   # book configuration
   nbDoc.context["language"] = book.language

diff --git a/src/nimibook/entries.nim b/src/nimibook/entries.nim
@@ -1,4 +1,4 @@
-import std / [os, strutils, strformat]
+import std / [os, strformat]
 import nimibook / types
 
 proc url*(e: Entry): string =

diff --git a/src/nimibook/publishers.nim b/src/nimibook/publishers.nim
@@ -5,7 +5,7 @@ import nimib
 proc nimPublish*(entry: Entry) =
   let
     cmd = "nim"
-    args = ["r", "-d:release", entry.path]
+    args = ["r", "-d:release", "-f", entry.path]
   debugEcho "[Executing] ", cmd, " ", args.join(" ")
   if execShellCmd(cmd & " " & args.join(" ")) != 0:
     quit(1)
@@ -29,8 +29,7 @@ proc publish*(entry: Entry) =
     raise newException(IOError, "Error invalid file extension.")
 
 proc publish*(book: Book) =
-  dump book
   for entry in book.toc.entries:
     entry.publish()
-  clean book
+  # clean book
   check book
diff --git a/src/nimibook/tocs.nim b/src/nimibook/tocs.nim
@@ -1,4 +1,4 @@
-import std / [os, strformat]
+import std / [os, strformat, macros]
 import nimibook / [types, defaults, paths]
 
 proc inc(levels: var seq[int]) =
@@ -11,15 +11,24 @@ proc add(toc: var Toc, entry: Entry) =
     raise newException(IOError, fmt"Error entry {fullpath} doesn't exist.")
   toc.entries.add entry
 
+template initBook*() =
+  let
+    src = currentSourcePath().parentDir() / "assets"
+    target = getProjectPath() / "docs" / "assets"
+  # debugEcho "==> copyDir(", src, ", ", target, ")"
+  if dirExists(target):
+    removeDir(target)
+  createDir(target)
+  copyDir(src, target)
+
 template newBookFromToc*(booklabel: string, rootfolder: string, body: untyped): Book =
   var book = Book(book_title: booklabel)
   book.setDefaults
-
   var toc = Toc(path: rootfolder)
   var levels: seq[int] = @[1]
   var folders: seq[string] = @[rootfolder]
 
-  template entry(label, rfile: string, numbered=true) =
+  template entry(label, rfile: string, numbered = true) =
     # debugEcho "==> entry <=="
     # debugEcho "    file>", rfile
     let inputs = rfile.splitFile
@@ -30,7 +39,7 @@ template newBookFromToc*(booklabel: string, rootfolder: string, body: untyped):
     if numbered:
       inc levels
 
-  template draft(label, rfile: string) = entry(label, rfile, numbered=false)
+  template draft(label, rfile: string) = entry(label, rfile, numbered = false)
 
   template section(label, rfile: string, sectionBody: untyped) =
     let inputs = rfile.splitFile
@@ -49,4 +58,6 @@ template newBookFromToc*(booklabel: string, rootfolder: string, body: untyped):
 
   body
   book.toc = toc
-  book
+  # Dump json here so we avoid having to use Nimble in use Nimibook
+  dump(book)
+  book
diff --git a/src/nimibook/types.nim b/src/nimibook/types.nim
@@ -1,4 +1,4 @@
-import tables
+import std / tables
 export tables
 
 type
@@ -22,7 +22,7 @@ type
     #
     # required fields (in the sense the mustache template will work bad if they are not present):
     book_title*: string ## Title of the book as specified in `newBookFromToc`
-    # chapter_title: not needed? 
+    # chapter_title: not needed?
     title*: string # title of the page (what appears in browser tab); default in mdbook is "<chapter_title> - <book_title>" where chapter_title comes from toc
     language*: string ## The main language of the book, which is used as a language attribute `<html lang="en">` for example (defaults to en)
     description*: string ## A description for the book, which is added as meta information in the html <head> of each page
@@ -76,4 +76,4 @@ list of assets required as mentioned directly in document.mustache (other assets
 - highlight.js
 - book.js
 
-]# 
+]#