Clean up the protocol between the builder and the page renderer

Author: lexi-lambda

blog/build.rkt

@@ -8,23 +8,15 @@
          racket/match
          racket/path
          racket/promise
-         racket/runtime-path
          racket/sequence
-         (only-in megaparsack parse-result!)
-         (only-in megaparsack/text parse-string)
-         (only-in scribble/base title)
          scribble/base-render
-         (only-in scribble/core document-date style)
          scribble/xref
          setup/xref
          threading
          (only-in xml write-xexpr)
 
-         (only-in "markdown/parse.rkt" document/p)
          "markdown/post.rkt"
-         "markdown/to-scribble.rkt"
          "paths.rkt"
-         "lang/metadata.rkt"
          "build/metadata.rkt"
          "build/render/scribble.rkt"
          "build/render/page.rkt")
@@ -143,28 +135,22 @@
                           out-path
                           (λ~>> (write-html (post-page info)))))
 
-(define (build-post-index total-pages number deps+infos)
+(define (build-post-index total-pages number posts)
   (define base-path (index-path number #:file? #t))
   (define out-path (reroot-path base-path output-dir))
   (eprintf "~a rendering <output>~a\n" (timestamp-string) base-path)
-  (define paths+infos (for/list ([dep+info (in-list deps+infos)])
-                        (match-define (list dep info) dep+info)
-                        (list (output-path->absolute-url (post-dep-page-path dep)) info)))
   (call-with-output-file* #:exists 'truncate/replace
                           out-path
-                          (λ~>> (write-html (post-index-page total-pages number paths+infos)))))
+                          (λ~>> (write-html (post-index-page total-pages number posts)))))
 
-(define (build-tag-index total-pages page-number tag deps+infos)
+(define (build-tag-index total-pages page-number tag posts)
   (define base-path (tag-index-path tag page-number))
   (define out-path (reroot-path base-path output-dir))
   (eprintf "~a rendering <output>~a\n" (timestamp-string) base-path)
-  (define paths+infos (for/list ([dep+info (in-list deps+infos)])
-                        (match-define (list dep info) dep+info)
-                        (list (output-path->absolute-url (post-dep-page-path dep)) info)))
   (make-parent-directory* out-path)
   (call-with-output-file* #:exists 'truncate/replace
                           out-path
-                          (λ~>> (write-html (tag-index-page total-pages page-number tag paths+infos)))))
+                          (λ~>> (write-html (tag-index-page total-pages page-number tag posts)))))
 
 (define (build-all)
   (make-directory* build-dir)
@@ -176,23 +162,21 @@
       info))
 
   (define total-pages (ceiling (/ (length all-post-deps) num-posts-per-page)))
-  (for ([deps+infos (in-slice num-posts-per-page (reverse (map list all-post-deps post-infos)))]
+  (for ([posts (in-slice num-posts-per-page (reverse post-infos))]
         [number (in-naturals 1)])
-    (build-post-index total-pages number deps+infos))
-
-  (define tagged-deps+infos
-    (for/fold ([tagged-deps+infos (hash)])
-              ([dep (in-list all-post-deps)]
-               [info (in-list post-infos)]
-               #:when #t
-               [tag (in-list (rendered-post-tags info))])
-      (hash-update tagged-deps+infos tag (λ~>> (cons (list dep info))) '())))
-
-  (for ([(tag deps+infos) (in-immutable-hash tagged-deps+infos)])
-    (define total-pages (ceiling (/ (length deps+infos) num-posts-per-page)))
-    (for ([deps+infos (in-slice num-posts-per-page deps+infos)]
+    (build-post-index total-pages number posts))
+
+  (define tagged-posts
+    (for*/fold ([tagged-deps+infos (hash)])
+               ([post (in-list post-infos)]
+                [tag (in-list (rendered-post-tags post))])
+      (hash-update tagged-deps+infos tag (λ~>> (cons post)) '())))
+
+  (for ([(tag posts) (in-immutable-hash tagged-posts)])
+    (define total-pages (ceiling (/ (length posts) num-posts-per-page)))
+    (for ([posts (in-slice num-posts-per-page posts)]
           [page-number (in-naturals 1)])
-      (build-tag-index total-pages page-number tag deps+infos))))
+      (build-tag-index total-pages page-number tag posts))))
 
 (parameterize ([current-directory "/home/alexis/code/blog2"])
   (build-all))

blog/build/render/page.rkt

@@ -17,12 +17,12 @@
           [post-page (-> rendered-post? xexpr?)]
           [post-index-page (->i ([total-pages (and/c exact-integer? (>=/c 1))]
                                  [page-number (total-pages) (and/c exact-integer? (>=/c 1) (<=/c total-pages))]
-                                 [paths+infos (listof (list/c string? rendered-post?))])
+                                 [posts (listof rendered-post?)])
                                 [result xexpr?])]
           [tag-index-page (->i ([total-pages (and/c exact-integer? (>=/c 1))]
                                 [page-number (total-pages) (and/c exact-integer? (>=/c 1) (<=/c total-pages))]
                                 [tag string?]
-                                [paths+infos (listof (list/c string? rendered-post?))])
+                                [posts (listof rendered-post?)])
                                [result xexpr?])]))
 
 (define (page #:title title #:body body)
@@ -64,18 +64,18 @@
                     ,(build-post-header title date tags)
                     ,@body))))
 
-(define (post-index-page total-pages page-number paths+infos)
+(define (post-index-page total-pages page-number posts)
   (page #:title "Alexis King’s Blog"
         #:body `(div ([class "content"])
-                  ,@(build-post-index index-path total-pages page-number paths+infos))))
+                  ,@(build-post-index index-path total-pages page-number posts))))
 
-(define (tag-index-page total-pages page-number tag paths+infos)
+(define (tag-index-page total-pages page-number tag posts)
   (page #:title (~a "Posts tagged ‘" tag "’")
         #:body `(div ([class "content"])
                      (h1 ([class "tag-page-header"])
                          "Posts tagged " (em ,tag))
                      ,@(build-post-index (λ~>> (tag-index-path tag))
-                                         total-pages page-number paths+infos))))
+                                         total-pages page-number posts))))
 
 (define (build-post-header title date tags)
   (define date-str (post-date->string date))
@@ -88,10 +88,9 @@
                `(a ([href ,(tag-index-path tag)]) ,tag))
              (add-between ", ")))))
 
-(define (build-post-index page-path total-pages page-number paths+infos)
-  `[,@(for/list ([path+info (in-list paths+infos)])
-        (match-define (list path info) path+info)
-        (build-post-index-entry path info))
+(define (build-post-index page-path total-pages page-number posts)
+  `[,@(for/list ([post (in-list posts)])
+        (build-post-index-entry post))
     (ul ([class "pagination"])
       ,(if (= page-number 1)
            '(li ([class "disabled"]) "←")
@@ -105,8 +104,9 @@
            '(li ([class "disabled"]) "→")
            `(li (a ([href ,(page-path (add1 page-number))]) "→"))))])
 
-(define (build-post-index-entry path info)
-  (match-define (rendered-post _ title date tags body) info)
+(define (build-post-index-entry post)
+  (match-define (rendered-post _ title date tags body) post)
+  (define path (rendered-post-path post))
   `(article ([class "inline"])
      ,(build-post-header `[(a ([href ,path]) ,@title)] date tags)
      ; only render up to the start of the first section

blog/build/serve.rkt

@@ -1,7 +1,6 @@
 #lang racket/base
 
-(require racket/runtime-path
-         web-server/http/empty
+(require web-server/http/empty
          web-server/servlet-env
          "../paths.rkt")