forked from cadence/breezewiki
Refactor let
to define
where applicable
Racke style guide: https://docs.racket-lang.org/style/Choosing_the_Right_Construct.html#%28part._.Definitions%29
This commit is contained in:
parent
301636d597
commit
a5079b5a57
5 changed files with 82 additions and 77 deletions
|
@ -24,26 +24,28 @@
|
||||||
(make-hasheq
|
(make-hasheq
|
||||||
(append
|
(append
|
||||||
default-config
|
default-config
|
||||||
(with-handlers ([exn:fail:filesystem:errno?
|
(with-handlers
|
||||||
(λ (exn)
|
([exn:fail:filesystem:errno?
|
||||||
(begin0
|
(λ (exn)
|
||||||
'()
|
(begin0
|
||||||
(displayln "note: config file not detected, using defaults")))]
|
'()
|
||||||
[exn:fail:contract?
|
(displayln "note: config file not detected, using defaults")))]
|
||||||
(λ (exn)
|
[exn:fail:contract?
|
||||||
(begin0
|
(λ (exn)
|
||||||
'()
|
(begin0
|
||||||
(displayln "note: config file empty or missing [] section, using defaults")))])
|
'()
|
||||||
(let ([l (hash->list
|
(displayln "note: config file empty or missing [] section, using defaults")))])
|
||||||
(hash-ref
|
(define l
|
||||||
(ini->hash
|
(hash->list
|
||||||
(call-with-input-file path-config
|
(hash-ref
|
||||||
(λ (in)
|
(ini->hash
|
||||||
(read-ini in))))
|
(call-with-input-file path-config
|
||||||
'||))])
|
(λ (in)
|
||||||
(begin0
|
(read-ini in))))
|
||||||
l
|
'||)))
|
||||||
(printf "note: ~a items loaded from config file~n" (length l))))))))
|
(begin0
|
||||||
|
l
|
||||||
|
(printf "note: ~a items loaded from config file~n" (length l)))))))
|
||||||
|
|
||||||
(when (config-true? 'debug)
|
(when (config-true? 'debug)
|
||||||
(printf "config: ~v~n" config))
|
(printf "config: ~v~n" config))
|
||||||
|
|
|
@ -33,11 +33,11 @@
|
||||||
(ul (@ (class "my-category-list"))
|
(ul (@ (class "my-category-list"))
|
||||||
,@(map
|
,@(map
|
||||||
(λ (result)
|
(λ (result)
|
||||||
(let* ([title (jp "/title" result)]
|
(define title (jp "/title" result))
|
||||||
[page-path (regexp-replace* #rx" " title "_")])
|
(define page-path (regexp-replace* #rx" " title "_"))
|
||||||
`(li
|
`(li
|
||||||
(a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
|
(a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
|
||||||
,title))))
|
,title)))
|
||||||
members)))))
|
members)))))
|
||||||
|
|
||||||
(define (page-category req)
|
(define (page-category req)
|
||||||
|
|
|
@ -42,7 +42,8 @@
|
||||||
(div (@ (class "collapsible-content"))
|
(div (@ (class "collapsible-content"))
|
||||||
(p "Another page link: "
|
(p "Another page link: "
|
||||||
(a (@ (data-test-wikilink) (href "https://test.fandom.com/wiki/Another_Page") (title "Another Page"))
|
(a (@ (data-test-wikilink) (href "https://test.fandom.com/wiki/Another_Page") (title "Another Page"))
|
||||||
"Another Page"))))))))
|
"Another Page"))))
|
||||||
|
(iframe (@ (src "https://example.com/iframe-src")))))))
|
||||||
|
|
||||||
(define (preprocess-html-wiki html)
|
(define (preprocess-html-wiki html)
|
||||||
(define (rr* find replace contents)
|
(define (rr* find replace contents)
|
||||||
|
@ -95,10 +96,10 @@
|
||||||
return-no-element]
|
return-no-element]
|
||||||
; display a link instead of an iframe
|
; display a link instead of an iframe
|
||||||
[(eq? element-type 'iframe)
|
[(eq? element-type 'iframe)
|
||||||
(let ([src (car (dict-ref attributes 'src null))])
|
(define src (car (dict-ref attributes 'src null)))
|
||||||
`(a
|
`(a
|
||||||
((class "iframe-alternative") (href ,src))
|
((class "iframe-alternative") (href ,src))
|
||||||
(,(format "Embedded media: ~a" src))))]
|
(,(format "Embedded media: ~a" src)))]
|
||||||
[#t
|
[#t
|
||||||
(list element-type
|
(list element-type
|
||||||
;; attributes
|
;; attributes
|
||||||
|
@ -193,7 +194,13 @@
|
||||||
((query-selector
|
((query-selector
|
||||||
(λ (t a c) (dict-has-key? a 'data-test-collapsesection))
|
(λ (t a c) (dict-has-key? a 'data-test-collapsesection))
|
||||||
transformed))))
|
transformed))))
|
||||||
"collapsible collapsetoggle-inline"))
|
"collapsible collapsetoggle-inline")
|
||||||
|
; check that iframes are gone
|
||||||
|
(check-false ((query-selector (λ (t a c) (eq? t 'iframe)) transformed)))
|
||||||
|
(check-equal? (let* ([alternative ((query-selector (λ (t a c) (has-class? "iframe-alternative" a)) transformed))]
|
||||||
|
[link ((query-selector (λ (t a c) (eq? t 'a)) alternative))])
|
||||||
|
(get-attribute 'href (bits->attributes link)))
|
||||||
|
"https://example.com/iframe-src"))
|
||||||
|
|
||||||
(define (page-wiki req)
|
(define (page-wiki req)
|
||||||
(define wikiname (path/param-path (first (url-path (request-uri req)))))
|
(define wikiname (path/param-path (first (url-path (request-uri req)))))
|
||||||
|
|
|
@ -70,16 +70,16 @@
|
||||||
(define real-error-port (thread-receive))
|
(define real-error-port (thread-receive))
|
||||||
(say-loading-once! real-error-port)
|
(say-loading-once! real-error-port)
|
||||||
(let loop ()
|
(let loop ()
|
||||||
(let ([line (read-line i)])
|
(define line (read-line i))
|
||||||
(cond
|
(cond
|
||||||
[(eof-object? line)
|
[(eof-object? line)
|
||||||
(void)]
|
(void)]
|
||||||
[(string-contains? line "[load")
|
[(string-contains? line "[load")
|
||||||
(display "." real-error-port)
|
(display "." real-error-port)
|
||||||
(loop)]
|
(loop)]
|
||||||
[#t
|
[#t
|
||||||
(displayln line real-error-port)
|
(displayln line real-error-port)
|
||||||
(loop)]))))
|
(loop)])))
|
||||||
|
|
||||||
;; Only to be called from reloader-main
|
;; Only to be called from reloader-main
|
||||||
(define (do-reload!)
|
(define (do-reload!)
|
||||||
|
|
|
@ -100,20 +100,22 @@
|
||||||
(check-false (element-is-content? '(@ (alt "Cute cat."))))
|
(check-false (element-is-content? '(@ (alt "Cute cat."))))
|
||||||
(check-true (element-is-content? "hi")))
|
(check-true (element-is-content? "hi")))
|
||||||
|
|
||||||
|
; get the actual attributes, leaving out the @ signs
|
||||||
(define (xattributes->attributes xattrs)
|
(define (xattributes->attributes xattrs)
|
||||||
(filter pair? xattrs))
|
(filter pair? xattrs))
|
||||||
|
|
||||||
(define (bits->attributes bits)
|
(define (bits->attributes bits)
|
||||||
|
; (append) is a clean and general approach to finding and combining any attributes
|
||||||
(xattributes->attributes (apply append (filter element-is-xattributes? bits))))
|
(xattributes->attributes (apply append (filter element-is-xattributes? bits))))
|
||||||
(module+ test
|
(module+ test
|
||||||
(check-equal? (bits->attributes demo-attributes)
|
(check-equal? (bits->attributes demo-attributes)
|
||||||
'((title "Inside joke.") (style "color: blue"))))
|
'((title "Inside joke.") (style "color: blue"))))
|
||||||
|
|
||||||
(define (get-attribute name attributes)
|
(define (get-attribute name attributes)
|
||||||
(let ([a (assq name attributes)])
|
(define a (assq name attributes))
|
||||||
(if (pair? a)
|
(if (pair? a)
|
||||||
(cadr a)
|
(cadr a)
|
||||||
#f)))
|
#f))
|
||||||
(module+ test
|
(module+ test
|
||||||
(check-equal? (get-attribute 'title (bits->attributes demo-attributes)) "Inside joke."))
|
(check-equal? (get-attribute 'title (bits->attributes demo-attributes)) "Inside joke."))
|
||||||
|
|
||||||
|
@ -131,20 +133,17 @@
|
||||||
(generator
|
(generator
|
||||||
()
|
()
|
||||||
(let loop ([element element])
|
(let loop ([element element])
|
||||||
(let* ([element-type (car element)]
|
(define element-type (car element))
|
||||||
; (append) is a clean and general approach to finding and combining any attributes
|
(define attributes (bits->attributes (cdr element)))
|
||||||
; (filter pair?) is to get the actual attributes and leaves out the @ signs
|
(define children (filter element-is-element? (cdr element))) ; only recurse through real children
|
||||||
[attributes (bits->attributes (cdr element))]
|
(cond
|
||||||
; only recurse through real children
|
[(equal? element-type '*DECL*) #f]
|
||||||
[children (filter element-is-element? (cdr element))])
|
[(equal? element-type '@) #f]
|
||||||
(cond
|
[#t
|
||||||
[(equal? element-type '*DECL*) #f]
|
(when (selector element-type attributes children)
|
||||||
[(equal? element-type '@) #f]
|
(yield element))
|
||||||
[#t
|
(for ([child children]) (loop child))]))
|
||||||
(when (selector element-type attributes children)
|
#f))
|
||||||
(yield element))
|
|
||||||
(for ([child children]) (loop child))])))
|
|
||||||
#f))
|
|
||||||
(module+ test
|
(module+ test
|
||||||
(let ([result (query-selector (attribute-selector 'title "Really.")
|
(let ([result (query-selector (attribute-selector 'title "Really.")
|
||||||
demo-document)])
|
demo-document)])
|
||||||
|
@ -155,24 +154,21 @@
|
||||||
|
|
||||||
(define (update-tree transformer element)
|
(define (update-tree transformer element)
|
||||||
(let loop ([element element])
|
(let loop ([element element])
|
||||||
(let* ([element-type (car element)]
|
(define element-type (car element))
|
||||||
; (append) is a clean and general approach to finding and combining any attributes
|
(define attributes (bits->attributes (cdr element)))
|
||||||
; (filter pair?) is to get the actual attributes and leaves out the @ signs
|
(define contents (filter element-is-content? (cdr element))) ; provide elements and strings
|
||||||
[attributes (bits->attributes (cdr element))]
|
(if (or (equal? element-type '*DECL)
|
||||||
; provide elements and strings
|
(equal? element-type '@))
|
||||||
[contents (filter element-is-content? (cdr element))])
|
; special element, do nothing
|
||||||
(if (or (equal? element-type '*DECL)
|
element
|
||||||
(equal? element-type '@))
|
; regular element, transform it
|
||||||
; special element, do nothing
|
(match (transformer element element-type attributes contents)
|
||||||
element
|
[(list element-type attributes contents)
|
||||||
; regular element, transform it
|
(append (list element-type)
|
||||||
(match (transformer element element-type attributes contents)
|
(if (pair? attributes) (list (append '(@) attributes)) (list))
|
||||||
[(list element-type attributes contents)
|
(map (λ (content)
|
||||||
(append (list element-type)
|
(if (element-is-element? content) (loop content) content))
|
||||||
(if (pair? attributes) (list (append '(@) attributes)) (list))
|
contents))]))))
|
||||||
(map (λ (content)
|
|
||||||
(if (element-is-element? content) (loop content) content))
|
|
||||||
contents))])))))
|
|
||||||
|
|
||||||
(define (has-class? name attributes)
|
(define (has-class? name attributes)
|
||||||
(and (member name (string-split (or (get-attribute 'class attributes) "") " ")) #t))
|
(and (member name (string-split (or (get-attribute 'class attributes) "") " ")) #t))
|
||||||
|
|
Loading…
Reference in a new issue