From e8ca900ad6971f26777f1641d2e7f42b5d81810a Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Mon, 13 Jul 2015 17:46:37 -0700
Subject: [PATCH] aesthetic improvement

---
 arvo/dill.hoon      |  2 +-
 cat/hood/mount.hoon |  7 +++++--
 dog/hood/begin.hoon |  8 ++++++--
 lib/drum.hoon       |  6 +++---
 lib/kiln.hoon       | 33 ++++++++++++++++++---------------
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/arvo/dill.hoon b/arvo/dill.hoon
index 468f55f2e..f82cc5e5c 100644
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@@ -360,7 +360,7 @@
           [~ ~]
           80
           0
-          (tuba "<awaiting {(trip p.kyz)}>")
+          (tuba "<awaiting {(trip p.kyz)}, this may take a few minutes>")
       ==
     --
 |%                                                      ::  poke/peek pattern
diff --git a/cat/hood/mount.hoon b/cat/hood/mount.hoon
index 485dfb97d..0ec2b8328 100644
--- a/cat/hood/mount.hoon
+++ b/cat/hood/mount.hoon
@@ -6,7 +6,10 @@
 ::::
   !:
 |=  $:  [now=@da eny=@uvI bec=beak]
-        [arg=[pax=path pot=@tas ~] ~]
+        [[pax=path pot=$|(~ [v=@tas ~])] ~]
     ==
+?~  pot
+  =+  bem=(need (tome pax))
+  $(pot ~[?^(s.bem i.s.bem q.bem)])
 :-  %kiln-mount
-[pax pot]:arg
+[pax v.pot]
diff --git a/dog/hood/begin.hoon b/dog/hood/begin.hoon
index 0a98967a1..cb8e8b41f 100644
--- a/dog/hood/begin.hoon
+++ b/dog/hood/begin.hoon
@@ -7,12 +7,16 @@
 ::::
   !:
 =>  |%
-    ++  begs  ,[his=@p tic=@p yen=@t ges=gens]
+    ++  begs  ,[his=@p tic=@p yen=@uw ges=gens]
     --
 |=  $:  [now=@da eny=@uvI bec=beak]
-        [~ ~]
+        [arg=$|(~ [his=@p $|(~ [tic=@p ~])]) ~]
     ==
 ^-  (sole-result (cask begs))
+=-  ?~  arg  -
+    =+  (fun.q.q his.arg)
+    ?~  +.arg  -
+    (fun.q.q tic.arg)
 %+  sole-lo
   [%& %helm-begin "your ship: ~"]
 %+  sole-go  fed:ag
diff --git a/lib/drum.hoon b/lib/drum.hoon
index 67f442abf..10f7bc3e1 100644
--- a/lib/drum.hoon
+++ b/lib/drum.hoon
@@ -63,7 +63,7 @@
   %-  ~(gas in *(set well))
   =+  myr=(clan our)
   ?:  =(%pawn myr)
-    [[%base %dojo] ~]
+    [[%base %talk] [%base %dojo] ~]
   ?:  =(%earl myr)  ~
   [[%home %talk] [%home %dojo] ~]
 ::
@@ -72,8 +72,8 @@
   %-  ~(gas in *(set gill))
   ^-  (list gill)
   =+  myr=(clan our)
-  ?:  =(%pawn myr)
-    [[our %dojo] ~]
+  :: ?:  =(%pawn myr)
+  ::   [[our %dojo] ~]
   ?:  =(%earl myr)
     =+  dad=(sein our)
     [[dad %talk] [dad %dojo] ~]
diff --git a/lib/kiln.hoon b/lib/kiln.hoon
index b79122166..06f939615 100644
--- a/lib/kiln.hoon
+++ b/lib/kiln.hoon
@@ -79,6 +79,11 @@
     ^+  +>
     ?~(+< +> $(+< t.+<, +> (emit i.+<)))
   ::
