From fb8c73e39accb99370bde3d472d8b82c4f153310 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Mon, 20 Sep 2021 13:01:48 -0400
Subject: [PATCH] zuse,clay: WIP +migrate-dist

---
 pkg/arvo/sys/vane/clay.hoon | 32 ++++++++++++++++++--------------
 pkg/arvo/sys/zuse.hoon      | 15 +++++++++++++++
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index cf86b636b..fc7139f3a 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -1574,27 +1574,31 @@
     =.  mim.dom  (apply-changes-to-mim mim.dom mim)
     =.  fod.dom  ford-cache.args
     =.  ..park  (emil (print q.old-yaki data))
+    ::  TODO: replace with .dist-upgraded=? state
     ::
     =?  ..park  &(updated =(%420 zuse))  migrate-dist
     ::
     wake:(ergo mim)
     ::
     ++  migrate-dist
-      ^+  ..park
-      ::  TODO: filter +park's yaki by path prefix, call +make-yaki?
-      =/  base=ankh  (~(dug an ank.dom) /tmp/base)
-      =/  garden=ankh  (~(dug an ank.dom) /tmp/garden)
-      %-  emil
-      :~  [hen %pass /dist/base %c %park %base base]
-          :*  hen  %pass  /dist/base  %g  %deal  [our %hood]
-              %kiln-install  %base  our  %base
-          ==
+      |^  ^+  ..park
+      =.  ..park  (install-from-tmp %base)
+      =.  ..park  (install-from-tmp %garden)
+      =.  ..park  (install-from-tmp %landscape)
+      ..park
       ::
-          [hen %pass /dist/garden %c %dart %garden garden]
-          :*  hen  %pass  /dist/garden  %g  %deal  [our %hood]
-              %kiln-install  %garden  our  %garden
-          ==
-      ==
+      ++  install-from-tmp
+        |=  =desk
+        %-  emil
+        :~  :^  hen  %pass  /dist/[desk]/create
+            %-  new-desk:cloy
+            %-  ~(run by (~(mup an:cloy ank.dom) /tmp/[desk]))
+            |=([* =mark * =noun] [mark noun]))
+        ::
+            :^  hen  %pass  /dist/[desk]/install
+            [%g %deal [our %hood] %kiln-install desk our desk]
+        ==
+      --
     ::  +is-kernel-path: should changing .pax cause a kernel or vane reload?
     ::
     ++  is-kernel-path  |=(pax=path ?=([%sys *] pax))
diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon
index 4bb3221f8..b406f9bb6 100644
--- a/pkg/arvo/sys/zuse.hoon
+++ b/pkg/arvo/sys/zuse.hoon
@@ -3734,6 +3734,10 @@
 ++  cloy
   =,  clay
   |%
+  ++  new-desk
+    |=  [=desk files=(map path page)]
+    ^-  note-arvo
+    [%c %park desk &/[~ (~(run by files) |=(p=page &/p))] *rang]
   ::  +an: $ankh interface door
   ::
   ++  an
@@ -3755,6 +3759,17 @@
       ?~  nik=(dug path)  ~
       ?~  fil.u.nik       ~
       `q.u.fil.u.nik
+    ::  +mup: convert sub-tree at .pax to (map path [lobe cage])
+    ::
+    ++  mup
+      |=  pax=path
+      =.  nak  (dug pax)
+      =|  res=(map path [=lobe =cage])
+      |-  ^+  res
+      =?  res  ?=(^ fil.nak)  (~(put by res) pax u.fil.nak)
+      %+  roll  ~(tap by dir.nak)
+      |=  [[seg=@ta =ankh] res=_res]
+      ^$(pax [seg pax], nak ankh, res res)
     --
   --
 ::                                                      ::