From 594d78564127ac91f99d603532ba3d2e16edc5c1 Mon Sep 17 00:00:00 2001
From: haskal <haskal@awoo.systems>
Date: Mon, 4 Jan 2021 03:01:33 -0500
Subject: [PATCH] implement streaming for cli agent -c

---
 crossfire/client.rkt | 9 +++++----
 crossfire/server.rkt | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/crossfire/client.rkt b/crossfire/client.rkt
index dc3a270..6f83a3d 100644
--- a/crossfire/client.rkt
+++ b/crossfire/client.rkt
@@ -238,11 +238,11 @@
                   (~a (string-join (map ~a (sort (node-info-resources info) string<?)) ", "))
                   detailed-status)))))
 
-(define (cmd-agent-create name arch resources out-port)
+(define (cmd-agent-create name arch resources out-port [progress-func void])
   (with-server-connection
     (define id (new-agent name arch resources))
-    ;; TODO : streaming
-    (write-bytes (get-agent-deployment id) out-port)
+    (define ft (get-agent-deployment id))
+    (file-transfer-connect ft out-port progress-func)
     id))
 
 (define (cmd-agent-delete id)
@@ -409,7 +409,8 @@
          (define out-name (make-random-filename))
          (call-with-output-file out-name
            (lambda (o)
-             (define aid (cmd-agent-create (flag-agent-name) (flag-agent-arch) (flag-agent-res) o))
+             (define aid (cmd-agent-create (flag-agent-name) (flag-agent-arch) (flag-agent-res) o print-progress))
+             (finish-progress)
              (report-status "created agent ~a" aid)))
          (do-final out-name)]
         [(list 'delete aid-str)
diff --git a/crossfire/server.rkt b/crossfire/server.rkt
index 124af53..a82be89 100644
--- a/crossfire/server.rkt
+++ b/crossfire/server.rkt
@@ -262,7 +262,6 @@
 
 (define/contract (get-agent-deployment id)
   (-> integer? file-transfer?)
-  ;; TODO : streaming interface
   (enforce-subject 'client)
   (define-values [agent-node arch] (load-comms-node id #t #t))
   (match (node-type agent-node)
@@ -371,7 +370,6 @@
 
 (define/contract (get-project-file taskid)
   (-> integer? file-transfer?)
-  ;; TODO : streaming interface
   (match (server-get-file taskid)
     [#f (error "no such project file")]
     [port (make-file-transfer port)]))