X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=tt.rkt;h=7f663c2174e6b7b5675fd8eec1a8fa4c95241d24;hb=96ba4c69b4ed97b2999129380e8a4a2f51d69745;hp=986ade173d4eb4b95ddae53c23b77e5fb4451a67;hpb=f1493e49c9c99b0ac19567fe5923a517724e1d51;p=tt.git diff --git a/tt.rkt b/tt.rkt index 986ade1..7f663c2 100644 --- a/tt.rkt +++ b/tt.rkt @@ -2,13 +2,12 @@ ; TODO write ; TODO caching (use cache by default, unless explicitly asked for update) ; - [x] value --> cache -; - [ ] value <-- cache +; - [x] value <-- cache ; requires: commands ; TODO timeline limits ; TODO feed set operations (perhaps better done externally?) ; TODO timeline as a result of a query (feed set op + filter expressions) ; TODO named timelines -; TODO CLI params ; TODO config files ; TODO parse "following" from feed ; - following = @@ -88,13 +87,11 @@ results) (module+ test - (define n-workers 10) - (define given (list - (λ (x) (if (even? x) x #f)) - (range 11))) - (check-equal? - (sort (apply concurrent-filter-map (cons n-workers given)) <) - (sort (apply filter-map given ) <))) + (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 @@ -135,9 +132,42 @@ [rfc3339-record:year t])]) (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"))) + (define (str->lines str) (string-split str (regexp "[\r\n]+"))) +(module+ test + (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))) @@ -147,33 +177,34 @@ (close-input-port in) digest) -(define (uri-fetch uri) - (log-info "GET ~a" uri) - (define resp (http-get uri)) - (define status (http-response-code resp)) - (define 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) - (let* - ([url-digest - (hash-sha1 uri)] - [cache-file-path - (expand-user-path (string-append "~/.tt/cache/" url-digest))]) - (display-to-file - body cache-file-path - #:exists 'replace) - body) - ; TODO A more-informative exception - (raise status))) +(define (uri-fetch use-cache uri) + (define cache-file-path + (expand-user-path (string-append "~/.tt/cache/" (hash-sha1 uri)))) + (if (and use-cache (file-exists? cache-file-path)) + (begin + (log-info "uri-fetch cached ~a" uri) + (file->string cache-file-path)) + (begin + (log-info "uri-fetch new ~a" uri) + (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)))))) (define (timeline-print out-format timeline) (for ([msg timeline] [i (in-naturals)]) (msg-print out-format (odd? i) msg))) -(define (feed->msgs feed) +(define (feed->msgs use-cache feed) (log-info "downloading feed nick:~a uri:~a" (feed-nick feed) (feed-uri feed)) @@ -193,11 +224,11 @@ status) #f)]) (define uri (feed-uri feed)) - (str->msgs [feed-nick feed] uri [uri-fetch uri]))) + (str->msgs [feed-nick feed] uri [uri-fetch use-cache uri]))) ; TODO timeline contract : time-sorted list of messages -(define (timeline num_workers feeds) - (sort (append* (concurrent-filter-map num_workers feed->msgs feeds)) +(define (timeline use-cache num_workers feeds) + (sort (append* (concurrent-filter-map num_workers (curry feed->msgs use-cache) feeds)) (λ (a b) [< (msg-ts_epoch a) (msg-ts_epoch b)]))) (define (str->feed str) @@ -211,11 +242,6 @@ (define (file->feeds filename) (str->feeds (file->string filename))) -(define (we-are-twtxt) - (define uri - "https://raw.githubusercontent.com/mdom/we-are-twtxt/master/we-are-twtxt.txt") - (str->feeds (uri-fetch uri))) - (define (user-agent prog-name prog-version) (let* ([prog-uri "https://github.com/xandkar/tt"] @@ -231,8 +257,9 @@ (module+ main (require setup/getinfo) - (let* ([logger (make-logger #f #f 'debug #f)] - [log-receiver (make-log-receiver logger 'debug)]) + (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 () @@ -249,13 +276,25 @@ [user-agent (user-agent prog-name prog-version)]) (current-http-user-agent user-agent)) (date-display-format 'rfc2822) - (let ([feeds - (let ([args (current-command-line-arguments)]) - (if (= 0 (vector-length args)) - (we-are-twtxt) - (file->feeds (vector-ref args 0))))] - [out-format - 'multi-line] - [num_workers - 15]) ; 15 was fastest out of the tried 1, 5, 10, 15 and 20. - (timeline-print out-format (timeline num_workers feeds)))) + (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))] + + #:args (filename) + + (timeline-print out-format + (timeline use-cache + num_workers + (file->feeds filename))))))