From 6a6897e0093fa598d7423f815ae8da61c70ac061 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Mon, 23 Aug 2021 11:44:24 +1000 Subject: [PATCH] kiln: update marks --- pkg/arvo/lib/hood/kiln.hoon | 15 ++++- .../{kiln-install.hoon => kiln/install.hoon} | 0 .../uninstall.hoon} | 0 pkg/arvo/mar/kiln/vats.hoon | 20 ++++++ pkg/arvo/sur/hood.hoon | 65 ++++++++++++++++++- 5 files changed, 97 insertions(+), 3 deletions(-) rename pkg/arvo/mar/{kiln-install.hoon => kiln/install.hoon} (100%) rename pkg/arvo/mar/{kiln-uninstall.hoon => kiln/uninstall.hoon} (100%) create mode 100644 pkg/arvo/mar/kiln/vats.hoon diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon index 010ade4fb3..f22749862c 100644 --- a/pkg/arvo/lib/hood/kiln.hoon +++ b/pkg/arvo/lib/hood/kiln.hoon @@ -202,9 +202,20 @@ |= =path ^- (unit (unit cage)) ?+ path [~ ~] - [%x %kiln %vats ~] + [%x %kiln %vat @ ~] + =* loc i.t.t.t.path + =/ ego (scot %p our) + =/ wen (scot %da now) + =/ rak=(unit arak) (~(get by ark) loc) + ?~ rak [~ ~] + =/ hog .^(@uv cz+~[ego loc wen]) + =/ cas .^(cass cw+~[ego loc wen]) :^ ~ ~ %noun - !> ^- (list [=desk hash=@uv =cass =arak]) + !> ^- vat + [loc hog cas u.rak] + [%x %kiln %vats ~] + :^ ~ ~ %kiln-vats + !> ^- (list vat) =/ ego (scot %p our) =/ wen (scot %da now) %+ turn ~(tap by ark) diff --git a/pkg/arvo/mar/kiln-install.hoon b/pkg/arvo/mar/kiln/install.hoon similarity index 100% rename from pkg/arvo/mar/kiln-install.hoon rename to pkg/arvo/mar/kiln/install.hoon diff --git a/pkg/arvo/mar/kiln-uninstall.hoon b/pkg/arvo/mar/kiln/uninstall.hoon similarity index 100% rename from pkg/arvo/mar/kiln-uninstall.hoon rename to pkg/arvo/mar/kiln/uninstall.hoon diff --git a/pkg/arvo/mar/kiln/vats.hoon b/pkg/arvo/mar/kiln/vats.hoon new file mode 100644 index 0000000000..e62a01bdc1 --- /dev/null +++ b/pkg/arvo/mar/kiln/vats.hoon @@ -0,0 +1,20 @@ +/- *hood +|_ vats=(list vat) +++ grow + |% + ++ noun vats + ++ json (vats:enjs vats) + -- +++ grab + |% + ++ noun (list vat) + -- +-- + + + + + + + + diff --git a/pkg/arvo/sur/hood.hoon b/pkg/arvo/sur/hood.hoon index 3f98044b0c..7665e1e763 100644 --- a/pkg/arvo/sur/hood.hoon +++ b/pkg/arvo/sur/hood.hoon @@ -139,5 +139,68 @@ =/ wen (scot %da now) %+ turn .^((list tako) %cs ~[ego desk wen %base her desk.arak]) |=(=tako .^(@uv %cs ~[ego desk wen %hash (scot %uv tako)])) +:: +++ enjs + =, enjs:format + |% + ++ vats + |= v=(list ^vat) + ^- json + %- pairs + %+ turn v + |= va=^vat + [desk.va (vat va)] + :: + ++ tim + |= t=@ + ^- json + (numb (fall (mole |.((unm:chrono:userlib t))) 0)) + :: + ++ cass + |= c=^cass + %- pairs + :~ ud+(numb ud.c) + da+(tim da.c) + == + :: + ++ vat + |= v=^vat + %- pairs + :~ desk+s+desk.v + hash+s+(scot %uv hash.v) + cass+(cass cass.v) + arak+(arak arak.v) + == + :: + ++ weft + |= w=^weft + %- pairs + :~ name+s+lal.w + kelvin+(numb num.w) + == + :: + ++ woof + |= w=[=aeon =^weft] + %- pairs + :~ aeon+(numb aeon.w) + weft+(weft weft.w) + == + :: + ++ rein + |= r=^rein + %- pairs + :~ add+a+(turn ~(tap in add.r) (lead %s)) + sub+a+(turn ~(tap in sub.r) (lead %s)) + == + :: + ++ arak + |= a=^arak + %- pairs + :~ ship+s+(scot %p ship.a) + desk+s+desk.a + aeon+(numb aeon.a) + next+a+(turn next.a woof) + rein+(rein rein.a) + == + -- -- -