X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=tt.rkt;h=dae32a73315552994acf2021ec6cc9c9624cfb9d;hb=refs%2Fheads%2Ffull-timestamp-parsing-with-srfi%2F19;hp=7f663c2174e6b7b5675fd8eec1a8fa4c95241d24;hpb=96ba4c69b4ed97b2999129380e8a4a2f51d69745;p=tt.git diff --git a/tt.rkt b/tt.rkt index 7f663c2..dae32a7 100644 --- a/tt.rkt +++ b/tt.rkt @@ -41,12 +41,12 @@ (require openssl/sha1) (require racket/date) +(require (prefix-in srfi/19: srfi/19)) (require http-client) -(require rfc3339-old) (module+ test - (require rackunit)) + (require rackunit)) (struct msg (ts_epoch ts_rfc3339 nick uri text)) (struct feed (nick uri)) @@ -61,25 +61,25 @@ (define (work) (thread-send parent (cons 'next self)) (match (thread-receive) - ['done (thread-send parent (cons 'exit id))] - [(cons 'unit x) (begin - (define y (f x)) - (when y (thread-send parent (cons 'result y))) - (work))])) + ['done (thread-send parent (cons 'exit id))] + [(cons 'unit x) (begin + (define y (f x)) + (when y (thread-send parent (cons 'result y))) + (work))])) (work))) (define (dispatch ws xs ys) (if (empty? ws) ys (match (thread-receive) - [(cons 'exit w) (dispatch (remove w ws =) xs ys)] - [(cons 'result y) (dispatch ws xs (cons y ys))] - [(cons 'next thd) (match xs - ['() (begin - (thread-send thd 'done) - (dispatch ws xs ys))] - [(cons x xs) (begin - (thread-send thd (cons 'unit x)) - (dispatch ws xs ys))])]))) + [(cons 'exit w) (dispatch (remove w ws =) xs ys)] + [(cons 'result y) (dispatch ws xs (cons y ys))] + [(cons 'next thd) (match xs + ['() (begin + (thread-send thd 'done) + (dispatch ws xs ys))] + [(cons x xs) (begin + (thread-send thd (cons 'unit x)) + (dispatch ws xs ys))])]))) (define workers (range num_workers)) (define threads (map (λ (id) (thread (make-worker id f))) workers)) (define results (dispatch workers xs '())) @@ -87,18 +87,18 @@ results) (module+ test - (let* ([f (λ (x) (if (even? x) x #f))] - [xs (range 11)] - [actual (sort (concurrent-filter-map 10 f xs) <)] - [expected (sort ( filter-map f xs) <)]) - (check-equal? actual expected "concurrent-filter-map"))) + (let* ([f (λ (x) (if (even? x) x #f))] + [xs (range 11)] + [actual (sort (concurrent-filter-map 10 f xs) <)] + [expected (sort ( filter-map f xs) <)]) + (check-equal? actual expected "concurrent-filter-map"))) (define (msg-print out-format odd msg) (printf (match out-format - ['single-line "~a \033[1;37m<~a ~a>\033[0m \033[0;~am~a\033[0m~n"] - ['multi-line "~a~n\033[1;37m<~a ~a>\033[0m~n\033[0;~am~a\033[0m~n~n"] - [_ (raise (format "Invalid output format: ~a" out-format))]) + ['single-line "~a \033[1;37m<~a ~a>\033[0m \033[0;~am~a\033[0m~n"] + ['multi-line "~a~n\033[1;37m<~a ~a>\033[0m~n\033[0;~am~a\033[0m~n~n"] + [_ (raise (format "Invalid output format: ~a" out-format))]) (date->string (seconds->date [msg-ts_epoch msg]) #t) (msg-nick msg) (msg-uri msg) @@ -109,64 +109,65 @@ ; TODO Zulu offset. Maybe in several formats. Which ones? (pregexp "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}")) +(define (rfc3339->epoch str) + (with-handlers + ([exn? (λ (e) (log-error "Timestamp parse failure of ~v with ~v" str e))]) + ((srfi/19:time-second + (srfi/19:date->time-utc + (srfi/19:string->date + str + "~Y-~m-~dT~2")))))) + (define (str->msg nick uri str) (if (not (regexp-match? re-msg-begin str)) (begin (log-debug "Non-msg line from nick:~a, line:~a" nick str) #f) (let ([toks (string-split str (regexp "\t+"))]) - (if (not (= 2 (length toks))) - (begin - (log-warning "Invalid msg line from nick:~a, msg:~a" nick str) - #f) - (let* - ([ts_rfc3339 (first toks)] - [text (second toks)] - [t (string->rfc3339-record ts_rfc3339)] - ; TODO handle tz offset - [ts_epoch (find-seconds [rfc3339-record:second t] - [rfc3339-record:minute t] - [rfc3339-record:hour t] - [rfc3339-record:mday t] - [rfc3339-record:month t] - [rfc3339-record:year t])]) - (msg ts_epoch ts_rfc3339 nick uri text)))))) + (if (not (= 2 (length toks))) + (begin + (log-warning "Invalid msg line from nick:~a, msg:~a" nick str) + #f) + (let* + ([ts_rfc3339 (first toks)] + [text (second toks)] + [ts_epoch (rfc3339->epoch ts_rfc3339)]) + (msg ts_epoch ts_rfc3339 nick uri text)))))) (module+ test - (let* ([ts "2020-11-18T22:22:09-0500"] - [tab " "] - [text "Lorem ipsum"] - [nick "foo"] - [uri "bar"] - [actual (str->msg nick uri (string-append ts tab text))] - [expected (msg 1605756129 ts nick uri text)]) - ; FIXME re-enable after handling tz offset - ;(check-equal? - ; (msg-ts_epoch actual) - ; (msg-ts_epoch expected) - ; "str->msg ts_epoch") - (check-equal? - (msg-ts_rfc3339 actual) - (msg-ts_rfc3339 expected) - "str->msg ts_rfc3339") - (check-equal? - (msg-nick actual) - (msg-nick expected) - "str->msg nick") - (check-equal? - (msg-uri actual) - (msg-uri expected) - "str->msg uri") - (check-equal? - (msg-text actual) - (msg-text expected) - "str->msg text"))) + (let* ([ts "2020-11-18T22:22:09-0500"] + [tab " "] + [text "Lorem ipsum"] + [nick "foo"] + [uri "bar"] + [actual (str->msg nick uri (string-append ts tab text))] + [expected (msg 1605756129 ts nick uri text)]) + (check-equal? + (msg-ts_epoch actual) + (msg-ts_epoch expected) + "str->msg ts_epoch") + (check-equal? + (msg-ts_rfc3339 actual) + (msg-ts_rfc3339 expected) + "str->msg ts_rfc3339") + (check-equal? + (msg-nick actual) + (msg-nick expected) + "str->msg nick") + (check-equal? + (msg-uri actual) + (msg-uri expected) + "str->msg uri") + (check-equal? + (msg-text actual) + (msg-text expected) + "str->msg text"))) (define (str->lines str) (string-split str (regexp "[\r\n]+"))) (module+ test - (check-equal? (str->lines "abc\ndef\n\nghi") '("abc" "def" "ghi"))) + (check-equal? (str->lines "abc\ndef\n\nghi") '("abc" "def" "ghi"))) (define (str->msgs nick uri str) (filter-map (λ (line) (str->msg nick uri line)) (str->lines str))) @@ -189,15 +190,15 @@ (let* ([resp (http-get uri)] [status (http-response-code resp)] [body (http-response-body resp)]) - (log-debug "finished GET ~a status:~a body length:~a" - uri status (string-length body)) - ; TODO Handle redirects - (if (= status 200) - (begin - (display-to-file body cache-file-path #:exists 'replace) - body) - ; TODO A more-informative exception - (raise status)))))) + (log-debug "finished GET ~a status:~a body length:~a" + uri status (string-length body)) + ; TODO Handle redirects + (if (= status 200) + (begin + (display-to-file body cache-file-path #:exists 'replace) + body) + ; TODO A more-informative exception + (raise status)))))) (define (timeline-print out-format timeline) (for ([msg timeline] @@ -249,52 +250,52 @@ [user (if (file-exists? user-feed-file) (let ([user (first (file->feeds user-feed-file))]) - (format "+~a; @~a" (feed-uri user) (feed-nick user))) + (format "+~a; @~a" (feed-uri user) (feed-nick user))) (format "+~a" prog-uri))] ) (format "~a/~a (~a)" prog-name prog-version user))) (module+ main - (require setup/getinfo) + (require setup/getinfo) - (let* ([level 'info] - [logger (make-logger #f #f level #f)] - [log-receiver (make-log-receiver logger level)]) - (void (thread (λ () - [date-display-format 'iso-8601] - [let loop () - (define data (sync log-receiver)) - (define level (vector-ref data 0)) - (define msg (vector-ref data 1)) - (define ts (date->string (current-date) #t)) - (eprintf "~a [~a] ~a~n" ts level msg) - (loop)]))) - (current-logger logger)) - (current-http-response-auto #f) - (let* ([prog-name "tt"] - [prog-version ((get-info (list prog-name)) 'version)] - [user-agent (user-agent prog-name prog-version)]) - (current-http-user-agent user-agent)) - (date-display-format 'rfc2822) - (let* ([use-cache - #f] - [out-format - 'multi-line] - [num_workers - 15]) ; 15 was fastest out of the tried 1, 5, 10, 15 and 20. - (command-line - #:once-each - [("-c" "--cached") - "Read cached data instead of downloading." - (set! use-cache #t)] + (let* ([level 'info] + [logger (make-logger #f #f level #f)] + [log-receiver (make-log-receiver logger level)]) + (void (thread (λ () + [date-display-format 'iso-8601] + [let loop () + (define data (sync log-receiver)) + (define level (vector-ref data 0)) + (define msg (vector-ref data 1)) + (define ts (date->string (current-date) #t)) + (eprintf "~a [~a] ~a~n" ts level msg) + (loop)]))) + (current-logger logger)) + (current-http-response-auto #f) + (let* ([prog-name "tt"] + [prog-version ((get-info (list prog-name)) 'version)] + [user-agent (user-agent prog-name prog-version)]) + (current-http-user-agent user-agent)) + (date-display-format 'rfc2822) + (let* ([use-cache + #f] + [out-format + 'multi-line] + [num_workers + 15]) ; 15 was fastest out of the tried 1, 5, 10, 15 and 20. + (command-line + #:once-each + [("-c" "--cached") + "Read cached data instead of downloading." + (set! use-cache #t)] - [("-j" "--jobs") - njobs "Number of concurrent jobs." - (set! num_workers (string->number njobs))] + [("-j" "--jobs") + njobs "Number of concurrent jobs." + (set! num_workers (string->number njobs))] - #:args (filename) + #:args (filename) - (timeline-print out-format - (timeline use-cache - num_workers - (file->feeds filename)))))) + (timeline-print out-format + (timeline use-cache + num_workers + (file->feeds filename))))))