cadence/breezewiki
2
4
Fork 4
Code Issues Pull requests 1 Releases Wiki Activity

Compare commits

base: cadence:155a277f26ca68b00f1899e5f584d09b11373d35
Branches Tags
cadence:main
cadence:disable-requests
cadence:early-hints
..
compare: cadence:5fa6e2fb9e6a00c964a3c8bffe66351ed5b3e7b2
Branches Tags
cadence:main
cadence:disable-requests
cadence:early-hints

No commits in common. "155a277f26ca68b00f1899e5f584d09b11373d35" and "5fa6e2fb9e6a00c964a3c8bffe66351ed5b3e7b2" have entirely different histories.
155a277f26 ... 5fa6e2fb9e

9 changed files with 226 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

54
lib/syntax.rkt
View file

@ -4,6 +4,8 @@
(provide (provide
; help make a nested if. if/in will gain the same false form of its containing if/out. ; help make a nested if. if/in will gain the same false form of its containing if/out.
if/out if/out
; let, but the value for each variable is evaluated within a thread
thread-let
; cond, but values can be defined between conditions ; cond, but values can be defined between conditions
cond/var cond/var
; wrap sql statements into lambdas so they can be executed during migration ; wrap sql statements into lambdas so they can be executed during migration
@ -23,6 +25,7 @@
(provide (provide
transform-if/out transform-if/out
transform-thread-let
transform/out-cond/var) transform/out-cond/var)
(define (transform-if/out stx) (define (transform-if/out stx)
@ -48,6 +51,26 @@
[#t node]))) [#t node])))
(datum->syntax stx (cons 'if result))) (datum->syntax stx (cons 'if result)))
(define (transform-thread-let stx)
(define tree (cdr (syntax->datum stx)))
(define defs (car tree))
(define forms (cdr tree))
(when (eq? (length forms) 0)
(error (format "thread-let: bad syntax (need some forms to execute after the threads)~n forms: ~a" forms)))
(define counter (build-list (length defs) values))
(datum->syntax
stx
`(let ([chv (build-vector ,(length defs) (λ (_) (make-channel)))])
,@(map (λ (n)
(define def (list-ref defs n))
`(thread (λ () (channel-put (vector-ref chv ,n) (let _ () ,@(cdr def))))))
counter)
(let ,(map (λ (n)
(define def (list-ref defs n))
`(,(car def) (channel-get (vector-ref chv ,n))))
counter)
,@forms))))
(define (transform/out-cond/var stx) (define (transform/out-cond/var stx)
(define tree (transform-cond/var (cdr (syntax->datum stx)))) (define tree (transform-cond/var (cdr (syntax->datum stx))))
(datum->syntax (datum->syntax
@ -62,7 +85,7 @@
`(cond `(cond
,@els ,@els
[#t [#t
(let* ,(for/list ([var vars]) (let ,(for/list ([var vars])
(cdr var)) (cdr var))
,(transform-cond/var rest))])))) ,(transform-cond/var rest))]))))
@ -96,6 +119,35 @@
(check-equal? (if/out #t (if/in #f 'yes) 'no) 'no) (check-equal? (if/out #t (if/in #f 'yes) 'no) 'no)
(check-equal? (if/out #f (if/in #f 'yes) 'no) 'no)) (check-equal? (if/out #f (if/in #f 'yes) 'no) 'no))
(define-syntax (thread-let stx)
(transform-thread-let stx))
(module+ test
; check that it is transformed as expected
(check-syntax-equal?
(transform-thread-let
#'(thread-let ([a (hey "this is a")]
[b (hey "this is b")])
(list a b)))
#'(let ([chv (build-vector 2 (λ (_) (make-channel)))])
(thread (λ () (channel-put (vector-ref chv 0) (let _ () (hey "this is a")))))
(thread (λ () (channel-put (vector-ref chv 1) (let _ () (hey "this is b")))))
(let ([a (channel-get (vector-ref chv 0))]
[b (channel-get (vector-ref chv 1))])
(list a b))))
; check that they actually execute concurrently
(define ch (make-channel))
(check-equal? (thread-let ([a (begin
(channel-put ch 'a)
(channel-get ch))]
[b (begin0
(channel-get ch)
(channel-put ch 'b))])
(list a b))
'(b a))
; check that it assigns the correct value to the correct variable
(check-equal? (thread-let ([a (sleep 0) 'a] [b 'b]) (list a b))
'(a b)))
(define-syntax (cond/var stx) (define-syntax (cond/var stx)
(transform/out-cond/var stx)) (transform/out-cond/var stx))
(module+ test (module+ test

72
lib/thread-utils.rkt
View file

@ -1,72 +0,0 @@
#lang racket/base
(require (prefix-in easy: net/http-easy)
"../src/data.rkt"
"xexpr-utils.rkt")
(provide
thread-values)
(module+ test
(require rackunit))
(define (thread-values . thunks)
(parameterize-break #t
(define the-exn (box #f))
(define original-thread (current-thread))
(define (break e)
(when (box-cas! the-exn #f e)
(break-thread original-thread))
(sleep 0))
(define-values (threads channels)
(for/fold ([ts null]
[chs null]
#:result (values (reverse ts) (reverse chs)))
([th thunks])
(define ch (make-channel))
(define t
(thread (λ ()
(with-handlers ([exn? break])
(channel-put ch (th))))))
(values (cons t ts) (cons ch chs))))
(apply
values
(with-handlers ([exn:break? (λ (_)
(for ([t threads]) (kill-thread t))
(if (unbox the-exn)
(raise (unbox the-exn))
(error 'thread-values "a thread broke, but without reporting its exception")))])
(for/list ([ch channels])
(channel-get ch))))))
(module+ test
; check that they actually execute concurrently
(define ch (make-channel))
(check-equal? (let-values ([(a b)
(thread-values
(λ ()
(begin
(channel-put ch 'a)
(channel-get ch)))
(λ ()
(begin0
(channel-get ch)
(channel-put ch 'b))))])
(list a b))
'(b a))
; check that it assigns the correct value to the correct variable
(check-equal? (let-values ([(a b)
(thread-values
(λ () (sleep 0) 'a)
(λ () 'b))])
(list a b))
'(a b))
; check that exceptions are passed to the original thread, and other threads are killed
;; TODO: if the other thread was making an HTTP request, could it be left stuck open by the kill?
(check-equal? (let* ([x "!"]
[res
(with-handlers ([exn:fail:user? (λ (e) (exn-message e))])
(thread-values
(λ () (sleep 0) (set! x "?") (println "this side effect should not happen"))
(λ () (raise-user-error "catch me"))))])
(string-append res x))
"catch me!"))

4
lib/tree-updater.rkt
View file

@ -277,8 +277,8 @@
; check that noscript images are removed ; check that noscript images are removed
(check-equal? ((query-selector (λ (t a c) (eq? t 'noscript)) transformed)) #f) (check-equal? ((query-selector (λ (t a c) (eq? t 'noscript)) transformed)) #f)
; benchmark ; benchmark
(when (file-exists? "../storage/Frog.html") (when (file-exists? "../misc/Frog.html")
(with-input-from-file "../storage/Frog.html" (with-input-from-file "../misc/Frog.html"
(λ () (λ ()
(define tree (html->xexp (current-input-port))) (define tree (html->xexp (current-input-port)))
(time (length (update-tree-wiki tree "minecraft"))))))) (time (length (update-tree-wiki tree "minecraft")))))))

11
src/application-globals.rkt
View file

@ -201,16 +201,13 @@
,(if (config-true? 'instance_is_official) ,(if (config-true? 'instance_is_official)
(let ([balloon '(img (@ (src "/static/three-balloons.png") (class "bw-balloon") (title "Image Source: pngimg.com/image/4955 | License: CC BY-NC 4.0 | Modifications: Resized") (width "52") (height "56")))] (let ([balloon '(img (@ (src "/static/three-balloons.png") (class "bw-balloon") (title "Image Source: pngimg.com/image/4955 | License: CC BY-NC 4.0 | Modifications: Resized") (width "52") (height "56")))]
[extension-eligible? [extension-eligible?
(cond/var (and req (let* ([ua-pair (assq 'user-agent (request-headers req))]
[(not req) #f] [ua (string-downcase (cdr ua-pair))])
(var ua-pair (assq 'user-agent (request-headers req)))
[(not ua-pair) #f]
(var ua (string-downcase (cdr ua-pair)))
;; everyone pretends to be chrome, so we do it in reverse ;; everyone pretends to be chrome, so we do it in reverse
;; this excludes common browsers that don't support the extension ;; this excludes common browsers that don't support the extension
[#t (and (not (string-contains? ua "edge/")) (and (not (string-contains? ua "edge/"))
(not (string-contains? ua "edg/")) (not (string-contains? ua "edg/"))
(not (string-contains? ua "mobile")))])]) (not (string-contains? ua "mobile")))))])
`(div (@ (class "bw-top-banner")) `(div (@ (class "bw-top-banner"))
,balloon ,balloon
(div (div

19
src/extwiki-generic.rkt
View file

@ -20,7 +20,6 @@
(define wikis (define wikis
'(((gallowmere) "MediEvil Wiki" "https://medievil.wiki/w/Main_Page" #f #f) '(((gallowmere) "MediEvil Wiki" "https://medievil.wiki/w/Main_Page" #f #f)
((fallout) "Fallout Wiki" "https://fallout.wiki/wiki/Fallout_Wiki" #f "https://fallout.wiki/api.php") ((fallout) "Fallout Wiki" "https://fallout.wiki/wiki/Fallout_Wiki" #f "https://fallout.wiki/api.php")
((drawntolife) "Wapopedia" "https://drawntolife.wiki/en/Main_Page" #f "https://drawntolife.wiki/w/api.php")
)) ))
(define wikis-hash (make-hash)) (define wikis-hash (make-hash))
@ -29,7 +28,7 @@
(hash-set! wikis-hash (symbol->string wikiname) w))) (hash-set! wikis-hash (symbol->string wikiname) w)))
(module+ test (module+ test
(check-equal? (cadr (hash-ref wikis-hash "gallowmere")) (check-equal? (cadr (hash-ref wikis-hash "gallowmere"))
"MediEvil Wiki")) "Gallowmere Historia"))
(define (parse-table table) (define (parse-table table)
(define rows (query-selector (λ (t a c) (eq? t 'tr)) table)) (define rows (query-selector (λ (t a c) (eq? t 'tr)) table))
@ -59,10 +58,8 @@
[(not logo) (values #f '("Data table must have a \"Logo\" column"))] [(not logo) (values #f '("Data table must have a \"Logo\" column"))]
[(null? logo) (values #f '("Logo table column must have a link"))] [(null? logo) (values #f '("Logo table column must have a link"))]
(var href (get-attribute 'href (bits->attributes (car (hash-ref table 'logo))))) (var href (get-attribute 'href (bits->attributes (car (hash-ref table 'logo)))))
(var src (get-attribute 'src (bits->attributes (car (hash-ref table 'logo))))) [(not href) (values #f '("Logo table column must have a link"))]
(var true-src (or href src)) [#t (values href null)]))
[(not true-src) (values #f '("Logo table column must have a link"))]
[#t (values true-src null)]))
(define (get-api-endpoint wiki) (define (get-api-endpoint wiki)
(define main-page (third wiki)) (define main-page (third wiki))
@ -80,7 +77,7 @@
(or override (or override
(match main-page (match main-page
[(regexp #rx"/$") (string-append main-page "Special:Search")] [(regexp #rx"/$") (string-append main-page "Special:Search")]
[(regexp #rx"^(.*/(?:en|w[^./]*)/)" (list _ wiki-prefix)) (string-append wiki-prefix "Special:Search")] [(regexp #rx"^(.*/w[^./]*/)" (list _ wiki-prefix)) (string-append wiki-prefix "Special:Search")]
[_ (error 'get-search-page "unknown url format: ~a" main-page)]))) [_ (error 'get-search-page "unknown url format: ~a" main-page)])))
(define/memoize (get-redirect-content wikiname) #:hash hash (define/memoize (get-redirect-content wikiname) #:hash hash
@ -112,10 +109,8 @@
,@body ,@body
(p "This wiki's core community has wholly migrated away from Fandom. You should " (p "This wiki's core community has wholly migrated away from Fandom. You should "
(a (@ (href ,go)) "go to " ,display-name " now!"))) (a (@ (href ,go)) "go to " ,display-name " now!")))
,(if logo (div (@ (class "niwa__right"))
`(div (@ (class "niwa__right")) (img (@ (class "niwa__logo") (src ,logo)))))
(img (@ (class "niwa__logo") (src ,logo))))
""))
,(if (pair? links) ,(if (pair? links)
`(p (@ (class "niwa__feedback")) `(p (@ (class "niwa__feedback"))
,@(add-between links " / ")) ,@(add-between links " / "))
@ -127,4 +122,4 @@
"")))] "")))]
[#t #f])) [#t #f]))
(module+ test (module+ test
(check-not-false ((get-redirect-content "gallowmere") "MediEvil Wiki"))) ((get-redirect-content "gallowmere") "Gallowmere Historia"))

19
src/page-category.rkt
View file

@ -17,7 +17,6 @@
"data.rkt" "data.rkt"
"page-wiki.rkt" "page-wiki.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt" "whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
@ -70,10 +69,8 @@
(define origin (format "https://~a.fandom.com" wikiname)) (define origin (format "https://~a.fandom.com" wikiname))
(define source-url (format "~a/wiki/~a" origin prefixed-category)) (define source-url (format "~a/wiki/~a" origin prefixed-category))
(define-values (members-data page-data siteinfo) (thread-let
(thread-values ([members-data (define dest-url
(λ ()
(define dest-url
(format "~a/api.php?~a" (format "~a/api.php?~a"
origin origin
(params->query `(("action" . "query") (params->query `(("action" . "query")
@ -84,9 +81,8 @@
("format" . "json"))))) ("format" . "json")))))
(log-outgoing dest-url) (log-outgoing dest-url)
(define dest-res (easy:get dest-url #:timeouts timeouts)) (define dest-res (easy:get dest-url #:timeouts timeouts))
(easy:response-json dest-res)) (easy:response-json dest-res)]
(λ () [page-data (define dest-url
(define dest-url
(format "~a/api.php?~a" (format "~a/api.php?~a"
origin origin
(params->query `(("action" . "parse") (params->query `(("action" . "parse")
@ -96,9 +92,8 @@
("format" . "json"))))) ("format" . "json")))))
(log-outgoing dest-url) (log-outgoing dest-url)
(define dest-res (easy:get dest-url #:timeouts timeouts)) (define dest-res (easy:get dest-url #:timeouts timeouts))
(easy:response-json dest-res)) (easy:response-json dest-res)]
(λ () [siteinfo (siteinfo-fetch wikiname)])
(siteinfo-fetch wikiname))))
(define title (preprocess-html-wiki (jp "/parse/title" page-data prefixed-category))) (define title (preprocess-html-wiki (jp "/parse/title" page-data prefixed-category)))
(define page-html (preprocess-html-wiki (jp "/parse/text" page-data ""))) (define page-html (preprocess-html-wiki (jp "/parse/text" page-data "")))
@ -122,7 +117,7 @@
#:code 200 #:code 200
#:headers (build-headers always-headers) #:headers (build-headers always-headers)
(λ (out) (λ (out)
(write-html body out))))) (write-html body out))))))
(module+ test (module+ test
(check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Ankle_Monitor") (check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Ankle_Monitor")
(generate-results-page (generate-results-page

14
src/page-file.rkt
View file

@ -17,7 +17,6 @@
"data.rkt" "data.rkt"
"page-wiki.rkt" "page-wiki.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt" "whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
@ -109,10 +108,8 @@
(define origin (format "https://~a.fandom.com" wikiname)) (define origin (format "https://~a.fandom.com" wikiname))
(define source-url (format "~a/wiki/~a" origin prefixed-title)) (define source-url (format "~a/wiki/~a" origin prefixed-title))
(define-values (media-detail siteinfo) (thread-let
(thread-values ([media-detail (define dest-url
(λ ()
(define dest-url
(format "~a/wikia.php?~a" (format "~a/wikia.php?~a"
origin origin
(params->query `(("format" . "json") ("controller" . "Lightbox") (params->query `(("format" . "json") ("controller" . "Lightbox")
@ -120,9 +117,8 @@
("fileTitle" . ,prefixed-title))))) ("fileTitle" . ,prefixed-title)))))
(log-outgoing dest-url) (log-outgoing dest-url)
(define dest-res (easy:get dest-url #:timeouts timeouts)) (define dest-res (easy:get dest-url #:timeouts timeouts))
(easy:response-json dest-res)) (easy:response-json dest-res)]
(λ () [siteinfo (siteinfo-fetch wikiname)])
(siteinfo-fetch wikiname))))
(if (not (jp "/exists" media-detail #f)) (if (not (jp "/exists" media-detail #f))
(next-dispatcher) (next-dispatcher)
(response-handler (response-handler
@ -147,7 +143,7 @@
(xexp->html body)) (xexp->html body))
(response/output #:code 200 (response/output #:code 200
#:headers (build-headers always-headers) #:headers (build-headers always-headers)
(λ (out) (write-html body out))))))) (λ (out) (write-html body out))))))))
(module+ test (module+ test
(parameterize ([(config-parameter 'strict_proxy) "true"]) (parameterize ([(config-parameter 'strict_proxy) "true"])
(check-equal? (get-media-html "https://static.wikia.nocookie.net/a" "image/jpeg") (check-equal? (get-media-html "https://static.wikia.nocookie.net/a" "image/jpeg")

14
src/page-search.rkt
View file

@ -14,7 +14,6 @@
"config.rkt" "config.rkt"
"data.rkt" "data.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt" "whole-utils.rkt"
"../lib/xexpr-utils.rkt") "../lib/xexpr-utils.rkt")
@ -73,13 +72,10 @@
("formatversion" . "2") ("formatversion" . "2")
("format" . "json"))))) ("format" . "json")))))
(define-values (dest-res siteinfo) (thread-let
(thread-values ([dest-res (log-outgoing dest-url)
(λ () (easy:get dest-url #:timeouts timeouts)]
(log-outgoing dest-url) [siteinfo (siteinfo-fetch wikiname)])
(easy:get dest-url #:timeouts timeouts))
(λ ()
(siteinfo-fetch wikiname))))
(define data (easy:response-json dest-res)) (define data (easy:response-json dest-res))
@ -92,7 +88,7 @@
#:code 200 #:code 200
#:headers (build-headers always-headers) #:headers (build-headers always-headers)
(λ (out) (λ (out)
(write-html body out))))) (write-html body out))))))
(module+ test (module+ test
(parameterize ([(config-parameter 'feature_offline::only) "false"]) (parameterize ([(config-parameter 'feature_offline::only) "false"])
(check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Gacha_Capsule") (check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Gacha_Capsule")

14
src/page-wiki.rkt
View file

@ -19,7 +19,6 @@
"data.rkt" "data.rkt"
"../lib/pure-utils.rkt" "../lib/pure-utils.rkt"
"../lib/syntax.rkt" "../lib/syntax.rkt"
"../lib/thread-utils.rkt"
"../lib/tree-updater.rkt" "../lib/tree-updater.rkt"
"../lib/url-utils.rkt" "../lib/url-utils.rkt"
"whole-utils.rkt" "whole-utils.rkt"
@ -42,10 +41,8 @@
(define path (string-join (map path/param-path (cddr (url-path (request-uri req)))) "/")) (define path (string-join (map path/param-path (cddr (url-path (request-uri req)))) "/"))
(define source-url (format "https://~a.fandom.com/wiki/~a" wikiname path)) (define source-url (format "https://~a.fandom.com/wiki/~a" wikiname path))
(define-values (dest-res siteinfo) (thread-let
(thread-values ([dest-res (define dest-url
(λ ()
(define dest-url
(format "~a/api.php?~a" (format "~a/api.php?~a"
origin origin
(params->query `(("action" . "parse") (params->query `(("action" . "parse")
@ -56,9 +53,8 @@
(log-outgoing dest-url) (log-outgoing dest-url)
(easy:get dest-url (easy:get dest-url
#:timeouts timeouts #:timeouts timeouts
#:headers `#hasheq((cookie . ,(format "theme=~a" (user-cookies^-theme user-cookies)))))) #:headers `#hasheq((cookie . ,(format "theme=~a" (user-cookies^-theme user-cookies)))))]
(λ () [siteinfo (siteinfo-fetch wikiname)])
(siteinfo-fetch wikiname))))
(cond (cond
[(eq? 200 (easy:response-status-code dest-res)) [(eq? 200 (easy:response-status-code dest-res))
@ -100,4 +96,4 @@
#:code 200 #:code 200
#:headers headers #:headers headers
(λ (out) (λ (out)
(write-html body out))))))])) (write-html body out))))))])))