7 files changed, 173 insertions, 40 deletions

@@ -1,3 +1,5 @@
 wikme
 *.so
 *.o
+*.import.scm
+out/
@@ -1,20 +1,28 @@
 # wikme
 
 PREFIX = /usr/bin
-CSC = csc -I$(PWD)
+CSC = csc -R r7rs
 
-OBJ = wikme.scm.o
+NAME = wikme
+PROG = $(NAME).scm
+SOURCE = $(NAME).ss
+LIB = $(NAME).sld
+OBJ = $(NAME)-lib.o
 
-wikme: main.scm $(OBJ)
-        $(CSC) -o $@ $(OBJ) -uses wikme main.scm
+$(NAME): $(PROG) $(OBJ)
+        $(CSC) -o $@ $(OBJ) -uses $(NAME) $(PROG)
 
-$(OBJ): wikme.scm wikme-impl.scm
-        $(CSC) -c -J wikme.scm -unit wikme -o $@
+$(OBJ): $(LIB)
+        $(CSC) -c -J $(LIB) -unit $(NAME) -o $@
 
-.PHONY: install clean
+$(LIB): $(SOURCE)
 
-install: wikme
-        install -Dt $(DESTDIR)$(PREFIX)/$@ $<
+.PHONY: install test clean
+
+install: $(NAME)
+        install -Dt $(DESTDIR)$(PREFIX)/$@ $(NAME)
+
+test: # TODO
 
 clean:
         rm -f *.import.scm *.so *.o
@@ -1,8 +0,0 @@
-(import wikme
-        (chicken process-context))
-
-(define (main args)
-  (display (wikify-links "Hi from [[wikme]]!"))
-  (newline))
-
-(main (command-line-arguments))
@@ -0,0 +1,8 @@
+# Lions!! RAWWR :3
+
+Lions are great big [[cats]] that like to pounce and play on things, or something.
+They live on this thing called the [[grassland|savannah]] and eat [[birds]].
+
+I assume they eat other stuff too, but I don't know what, lol.
+
+[A link to a lion](https://lions.org).
@@ -1,4 +1,9 @@
-(module wikme *
-  (import scheme
-          (chicken base))
-  (include "wikme-impl.scm"))
+(import wikme
+        (scheme)
+        (chicken process-context))
+
+(define (main args)
+  (build-wiki "./test/"
+              destination: "./out/"))
+
+(main (command-line-arguments))
@@ -0,0 +1,79 @@
+#+chicken-5
+(import (r7rs))
+
+(define-library wikme
+  (import (scheme))
+  (cond-expand
+    (chicken-5 (import (chicken base)
+                       (chicken file)
+                       (chicken file posix)
+                       (chicken format)
+                       (chicken io)
+                       (chicken irregex)
+                       (chicken pathname)
+                       (chicken port)
+                       (chicken process)
+                       (chicken process-context)
+                       (chicken string)
+                       (chicken time posix)
+                       (cmark)
+                       (regex)          ; XXX: deprecated upstream
+                       (srfi-13)))
+    (else (error "Wikme doesn't support this R7RS scheme implementation yet.")))
+
+  ;; <wiki>
+  (export <wiki>
+          wiki-base-url
+          wiki-origin-dir
+          wiki-destination-dir
+          wiki-pages
+          wiki-defaults
+          wiki-default-ref
+          wiki-default-set!)
+
+  ;; <page>
+  (export <page>
+          page-source
+          page-body
+          page-origin
+          page-destination
+          page-template
+          page-source-transformers
+          page-path-transformers
+          page-wiki
+          page-meta
+          page-meta-ref
+          page-meta-set!)
+
+  ;; transformers
+  (export transform
+          transform-source!
+          transform-path!
+          page-cmark->html)
+
+  ;; templates
+  (export render-template
+          env->replacements
+          render)
+
+  ;; links
+  (export wiki-link-sre
+          wikify-links
+          linkify
+          slugify
+          string-capitalize
+          unslugify
+          path-relativize
+          wiki-page-origin-path
+          wiki-page-destination-path)
+
+  ;; page building
+  (export file->page
+          guess-title
+          basename
+          indexify
+          guess-last-updated
+          page->file
+          build-wiki)
+
+  (include "wikme.ss"))
@@ -1,20 +1,5 @@
 ;;; Wikme --- convert a directory of markdown files into a static wiki
 
-(import (chicken file)
-        (chicken file posix)
-        (chicken format)
-        (chicken io)
-        (chicken irregex)
-        (chicken pathname)
-        (chicken port)
-        (chicken process)
-        (chicken process-context)
-        (chicken string)
-        (chicken time posix)
-        (cmark)
-        (regex)                         ; XXX: deprecated upstream
-        (srfi-13))
-
 ;;; Records
 
 (define-record-type <wiki>
@@ -145,9 +130,11 @@
 
 (define wiki-link-sre
   ;;; An SRE for [[wiki-style links|with optional titles]].
+  ;; XXX
   '(: "[["
-      (submatch-named pname (+ (~ "|")))
-      (? (submatch "|" (submatch-named ptitle (*? nonl))))
+      (=> pname (*? (~ "|")))
+      (? ($ "|" (=> ptitle
+                    (*? (~ "]")))))
       "]]"))
 
 (define (wikify-links text #!optional page)
@@ -167,6 +154,7 @@
                                                  ""))
                                     ptitle)))))
 
