suzanne.soy/pasterack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

report read error for syntactically invalid pastes

Browse Source 
(unless as-text is checked)

- closes #19
- also eliminate some unneeded db queries
This commit is contained in:
Stephen Chang 2013-10-07 19:23:53 -04:00
parent 265ff568e1
commit e02b99ccd1
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pasterack.rkt
View File

@ -7,6 +7,8 @@
(require "pasterack-utils.rkt") (require "pasterack-utils.rkt")
(provide/contract (start (request? . -> . response?))) (provide/contract (start (request? . -> . response?)))
(current-redis-connection (connect))
(define-runtime-path htdocs-dir "htdocs") (define-runtime-path htdocs-dir "htdocs")
(define-runtime-path here ".") (define-runtime-path here ".")
(define-runtime-path tmp-dir "tmp") (define-runtime-path tmp-dir "tmp")
@ -45,6 +47,11 @@
"7913" ; plot "7913" ; plot
; "5752" ; bs ipsum (as text) ; "5752" ; bs ipsum (as text)
)) ))
(define sample-pastes-htmls
(for/list ([pnum sample-pastes])
(define name (HGET/str pnum 'name))
`(tr (td ,(mk-link (mk-paste-url pnum) pnum))
(td ((style "width:1px"))) (td ,name))))
(define NUM-RECENT-PASTES 16) (define NUM-RECENT-PASTES 16)
(define recent-pastes (empty-ring-buffer NUM-RECENT-PASTES)) (define recent-pastes (empty-ring-buffer NUM-RECENT-PASTES))
@ -140,11 +147,15 @@
; tmp-name) ; tmp-name)
(define (compile-scrbl-file/get-html name) (define (compile-scrbl-file/get-html name)
(define err (open-output-file (build-path tmp-dir (++ name ".err"))))
(and (and
(parameterize ([current-error-port err])
(begin0
(system (++ "/home/stchang/pltpkg/racket/bin/scribble --html +m " (system (++ "/home/stchang/pltpkg/racket/bin/scribble --html +m "
"--redirect-main " racket-docs-url " " "--redirect-main " racket-docs-url " "
"--dest " (path->string tmp-dir) " " "--dest " (path->string tmp-dir) " "
(path->string (build-path tmp-dir (++ name ".scrbl"))))) (path->string (build-path tmp-dir (++ name ".scrbl")))))
(close-output-port err)))
(with-input-from-file (build-path tmp-dir (++ name ".html")) port->bytes))) (with-input-from-file (build-path tmp-dir (++ name ".html")) port->bytes)))
(define (compile-eval-scrbl-file/get-html name) (define (compile-eval-scrbl-file/get-html name)
(and (and
@ -225,10 +236,7 @@
(h4 "Total pastes: " ,(number->string (DBSIZE))) (h4 "Total pastes: " ,(number->string (DBSIZE)))
(h4 "Sample pastes:") (h4 "Sample pastes:")
(table ((style "margin-top:-15px;font-size:95%")) (table ((style "margin-top:-15px;font-size:95%"))
,@(for/list ([pnum sample-pastes]) ,@sample-pastes-htmls)
(define name (bytes->string/utf-8 (HGET pnum 'name)))
`(tr (td ,(mk-link (mk-paste-url pnum) pnum))
(td ((style "width:1px"))) (td ,name))))
(h4 "Recent pastes:") (h4 "Recent pastes:")
(table ((style "margin-top:-15px;font-size:95%")) (table ((style "margin-top:-15px;font-size:95%"))
,@(reverse ,@(reverse
@ -298,7 +306,15 @@
(generate-paste-html pasted-code paste-num))) (generate-paste-html pasted-code paste-num)))
(define paste-html-str (or html-res pasted-code)) (define paste-html-str (or html-res pasted-code))
(define eval-html-str (define eval-html-str
(and html-res (generate-eval-html pasted-code paste-num))) (if html-res
;; eval only if able to read pasted code
(generate-eval-html pasted-code paste-num)
;; if not, use read error as output,
;; unless as-text was explicitly checked
(if (exists-binding? 'astext bs) #f
(with-input-from-file
(build-path tmp-dir (++ paste-num "code.err"))
port->string))))
(define paste-url (mk-paste-url paste-num)) (define paste-url (mk-paste-url paste-num))
(ring-buffer-push! recent-pastes paste-num) (ring-buffer-push! recent-pastes paste-num)
(SET/hash paste-num (hash 'name paste-name (SET/hash paste-num (hash 'name paste-name
@ -443,7 +459,10 @@
[x x])) [x x]))
results))))] results))))]
[_ `(div (pre ,eval-main-div))]))] [_ `(div (pre ,eval-main-div))]))]
[_ `(div (pre ,code-main-div))])) [_ `(div (pre ,code-main-div)
,(if (string=? eval-main-div "") ""
`(span (p "=>") (pre ,eval-main-div)))
)]))
(serve-home #:content code #:title name #:fork-from pastenum (serve-home #:content code #:title name #:fork-from pastenum
(send/suspend (send/suspend
(lambda (home-url) (lambda (home-url)
@ -506,7 +525,6 @@
[("pastes" (string-arg)) serve-paste] [("pastes" (string-arg)) serve-paste]
#;[else serve-home])) #;[else serve-home]))
(current-redis-connection (connect))
(define (start request) (do-dispatch request)) (define (start request) (do-dispatch request))