X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=tt.rkt;h=098a08e76b1e311c82439b401a8ab7eb6eb1ec64;hb=d96fa613f6c040ed645c597076235f017fcbc05b;hp=ebbecad620ca9d40edd400e9f2181c500225176a;hpb=c562bea34f7222f86fbcd8b885ec91533039f417;p=tt.git diff --git a/tt.rkt b/tt.rkt index ebbecad..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) @@ -93,17 +54,25 @@ [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))]) - (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? @@ -186,6 +155,7 @@ (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)]) @@ -200,9 +170,13 @@ (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" @@ -254,30 +228,33 @@ ) (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) (let* ([use-cache #f] + [log-level + 'info] [out-format 'multi-line] [num_workers @@ -288,12 +265,25 @@ "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))] - #:args (filename) + #:once-any + [("-s" "--short") + "Short output format" + (set! out-format 'single-line)] + [("-l" "--long") + "Long output format" + (set! out-format 'multi-line)] + + #:args (filename) + (start-logger log-level) (timeline-print out-format (timeline use-cache num_workers