+;;; TODO: merge linkify and indexify ... they're almost the same thing.
 (define (linkify pagename base-url)
   ;;; Turn a page name into a link suitable for an <a> tag.
   (make-pathname (list base-url (slugify pagename))
@@ -212,6 +200,18 @@
      (string-trim (string-drop path (string-prefix-length path dir))
                   (lambda (c) (char=? c #\/))))))
 
+(define (wiki-page-origin-path page #!optional wiki)
+  ;;; Return PAGE's origin path in WIKI.
+  (path-relativize (page-origin page)
+                   (wiki-origin-dir (or wiki
+                                        (page-wiki page)))))
+
+(define (wiki-page-destination-path page #!optional wiki)
+  ;;; Return PAGE's destination path in WIKI.
+  (path-relativize (page-destination page)
+                   (wiki-destination-dir (or wiki
+                                             (page-wiki page)))))
+
 ;;; Build a page
 
 (define (file->page file wiki
@@ -264,8 +264,7 @@
 (define (guess-last-updated page)
   ;;; Guess when PAGE was last edited.
   ;; Tries to use git, but falls back to mtime.
-  (let ((f (path-relativize (page-origin page)
-                            (wiki-origin-dir (page-wiki page)))))
+  (let ((f (wiki-page-origin-path page)))
     (time->string
      (seconds->local-time
       (or #;
@@ -288,3 +287,43 @@
       (lambda ()
         (write-string (render page))))))
 
+(define (eprintf . args)
+  (apply fprintf (current-error-port) args))
+
+(define (build-wiki origin
+                    #!key
+                    (destination (make-pathname origin "out"))
+                    (base-url "")
+                    (base-template (make-pathname origin "template.html"))
+                    (source-transformers (list page-cmark->html wikify-links))
+                    (path-transformers (list indexify))
+                    (source-extension "md"))
+  (define w (make-wiki
+             base-url
+             origin
+             destination
+             '()
+             `((template . ,base-template)
+               (source-transformers . ,source-transformers)
+               (path-transformers . ,path-transformers)
+               (source-extension . ,source-extension))))
+
+  (eprintf "\nBuilding pages...\n")
+  (for-each (lambda (f)
+              (let ((p (file->page f w)))
+                (eprintf "~a -> ~a\n" f (page-meta-ref p 'title))))
+            (glob (make-pathname origin
+                                 "*"
+                                 (wiki-default-ref w 'source-extension))))
+
+  (let ((dd (wiki-destination-dir w)))
+    (eprintf "\nCreating destination directory: ~a\n" dd)
+    (create-directory dd 'parents))
+
+  (eprintf "\nWriting pages...\n")
+  (for-each (lambda (p)
+              (eprintf "~a -> ~a\n"
+                       (page-meta-ref p 'title)
+                       (wiki-page-destination-path p))
+              (page->file p))
+            (wiki-pages w)))