X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=tt.rkt;h=098a08e76b1e311c82439b401a8ab7eb6eb1ec64;hb=d96fa613f6c040ed645c597076235f017fcbc05b;hp=1a73138d35cea8e7c372f7678e33319473ce09f7;hpb=de3ff44823bafbf4b400457e9410002c51404323;p=tt.git diff --git a/tt.rkt b/tt.rkt index 1a73138..098a08e 100644 --- a/tt.rkt +++ b/tt.rkt @@ -1,42 +1,3 @@ -; TODO optional text wrap -; TODO write -; TODO caching (use cache by default, unless explicitly asked for update) -; - [x] 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 config files -; TODO parse "following" from feed -; - following = -; TODO parse mentions: -; - @ | @ -; TODO highlight mentions -; TODO filter on mentions -; TODO highlight hashtags -; TODO filter on hashtags -; TODO hashtags as channels? initial hashtag special? -; TODO query language -; TODO console logger colors by level ('error) -; TODO file logger ('debug) -; TODO commands: -; - r | read -; - see timeline ops above -; - w | write -; - arg or stdin -; - nick expand to URI -; - q | query -; - see timeline ops above -; - see hashtag and channels above -; - d | download -; - u | upload -; - calls user-configured command to upload user's own feed file to their server -; -; Looks like a better CLI parser than "racket/cmdline": -; https://docs.racket-lang.org/natural-cli/ - #lang racket (require openssl/sha1) @@ -61,25 +22,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 '())) @@ -91,19 +52,27 @@ [xs (range 11)] [actual (sort (concurrent-filter-map 10 f xs) <)] [expected (sort ( filter-map f xs) <)]) - (check-equal? actual expected "concurrent-filter-map"))) + (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))]) - (date->string (seconds->date [msg-ts_epoch msg]) #t) - (msg-nick msg) - (msg-uri msg) - (if odd 36 33) - (msg-text msg))) +(define msg-print + (let* ([colors (vector 36 33)] + [n (vector-length colors)]) + (λ (out-format color-i msg) + (let ([color (vector-ref colors (modulo color-i n))] + [nick (msg-nick msg)] + [uri (msg-uri msg)] + [text (msg-text msg)]) + (match out-format + ['single-line + (printf "~a \033[1;37m<~a>\033[0m \033[0;~am~a\033[0m~n" + (parameterize ([date-display-format 'iso-8601]) + (date->string (seconds->date [msg-ts_epoch msg]) #t)) + nick color text)] + ['multi-line + (printf "~a~n\033[1;37m<~a ~a>\033[0m~n\033[0;~am~a\033[0m~n~n" + (parameterize ([date-display-format 'rfc2822]) + (date->string (seconds->date [msg-ts_epoch msg]) #t)) + nick uri color text)]))))) (define re-msg-begin ; TODO Zulu offset. Maybe in several formats. Which ones? @@ -115,22 +84,22 @@ (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)] + [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)))))) (module+ test (let* ([ts "2020-11-18T22:22:09-0500"] @@ -140,27 +109,27 @@ [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"))) + ; 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]+"))) @@ -186,23 +155,28 @@ (file->string cache-file-path)) (begin (log-info "uri-fetch new ~a" uri) + ; TODO Timeout. Currently hangs on slow connections. (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] - [i (in-naturals)]) - (msg-print out-format (odd? i) msg))) + (void (foldl (match-lambda** + [((and m (msg _ _ nick _ _)) (cons prev-nick i)) + (let ([i (if (string=? prev-nick nick) i (+ 1 i))]) + (msg-print out-format i m) + (cons nick i))]) + (cons "" 0) + timeline))) (define (feed->msgs use-cache feed) (log-info "downloading feed nick:~a uri:~a" @@ -249,52 +223,68 @@ [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))) +(define (start-logger level) + (let* ([logger (make-logger #f #f level #f)] + [log-receiver (make-log-receiver logger level)]) + (void (thread (λ () + (parameterize + ([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))) + (module+ main (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) + (current-http-user-agent user-agent)) (let* ([use-cache #f] + [log-level + 'info] [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)] + (command-line + #:once-each + [("-c" "--cached") + "Read cached data instead of downloading." + (set! use-cache #t)] + + [("-d" "--debug") + "Enable debug log level." + (set! log-level 'debug)] + + [("-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))] + #:once-any + [("-s" "--short") + "Short output format" + (set! out-format 'single-line)] - #:args (filename) + [("-l" "--long") + "Long output format" + (set! out-format 'multi-line)] - (timeline-print out-format - (timeline use-cache - num_workers - (file->feeds filename)))))) + #:args (filename) + (start-logger log-level) + (timeline-print out-format + (timeline use-cache + num_workers + (file->feeds filename))))))