X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=tt.rkt;h=e834505d6ffa79d0c9a727649a13779d084b508c;hb=a1473e3d2d87e21231bc57d9f320f0fbf6ec378a;hp=ebbecad620ca9d40edd400e9f2181c500225176a;hpb=c562bea34f7222f86fbcd8b885ec91533039f417;p=tt.git diff --git a/tt.rkt b/tt.rkt index ebbecad..e834505 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,46 +54,78 @@ [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? - (pregexp "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}")) +; TODO Implement rfc3339->epoch and remove dependency on rfc3339-old -(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) +(define str->msg + (let ([re (pregexp "^([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}(:[0-9]{2})?)(\\.[0-9]+)?([^\\s\t]*)[\\s\t]+(.*)$")]) + (λ (nick uri str) + (with-handlers* + ([exn:fail? + (λ (e) + (log-error "Failed to parse msg: ~v, from: ~v, at: ~v, because: ~v" str nick uri e) + #f)]) + (match (regexp-match re str) + [(list _wholething ts s _fractional tz text) (let* - ([ts_rfc3339 (first toks)] - [text (second toks)] + ([ts_rfc3339 (string-append ts (if s "" ":00") (if tz tz ""))] [t (string->rfc3339-record ts_rfc3339)] + [s (rfc3339-record:second t)] ; TODO handle tz offset - [ts_epoch (find-seconds [rfc3339-record:second t] + [ts_epoch (find-seconds [if s s 0] [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)))))) + (msg ts_epoch ts_rfc3339 nick uri text))] + [_ + (log-debug "Non-msg line from nick:~a, line:~a" nick str) + #f]))))) (module+ test + (let* ([tzs (for*/list ([d '("-" "+")] + [h '("5" "05")] + [m '("00" ":00" "57" ":57")]) + (string-append d h m))] + [tzs (list* "" "Z" tzs)]) + (for* ([n '("fake-nick")] + [u '("fake-uri")] + [s '("" ":10")] + [f '("" ".1337")] + [z tzs] + [sep (list "\t" " ")] + [txt '("foo bar baz" "'jaz poop bear giraffe / tea" "@*\"``")]) + (let* ([ts (string-append "2020-11-18T22:22" + (if (non-empty-string? s) s ":00") + z)] + [m (str->msg n u (string-append ts sep txt))]) + (check-not-false m) + (check-equal? (msg-nick m) n) + (check-equal? (msg-uri m) u) + (check-equal? (msg-text m) txt) + (check-equal? (msg-ts_rfc3339 m) ts (format "Given: ~v" ts)) + ))) + (let* ([ts "2020-11-18T22:22:09-0500"] [tab " "] [text "Lorem ipsum"] @@ -186,6 +179,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 +194,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" @@ -236,8 +234,11 @@ (define toks (string-split str)) (apply feed toks)) +(define (filter-comments lines) + (filter-not (λ (line) (string-prefix? line "#")) lines)) + (define (str->feeds str) - (map str->feed (str->lines str))) + (map str->feed (filter-comments (str->lines str)))) (define (file->feeds filename) (str->feeds (file->string filename))) @@ -254,47 +255,74 @@ ) (format "~a/~a (~a)" prog-name prog-version user))) -(module+ main - (require setup/getinfo) - - (let* ([level 'info] - [logger (make-logger #f #f level #f)] +(define (start-logger level) + (let* ([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))] + (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))) - #:args (filename) +(module+ main + (require (prefix-in info: setup/getinfo)) - (timeline-print out-format - (timeline use-cache - num_workers - (file->feeds filename)))))) + (let ([log-level 'info]) + (command-line + #:program + "tt" + #:once-each + [("-d" "--debug") + "Enable debug log level." + (set! log-level 'debug)] + #:help-labels + "" + "and is one of" + "r, read : Read the timeline." + "" + #:args (command . args) + (match command + [(or "r" "read") + (current-command-line-arguments (list->vector args)) + (let ([use-cache + #f] + [out-format + 'multi-line] + [num_workers + ; 15 was fastest out of the tried 1, 5, 10, 15 and 20. + 15]) + (command-line + #:program + "tt read" + #:once-each + [("-j" "--jobs") + njobs "Number of concurrent jobs." + (set! num_workers (string->number njobs))] + [("-c" "--cached") + "Read cached data instead of downloading." + (set! use-cache #t)] + #: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) + (current-http-client/response-auto #f) + (let* ([prog-name "tt"] + [prog-version ((info:get-info (list prog-name)) 'version)] + [user-agent (user-agent prog-name prog-version)]) + (current-http-client/user-agent user-agent)) + (timeline-print out-format + (timeline use-cache + num_workers + (file->feeds filename)))))] + ))))