try again to get per-year redirects right

Author: mflatt

annual-utils.rkt

@@ -36,17 +36,27 @@
 
 
 
-(define (copy-annual-site! site starting-dir year #:current [current? #f])
+(define (copy-annual-site! site starting-dir year
+                           #:current [current? #f]
+                           #:copy-current-index? [copy-current-index? #t])
   (for* ([p (in-directory starting-dir)]
          [fn (in-value (filename p))]
          [ext (in-list '(#".html" #".css" #".svg" #".png" #".jpg"))]
          #:unless (or (not (path-has-extension? fn ext))
                       (excluded-path? fn)
-                      (and current? (equal? fn (string->path "index.html")))))
-        (copyfile #:site site (build-path starting-dir fn)
-                  (string-join (map ~a (append
-                                        (if current? null (list year))
-                                        (list fn))) "/")))
+                      (and current?
+                           (not copy-current-index?)
+                           (equal? fn (string->path "index.html")))))
+    (define (copy current?)
+      (copyfile #:site site (build-path starting-dir fn)
+                (string-join (map ~a (append
+                                      (if current? null (list year))
+                                      (list fn))) "/")))
+    (copy current?)
+    (when (and current?
+               copy-current-index?
+               (equal? fn (string->path "index.html")))
+      (copy #f)))
 
   (define (copy-subdir-if-extant subdir-name)
     (define subdir (build-path starting-dir subdir-name))
@@ -59,4 +69,4 @@
                                (list subdir-name (filename p)))) "/")))))
 
   (copy-subdir-if-extant "fonts")
-  (copy-subdir-if-extant "slides"))
+  (copy-subdir-if-extant "slides"))

rcon/all.rkt

@@ -12,8 +12,6 @@
          (prefix-in 2013: "2013/all.rkt")
          (prefix-in 2014: "2014/all.rkt"))
 
-(provide index)
-
 (register-identity con-site)
 
 (define-syntax-rule (copy-con-site! ARG ...)
@@ -64,10 +62,20 @@
 (require (prefix-in 2023: "2023/index.rkt"))
 (define-runtime-path 2023-dir "2023")
 (2023:make 2023-dir)
-(copy-con-site! 2023-dir 2023) ; note: don't set `#:current #t`, because we copy below to have it in both places
+(copy-con-site! 2023-dir 2023 #:current #t) ; change to `#:current` needs change in "sync.rkt"
+
+;; A `#:current #t` above causes that year's content to be copied to
+;; the root directory instead of the year's subdiredtory, except that
+;; "index.html" is by itself created in the subdirectory. A
+;; routing-rule redirect in "../sync.rkt" will send all references
+;; into the subdirectory. A "index.html" file is written in the
+;; subdirectory, anyway, because that is needed for a URL ending in
+;; the directory and NO slash to be redirected to "index.html", which
+;; is then redirected to the root directory.
 
 ;; This is a bad idea, because it creates a 301 (permanent)
-;; redirect:
+;; redirect; instead, there's a routing rule added in "../sync.rkt"
+;; to create a 302 (temporary) redirect:
 #|
    ;; On web server, redirect 2023/index.html to root index.html
    ;; (these refer to remote paths)
@@ -76,12 +84,15 @@
              "../index.html"
              "2023/index.html"))
 |#
-;; Instead, there's a routing rule added in "sync.rkt"
 
+;; Don't do this, either, because it doesn't work right with
+;; extra files referenced relative to "index.html"
+#|
 (define-runtime-path current-con-index "2023/index.html")
 (define index
   (page* #:site con-site
          #:link-title "RacketCon" #:title "RacketCon"
          #:extra-headers style-header
          #:id 'con
          @copyfile[#:site con-site current-con-index]))
+|#

school/all.rkt

@@ -22,13 +22,18 @@
 ;; 2019 
 (define-runtime-path 2019-dir "2019")
 (pollen-rebuild! 2019-dir)
-(copy-school-site! 2019-dir 2019 #:current #f)
+(copy-school-site! 2019-dir 2019)
 
 ;; 2020
 (define-runtime-path 2020-dir "2020")
 (scribble-page (build-path 2020-dir "index.scrbl") 2020-dir)
-(copy-school-site! 2020-dir 2020 #:current #t)
+(copy-school-site! 2020-dir 2020 #:current #t) ; change to `#:current` needs change in "sync.rkt"
 
+;; The rest of this is the wrong idea. See "../rcon/all.rkt".
+;; The current year's directory is redirected through a routing
+;; rule in "../sync.rkt".
+
+#|
 ;; On web server, redirect 2020/index.html to root index.html
 ;; (these refer to remote paths)
 (void
@@ -43,3 +48,4 @@
          #:link-title "Racket School" #:title "Racket School"
          #:id 'school
          @copyfile[#:site school-site current-school-index]))
+|#

sync.rkt

@@ -130,9 +130,17 @@
 (unless dry-run?
   ;; Redirect current year's "index.html" to the root "index.html":
   (add-routing-rules "con.racket-lang.org"
+                     #:preserve-existing? #f ; so redirect for old year is dropped
                      (list
-                      (redirect-prefix-routing-rule #:old-prefix "2023/index.html"
-                                                    #:new-prefix "index.html"
+                      (redirect-prefix-routing-rule #:old-prefix "2023/"
+                                                    #:new-prefix ""
+                                                    #:redirect-code "302"))
+                     #:log-info displayln)
+  (add-routing-rules "school.racket-lang.org"
+                     #:preserve-existing? #f ; so redirect for old year is dropped
+                     (list
+                      (redirect-prefix-routing-rule #:old-prefix "2020/"
+                                                    #:new-prefix ""
                                                     #:redirect-code "302"))
                      #:log-info displayln))