+  ++  render
+    |=  [mez=tape sud=desk who=ship syd=desk]
+    :^  %palm  [" " ~ ~ ~]  leaf/mez
+    ~[leaf/"from {<sud>}" leaf/"on {<who>}" leaf/"to {<syd>}"]
+  ::
   ++  poke-mount
     |=  kiln-mount
     =+  bem=(tome pax)
@@ -100,15 +105,13 @@
   ++  poke-sync                                         ::
     |=  hos=kiln-sync
     ?:  (~(has by syn) hos)
-      =+  "already syncing from {<sud.hos>} on {<her.hos>} to {<syd.hos>}"
-      abet:(spam leaf/- ~)
+      abet:(spam (render "already syncing" [sud her syd]:hos) ~)
     abet:abet:start:(auto hos)
   ::
   ++  poke-unsync                                         ::
     |=  hus=kiln-unsync
     ?.  (~(has by syn) hus)
-      =+  "not syncing from {<sud.hus>} on {<her.hus>} to {<syd.hus>}"
-      abet:(spam leaf/- ~)
+      abet:(spam (render "not syncing" [sud her syd]:hus) ~)
     %*  .  abet:abet:stop:(auto hus)
       syn  (~(del by syn) hus)
     ==
@@ -182,8 +185,9 @@
   ::
   ++  spam
     |=  mes=(list tank)
-    %-  emit
-    [%poke /kiln/spam [our %talk] (said our %kiln now eny mes)]
+    ((slog 0 mes) ..spam)
+    :: %-  emit :: XX not displayed/immediately
+    :: [%poke /kiln/spam [our %talk] (said our %kiln now eny mes)]
   ::
   ++  auto
     |=  kiln-sync
@@ -199,7 +203,7 @@
     ::
     ++  spam  |*(* %_(+> ..auto (^spam +<)))
     ++  stop
-      =>  (spam leaf/"ended autosync from {<sud>} on {<her>} to {<syd>}" ~)
+      =>  (spam (render "ended autosync" sud her syd) ~)
       %-  blab  :_  ~
       :*  ust  %warp
           /kiln/sync/[syd]/(scot %p her)/[sud]
@@ -207,8 +211,7 @@
       ==
     ::
     ++  start
-      =.  .  %-  spam
-             [leaf/"activated sync from {<sud>} on {<her>} to {<syd>}" ~]
+      =>  (spam (render "activated sync" sud her syd) ~)
       %-  blab
       :~  ::  [ost %mont /mount syd our syd /]
           :*  ost  %warp
@@ -220,8 +223,8 @@
       |=  rot=riot
       ?~  rot
         %^    spam
-            leaf/"bad %writ response on sync"
-          leaf/"from {<sud>} on {<her>} to {<syd>}"
+            leaf/"bad %writ response"
+          (render "on sync" sud her syd)
         ~
       =.  let  ?.  ?=(%w p.p.u.rot)  let  ((hard ,@ud) q.q.r.u.rot)
       %-  blab  :_  ~
@@ -239,9 +242,9 @@
       =.  +>.$
         %-  spam
         ?:  ?=(%& -.mes)
-          [leaf/"sync succeeded from {<sud>} on {<her>} to {<syd>}" ~]
+          [(render "sync succeeded" sud her syd) ~]
         ?+  p.p.mes
-          :*  leaf/"sync failed from {<sud>} on {<her>} to {<syd>}"
+          :*  (render "sync failed" sud her syd)
               leaf/"please manually merge the desks with"
               leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
               leaf/""
@@ -250,8 +253,8 @@
           ==
         ::
             %no-ali-desk
-          :~  leaf/"sync activated from {<sud>} on {<her>} to {<syd>}"  
-              leaf/"note: {<sud>} on {<her>} is a blank desk"
+          :~  (render "sync activated" sud her syd)  
+              leaf/"note: blank desk {<sud>} on {<her>}"
           ==
         ==
       %-  blab  :_  ~