From 54bca477d5b6a4be2a56b02abf11c8aa182bf253 Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Mon, 1 Jun 2015 16:46:36 -0400 Subject: [PATCH 1/3] fix validate-foreign-plops --- base/ape/bit/core.hook | 6 ++++++ base/ape/hood/core.hook | 6 ------ base/arvo/clay.hoon | 18 +++++++----------- base/lib/kiln/core.hook | 4 ++-- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/base/ape/bit/core.hook b/base/ape/bit/core.hook index bd38f10e5..08c83e2da 100644 --- a/base/ape/bit/core.hook +++ b/base/ape/bit/core.hook @@ -6,10 +6,16 @@ /- *talk, *bit-api /+ talk, sole, http, mean !: + + :::: sivtyv-barnel :: be sure to have oauth2-code markk + + + |% ++ axle + $: cred=(unit ,[app-secret=@t client-id=@t]) oauth-code=(unit ,@t) auth=(unit ,[access=@t refresh=@t]) diff --git a/base/ape/hood/core.hook b/base/ape/hood/core.hook index f18bd8e1a..7be625dcd 100644 --- a/base/ape/hood/core.hook +++ b/base/ape/hood/core.hook @@ -96,9 +96,6 @@ ++ poke-will (wrap poke-will):from-helm ++ mere-kiln (wrap take-mere):from-kiln ++ mere-kiln-sync (wrap take-mere-sync):from-kiln -::++ mere-kiln-sync -:: |= [then (each (set path) (pair term tang))] -:: (ably (take-mere-sync:(kiln-work [hid ost src] (able %kiln)) way +<+)) ++ made-kiln (wrap take-made):from-kiln ++ init-helm |=([way=wire *] [~ +>]) ++ note-helm (wrap take-note):from-helm @@ -108,7 +105,4 @@ ++ quit-drum (wrap quit):from-drum ++ went-helm (wrap take-went):from-helm ++ writ-kiln-sync (wrap take-writ):from-kiln -::++ writ-kiln-sync -:: |= [then riot] -:: (ably (take-writ:(kiln-work [hid ost src] (able %kiln)) way +<+)) -- diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index 9046a92e4..b8662e949 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -937,7 +937,7 @@ ^+ +> ?> ?=(^ ref) ?. ?=(%& -.res) - ~| "validate foreign plops failed" + ~| "validate foreign x failed" =+ why=?-(-.res %| p.res, %tabl ~[>%bad-marc<]) ~> %mean.|.(%*(. >[%plop-fail %why]< |1.+> why)) !! @@ -972,17 +972,13 @@ ^+ +> ?> ?=(^ ref) ?> ?=(^ nak.u.ref) - ?. ?=(%| -.res) - ~| "validate foreign plops failed" - ~> %mean.|.(rose/[" " "[" "]"]^[>%plop-fail< p.res]) - !! =+ ^- lat=(list blob) - %+ turn (gage-to-cages res) + %+ turn ~|("validate foreign plops failed" (gage-to-cages res)) |= [bob=cage cay=cage] ?. ?=(%blob p.bob) ~| %plop-not-blob !! - =+ bol=((hard blob) q.bob) + =+ bol=((hard blob) q.q.bob) ?- -.bol %delta [-.bol p.bol q.bol p.cay q.q.cay] %direct [-.bol p.bol p.cay q.q.cay] @@ -1050,10 +1046,10 @@ =+ vid=(read-at-aeon:ze u.nao p.q.i.xiq) :: ~& %red-at-aeon ?~ vid - ?: =(0 u.nao) - ~& [%oh-poor `path`[syd '0' r.p.q.i.xiq]] - $(xiq t.xiq) - ~& [%oh-well desk=syd mood=p.q.i.xiq aeon=u.nao] + :: ?: =(0 u.nao) + :: ~& [%oh-poor `path`[syd '0' r.p.q.i.xiq]] + :: $(xiq t.xiq) + :: ~& [%oh-well desk=syd mood=p.q.i.xiq aeon=u.nao] $(xiq t.xiq, xaq [i.xiq xaq]) $(xiq t.xiq, ..wake (balk p.i.xiq u.vid p.q.i.xiq)) :: diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index 92a39ffd4..5523aaf64 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -36,8 +36,8 @@ sud=desk :: gim=?(%auto germ) :: == :: -++ hood-cp [input=path output=path] :: -++ hood-mv [input=path output=path] +++ hood-cp [input=path output=path] :: +++ hood-mv [input=path output=path] :: -- :: :: :: :: :::: :: :: From 013eeafee3b5b2b085f873aefa91286066d73094 Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Mon, 1 Jun 2015 17:23:25 -0400 Subject: [PATCH 2/3] eliminate oh-poor and oh-well --- base/arvo/clay.hoon | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index b8662e949..603b3a77f 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -1434,6 +1434,8 @@ ++ read-x |= [yon=aeon pax=path] ^- (unit (unit (each cage lobe))) + ?: =(0 yon) + [~ ~] =+ tak=(~(get by hit.dom) yon) ?~ tak ~ @@ -1464,6 +1466,8 @@ ++ read-y |= [yon=aeon pax=path] ^- (unit (unit ,[%arch (hypo arch)])) + ?: =(0 yon) + ``[%arch -:!>(*arch) *arch] =+ tak=(~(get by hit.dom) yon) ?~ tak ~ From 8d66b3c8d96bea111564bdbd0bfd08bede442e9a Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Mon, 1 Jun 2015 17:58:40 -0400 Subject: [PATCH 3/3] nicer %no-ali-desk sync message --- base/lib/kiln/core.hook | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index 5523aaf64..af4be4723 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -206,12 +206,19 @@ %- spam ?: ?=(%& -.mes) [leaf/"autosync succeeded from {} on {} to {}" ~] - :* leaf/"autosync failed from {} on {} to {}" - leaf/"please manually merge the desks with" - leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}" - leaf/"" - leaf/"error code: {}" - q.p.mes + ?+ p.p.mes + :* leaf/"autosync failed from {} on {} to {}" + leaf/"please manually merge the desks with" + leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}" + leaf/"" + leaf/"error code: {}" + q.p.mes + == + :: + %no-ali-desk + :~ leaf/"{} on {} does not exist, so the sync" + leaf/"into {} will begin automatically when it does" + == == %- blab :_ ~ :* ost %warp