home
/
code
/
tt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
13c1172
)
Rename feed to peer
author
Siraaj Khandkar
<siraaj@khandkar.net>
Tue, 23 Mar 2021 02:37:55 +0000
(22:37 -0400)
committer
Siraaj Khandkar
<siraaj@khandkar.net>
Tue, 23 Mar 2021 02:37:55 +0000
(22:37 -0400)
tt.rkt
patch
|
blob
|
blame
|
history
diff --git
a/tt.rkt
b/tt.rkt
index
b99a45e
..
640e542
100644
(file)
--- a/
tt.rkt
+++ b/
tt.rkt
@@
-30,13
+30,12
@@
[nick : (Option String)]
[uri : Url]
[text : String]
[nick : (Option String)]
[uri : Url]
[text : String]
- [mentions : (Listof
Feed
)])
+ [mentions : (Listof
Peer
)])
#:type-name Msg)
#:type-name Msg)
-(struct
feed
+(struct
Peer
([nick : (Option String)]
([nick : (Option String)]
- [uri : Url])
- #:type-name Feed)
+ [uri : Url]))
(: tt-home-dir Path-String)
(define tt-home-dir (build-path (expand-user-path "~") ".tt"))
(: tt-home-dir Path-String)
(define tt-home-dir (build-path (expand-user-path "~") ".tt"))
@@
-166,7
+165,7
@@
(filter-map
(λ (m) (match (regexp-match #px"@<([^>]+)>" m)
[(list _wholething nick-uri)
(filter-map
(λ (m) (match (regexp-match #px"@<([^>]+)>" m)
[(list _wholething nick-uri)
- (str->
feed
nick-uri)]))
+ (str->
peer
nick-uri)]))
(regexp-match* #px"@<[^\\s]+([\\s]+)?[^>]+>" text))])
(msg ts-epoch ts-orig nick uri text mentions))
(begin
(regexp-match* #px"@<[^\\s]+([\\s]+)?[^>]+>" text))])
(msg ts-epoch ts-orig nick uri text mentions))
(begin
@@
-273,19
+272,19
@@
(log-warning "Cache file not found for URI: ~a" (url->string uri))
"")))
(log-warning "Cache file not found for URI: ~a" (url->string uri))
"")))
-(: str->
feed (String (Option Feed
)))
-(define (str->
feed
str)
- (log-debug "Parsing
feed
string: ~v" str)
+(: str->
peer (String (Option Peer
)))
+(define (str->
peer
str)
+ (log-debug "Parsing
peer
string: ~v" str)
(with-handlers*
([exn:fail?
(λ (e)
(log-error "Invalid URI in string: ~v, exn: ~v" str e)
#f)])
(match (string-split str)
(with-handlers*
([exn:fail?
(λ (e)
(log-error "Invalid URI in string: ~v, exn: ~v" str e)
#f)])
(match (string-split str)
- [(list u) (
feed
#f (string->url u))]
- [(list n u) (
feed
n (string->url u))]
+ [(list u) (
Peer
#f (string->url u))]
+ [(list n u) (
Peer
n (string->url u))]
[_
[_
- (log-error "Invalid
feed
string: ~v" str)
+ (log-error "Invalid
peer
string: ~v" str)
#f])))
#f])))
@@
-293,13
+292,13
@@
(define (filter-comments lines)
(filter-not (λ (line) (string-prefix? line "#")) lines))
(define (filter-comments lines)
(filter-not (λ (line) (string-prefix? line "#")) lines))
-(: str->
feeds (-> String (Listof Feed
)))
-(define (str->
feed
s str)
- (filter-map str->
feed
(filter-comments (str->lines str))))
+(: str->
peers (-> String (Listof Peer
)))
+(define (str->
peer
s str)
+ (filter-map str->
peer
(filter-comments (str->lines str))))
-(: file->
feeds (-> Path-String (Listof Feed
)))
-(define (file->
feed
s filename)
- (str->
feed
s (file->string filename)))
+(: file->
peers (-> Path-String (Listof Peer
)))
+(define (file->
peer
s filename)
+ (str->
peer
s (file->string filename)))
(: user-agent String)
(define user-agent
(: user-agent String)
(define user-agent
@@
-307,12
+306,12
@@
([prog-name "tt"]
[prog-version (info:#%info-lookup 'version)]
[prog-uri "https://github.com/xandkar/tt"]
([prog-name "tt"]
[prog-version (info:#%info-lookup 'version)]
[prog-uri "https://github.com/xandkar/tt"]
- [user-
feed
-file (build-path tt-home-dir "me")]
+ [user-
peer
-file (build-path tt-home-dir "me")]
[user
[user
- (if (file-exists? user-
feed
-file)
- (match (first (file->
feeds user-feed
-file))
- [(
feed
#f u) (format "+~a" (url->string u) )]
- [(
feed
n u) (format "+~a; @~a" (url->string u) n)])
+ (if (file-exists? user-
peer
-file)
+ (match (first (file->
peers user-peer
-file))
+ [(
Peer
#f u) (format "+~a" (url->string u) )]
+ [(
Peer
n u) (format "+~a; @~a" (url->string u) n)])
(format "+~a" prog-uri))])
(format "~a/~a (~a)" prog-name prog-version user)))
(format "+~a" prog-uri))])
(format "~a/~a (~a)" prog-name prog-version user)))
@@
-359,17
+358,17
@@
(cons "" 0)
timeline)))
(cons "" 0)
timeline)))
-(:
feed->msgs (-> Feed
(Listof Msg)))
-(define (
feed
->msgs f)
- (match-define (
feed
nick uri) f)
- (log-info "Reading
feed
nick:~v uri:~v" nick (url->string uri))
+(:
peer->msgs (-> Peer
(Listof Msg)))
+(define (
peer
->msgs f)
+ (match-define (
Peer
nick uri) f)
+ (log-info "Reading
peer
nick:~v uri:~v" nick (url->string uri))
(str->msgs nick uri (uri-read-cached uri)))
(str->msgs nick uri (uri-read-cached uri)))
-(:
feed-download (-> Feed
Void))
-(define (
feed
-download f)
- (match-define (
feed
nick uri) f)
+(:
peer-download (-> Peer
Void))
+(define (
peer
-download f)
+ (match-define (
Peer
nick uri) f)
(define u (url->string uri))
(define u (url->string uri))
- (log-info "Downloading
feed
uri:~a" u)
+ (log-info "Downloading
peer
uri:~a" u)
(with-handlers
([exn:fail?
(λ (e)
(with-handlers
([exn:fail?
(λ (e)
@@
-381,20
+380,20
@@
#f)])
(define-values (_result _tm-cpu-ms tm-real-ms _tm-gc-ms)
(time-apply uri-download (list uri)))
#f)])
(define-values (_result _tm-cpu-ms tm-real-ms _tm-gc-ms)
(time-apply uri-download (list uri)))
- (log-info "
Feed
downloaded in ~a seconds, uri: ~a" (/ tm-real-ms 1000.0) u)))
+ (log-info "
Peer
downloaded in ~a seconds, uri: ~a" (/ tm-real-ms 1000.0) u)))
-(: timeline-download (-> Integer (Listof
Feed
) Void))
-(define (timeline-download num-workers
feed
s)
+(: timeline-download (-> Integer (Listof
Peer
) Void))
+(define (timeline-download num-workers
peer
s)
; TODO No need for map - can just iter
; TODO No need for map - can just iter
- (void (concurrent-filter-map num-workers
feed-download feed
s)))
+ (void (concurrent-filter-map num-workers
peer-download peer
s)))
; TODO timeline contract : time-sorted list of messages
; TODO timeline contract : time-sorted list of messages
-(: timeline-read (-> Timeline-Order (Listof
Feed
) (Listof Msg)))
-(define (timeline-read order
feed
s)
+(: timeline-read (-> Timeline-Order (Listof
Peer
) (Listof Msg)))
+(define (timeline-read order
peer
s)
(define cmp (match order
['old->new <]
['new->old >]))
(define cmp (match order
['old->new <]
['new->old >]))
- (sort (append* (filter-map
feed->msgs feed
s))
+ (sort (append* (filter-map
peer->msgs peer
s))
(λ (a b) (cmp (msg-ts-epoch a) (msg-ts-epoch b)))))
(: log-writer-stop (-> Thread Void))
(λ (a b) (cmp (msg-ts-epoch a) (msg-ts-epoch b)))))
(: log-writer-stop (-> Thread Void))
@@
-455,7
+454,7
@@
(set! num-workers (string->number njobs))]
#:args (filename)
(define-values (_res _cpu real-ms _gc)
(set! num-workers (string->number njobs))]
#:args (filename)
(define-values (_res _cpu real-ms _gc)
- (time-apply timeline-download (list num-workers (file->
feed
s filename))))
+ (time-apply timeline-download (list num-workers (file->
peer
s filename))))
(log-info "Timeline downloaded in ~a seconds." (/ real-ms 1000.0))
(log-writer-stop log-writer)))]
[(or "u" "upload")
(log-info "Timeline downloaded in ~a seconds." (/ real-ms 1000.0))
(log-writer-stop log-writer)))]
[(or "u" "upload")
@@
-484,5
+483,5
@@
"Long output format"
(set! out-format 'multi-line)]
#:args (filename)
"Long output format"
(set! out-format 'multi-line)]
#:args (filename)
- (timeline-print out-format (timeline-read order (file->
feed
s filename)))))]
+ (timeline-print out-format (timeline-read order (file->
peer
s filename)))))]
))))
))))
This page took
0.029517 seconds
and
4
git commands to generate.