Factor render-index out of render-indices.

src/coleslaw.lisp

@@ -56,6 +56,7 @@ Additional args to render CONTENT can be passed via RENDER-ARGS."
         (run-program "cp -R ~a ." dir)))
     (do-ctypes (publish (make-keyword ctype)))
     (render-indices)
+    (update-symlink "index.html" "1.html")
     (render-feeds (feeds *config*))))
 
 (defgeneric deploy (staging)

src/indices.lisp

@@ -5,14 +5,6 @@
    (posts :initform nil :initarg :posts :accessor index-posts)
    (title :initform nil :initarg :title :accessor index-title)))
 
-(defmethod render ((object index) &key prev next)
-  (funcall (theme-fn 'index) (list :tags (all-tags)
-                                   :months (all-months)
-                                   :config *config*
-                                   :index object
-                                   :prev prev
-                                   :next next)))
-
 (defclass tag-index (index) ())
 (defclass date-index (index) ())
 (defclass int-index (index) ())
@@ -26,6 +18,14 @@
 (defmethod page-url ((object int-index))
   (format nil "~d" (index-id object)))
 
+(defmethod render ((object index) &key prev next)
+  (funcall (theme-fn 'index) (list :tags (all-tags)
+                                   :months (all-months)
+                                   :config *config*
+                                   :index object
+                                   :prev prev
+                                   :next next)))
+
 (defun all-months ()
   "Retrieve a list of all months with published content."
   (let ((months (mapcar (lambda (x) (subseq (content-date x) 0 7))
@@ -58,20 +58,19 @@
                               :posts (subseq content start end)
                               :title "Recent Posts")))
 
+(defun render-index (index &rest render-args)
+  "Render the given INDEX using RENDER-ARGS if provided."
+  (write-page (page-path index) (apply #'render-page index nil render-args)))
+
 (defun render-indices ()
   "Render the indices to view content in groups of size N, by month, and by tag."
   (let ((results (by-date (hash-table-values *content*))))
     (dolist (tag (all-tags))
-      (let ((index (index-by-tag tag results)))
-        (write-page (page-path index) (render-page index))))
+      (render-index (index-by-tag tag results)))
     (dolist (month (all-months))
-      (let ((index (index-by-month month results)))
-        (write-page (page-path index) (render-page index))))
+      (render-index (index-by-month month results)))
     (dotimes (i (ceiling (length results) 10))
-      (let ((index (index-by-n i results)))
-        (write-page (page-path index)
-                    (render-page index nil
-                                 :prev (and (plusp i) i)
-                                 :next (and (< (* (1+ i) 10) (length results))
-                                            (+ 2 i)))))))
-  (update-symlink "index.html" "1.html"))
+      (render-index (index-by-n i results)
+                    :prev (and (plusp i) i)
+                    :next (and (< (* (1+ i) 10) (length results))
+                               (+ 2 i))))))