add irc-line type, switch to (match) for handle-line

[8sync.git] / demos / irc.scm

diff --git a/demos/irc.scm b/demos/irc.scm
index 2ff8c8cfda8360003f7dc90cc2ec6e521f8b3053..b6a992cdf19e5be2148b7a8e92ec4f22e3728f0b 100755 (executable)
--- a/demos/irc.scm
+++ b/demos/irc.scm
@@ -21,6 +21,7 @@
 
 (use-modules (eightsync repl)
              (eightsync agenda)
+             (srfi srfi-9)
              (ice-9 getopt-long)
              (ice-9 format)
              (ice-9 q)
@@ -78,11 +79,72 @@
      (irc-format socket "JOIN ~a" channel))
    channels))
 
-(define (handle-line socket line)
-  (display line)
-  (newline))
-
-(define (make-simple-irc-handler handle-line)
+(define (startswith-colon? str)
+  (and (> (string-length str) 0)
+       (eq? (string-ref str 0)
+            #\:)))
+
+(define-record-type <irc-line>
+  (make-irc-line prefix command params)
+  irc-line?
+  (prefix irc-line-prefix)
+  (command irc-line-command)
+  (params irc-line-params))
+
+
+(define (parse-line line)
+  (define (parse-params pre-params)
+    ;; This is stupid and imperative but I can't wrap my brain around
+    ;; the right way to do it in a functional way :\
+    (let ((param-list '())
+          (currently-building '()))
+      (for-each
+       (lambda (param-item)
+         (cond
+          ((startswith-colon? param-item)
+           (if (not (eq? currently-building '()))
+               (set! param-list
+                     (cons
+                      (reverse currently-building)
+                      param-list)))
+           (set! currently-building (list param-item)))
+          (else
+           (set! currently-building (cons param-item currently-building)))))
+       pre-params)
+      ;; We're still building something, so tack that on there
+      (if (not (eq? currently-building '()))
+          (set! param-list
+                (cons (reverse currently-building) param-list)))
+      ;; return the reverse of the param list
+      (reverse param-list)))
+
+  (match (string-split line #\space)
+    (((? startswith-colon? prefix)
+      command
+      pre-params ...)
+     (make-irc-line prefix command
+                    (parse-params pre-params)))
+    ((command pre-params ...)
+     (make-irc-line #f command
+                    (parse-params pre-params)))))
+
+
+(define (handle-line socket line my-username)
+  (let ((parsed-line (parse-line line)))
+    (match (irc-line-command parsed-line)
+      ("PING"
+       (irc-display "PONG" socket))
+      ("PRIVMSG"
+       (display "hey we got a PRIVMSG up in here!\n")
+       (display parsed-line)
+       (newline)
+       (display line)
+       (newline))
+      (_
+       (display line)
+       (newline)))))
+
+(define (make-simple-irc-handler handle-line username)
   (let ((buffer '()))
     (define (reset-buffer)
       (set! buffer '()))
@@ -95,7 +157,8 @@
           ((#\newline #\return (? char? line-chars) ...)
            (%sync (%run (handle-line
                          socket
-                         (list->string (reverse line-chars)))))
+                         (list->string (reverse line-chars))
+                         username)))
            ;; reset buffer
            (set! buffer '()))
           (_ #f))))
@@ -104,7 +167,10 @@
 (define* (queue-and-start-irc-agenda! agenda socket #:key
                                       (username "syncbot")
                                       (inet-port default-irc-port)
-                                      (handler (make-simple-irc-handler handle-line))
+                                      (handler (make-simple-irc-handler
+                                                (lambda args
+                                                  (apply handle-line args))
+                                                username))
                                       (channels '()))
   (dynamic-wind
     (lambda () #f)
@@ -152,5 +218,4 @@
      (irc-socket-setup hostname port)
      #:inet-port port
      #:username username
-     #:handler (make-simple-irc-handler handle-line)
      #:channels (string-split channels #\space))))