Array dump support. Create access function package xdump-data.

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 062c0fe960964ed642936ee318c853135efe133a..7ac17d498cb742fa7857f912341bc389cb9d882b 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -9,6 +9,8 @@
 (defvar *default-empire-server* "localhost")
 (defvar *default-empire-server-port* 6665)
 
+(defvar *last-active-connection* nil)
+
 (defclass connection ()
   ((user
     :initarg :user
@@ -48,7 +50,8 @@
    (send-queue
     :accessor send-queue
     :initform (locked-queue:create)
-    :documentation "lines outstanding to be sent at next prompt")))
+    :documentation "lines outstanding to be sent at next prompt")
+   (xdump :accessor xdump :initform (xdump:make-parser))))
 
 (defun make-connection (&key (user nil)
                        (password nil)
@@ -180,6 +183,10 @@
       (:kill-sent (send-message-one connection "play")
                  (setf phase :play-sent)))))
 
+(defmethod handle-data ((m init-mode) message)
+  (declare (ignorable message))
+  t)
+
 (defmethod handle-exit ((m play-mode) message)
   (declare (ignorable message))
   (quit (connection m)))
@@ -204,13 +211,17 @@
       (cons (let ((message (car next-event))
                  (mode (cdr next-event)))
              (send-message-one c message)
-             (set-new-mode c mode))))))
+             (set-new-mode (connection-mode c) mode))))))
+
+(defun read-no-eval (stream)
+  (let ((*read-eval* nil))
+    (read stream)))
 
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))
     (with-input-from-string (s message)
-      (let* ((minutes (read s)) ;;FIXME DANGEROUS
-            (btus (read s)))
+      (let* ((minutes (read-no-eval s))
+            (btus (read-no-eval s)))
        (empire-web:prompt (session c)
                           (format nil "[~a,~a]: " minutes btus))))
     (send-next-line c)))
@@ -259,6 +270,7 @@
       (let* ((s (network-stream c))
             (line (read-line s)))
        (empire-log:info "~a: < ~a" c line)
+       (setf *last-active-connection* c)
        (multiple-value-bind (message type) (parse-server-line line)
          (let ((handler (lookup-handler type))
                (mode (connection-mode c)))
@@ -267,6 +279,7 @@
                (error 'no-handler :mode mode :type type))))
        line)
     (sb-int:closed-stream-error () nil)
+    (sb-int:simple-stream-error () nil)
     (end-of-file () nil)))
 
 (defun raw-send-message (s message)
@@ -277,6 +290,7 @@
 (defgeneric send-message-one (connection string))
 (defmethod send-message-one ((c connection) message)
   (empire-log:info "~a: > ~a" c message)
+  (setf *last-active-connection* c)
   (let ((s (network-stream c)))
     (raw-send-message s message)))
 
@@ -293,8 +307,55 @@
   (and (> (length line) 0)
        (char= +special-command-char+ (aref line 0))))
 
+(defclass xdump-mode (play-mode)
+  ((phase :initform :meta-meta)
+   (dump-queue :initform nil)
+   (dump-index :initform 0)))
+
+(defmethod handle-data ((m xdump-mode) message)
+  (with-slots (connection phase dump-queue dump-index) m
+    (xdump:with-parser (xdump connection)
+      (if (xdump:parse-line (xdump connection) message)
+         ;;XXX consider something like a 'pop-mode function
+         (ccase phase
+           (:meta-meta 
+            (setf phase :meta-table)
+            (send-message connection "xdump meta table"))
+           (:meta-table
+            (setf phase :table-table)
+            (send-message connection "xdump table *"))
+           (:table-table
+            (setf phase :meta-type)
+            (send-message connection "xdump meta meta-type"))
+           (:meta-type
+            (setf phase :type-table)
+            (send-message connection "xdump meta-type *"))
+           (:type-table
+            (setf phase :tables-meta
+                  dump-queue (xdump::table-entries (xdump:table "table"))
+                  dump-index 0)
+            (send-message connection (format nil "xdump meta ~a" (xdump-data:name (aref dump-queue 0)))))
+           (:tables-meta
+            (setf phase :tables-content)
+            (send-message connection (format nil "xdump ~a *" (xdump-data:name (aref dump-queue dump-index)))))
+           (:tables-content
+            (if (< dump-index (fill-pointer dump-queue))
+                (progn (setf phase :tables-meta)
+                       (incf dump-index)
+                       (loop while (and (< dump-index (fill-pointer dump-queue))
+                                        (let ((dump-queue-entry (aref dump-queue dump-index)))
+                                          (or (null dump-queue-entry)
+                                              (string= "meta"
+                                                       (xdump-data:name dump-queue-entry)))))
+                          do (incf dump-index))
+                       (if (and (<= dump-index (fill-pointer dump-queue))
+                                (not (null (aref dump-queue dump-index))))
+                           (send-message connection (format nil "xdump meta ~a" (xdump-data:name (aref dump-queue dump-index))))))
+                (set-new-mode (connection-mode connection) 'play-mode))))))))
+
 (defmethod special-xup ((c connection))
-  t)
+  (setf (xdump c) (xdump:make-parser))
+  (send-message c "xdump meta meta" :next-mode 'xdump-mode))
 
 (defmethod special-command ((c connection) line)
   (cond ((string= line "xup") (special-xup c))