mirror of
https://github.com/urbit/shrub.git
synced 2024-12-19 08:32:39 +03:00
Merge pull request #6166 from urbit/merge/master-to-next
Merge changes in master back into next/arvo
This commit is contained in:
Zach Alberico
GitHub
commit
7714d642ed
3
.husky/post-checkout
Executable file
3
.husky/post-checkout
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\n"; exit 2; }
|
||||
git lfs post-checkout "$@"
|
||||
3
.husky/post-commit
Executable file
3
.husky/post-commit
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-commit.\n"; exit 2; }
|
||||
git lfs post-commit "$@"
|
||||
3
.husky/post-merge
Executable file
3
.husky/post-merge
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\n"; exit 2; }
|
||||
git lfs post-merge "$@"
|
||||
3
.husky/pre-push
Executable file
3
.husky/pre-push
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\n"; exit 2; }
|
||||
git lfs pre-push "$@"
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3306a5b916caa838c67cb079410c6e5bb158054520129ffb9f9bdb144ab1b691
|
||||
size 7418493
|
||||
oid sha256:ea8626444e4f0213e39c21ded20607145ee85a947afc592f182f46e7f598ef30
|
||||
size 7748671
|
||||
|
||||
@ -394,7 +394,10 @@
|
||||
:: !=(%kids desk)
|
||||
:: ==
|
||||
:: [dap.bowl %no-docket-file-for desk]
|
||||
?. (~(has by charges) desk)
|
||||
`state
|
||||
:- ~[del-fact:cha]
|
||||
state(charges (~(del by charges) desk))
|
||||
:: always update the docket in state to match clay's
|
||||
::
|
||||
=/ =docket docket:cha
|
||||
|
||||
@ -26,6 +26,7 @@ interface NoteProps {
|
||||
}
|
||||
|
||||
export function NoteContent({ post }) {
|
||||
console.log(post.contents);
|
||||
return (
|
||||
<Box color="black" className="md" style={{ overflowWrap: 'break-word', overflow: 'hidden' }}>
|
||||
<GraphContent tall={true} contents={post.contents.slice(1)} showOurContact />
|
||||
|
||||
@ -123,8 +123,16 @@
|
||||
:: ensure difference
|
||||
=/ old=(unit contact:store) (~(get by rolodex) ship)
|
||||
?. ?| ?=(~ old)
|
||||
:: if new contact is before existing contact, no-op
|
||||
::
|
||||
:: NB: last-updated.contact is often *@da, so this
|
||||
:: effectively stops add from applying if we already have
|
||||
:: a contact for them
|
||||
::
|
||||
?& (gth last-updated.contact last-updated.u.old)
|
||||
!=(contact(last-updated *@da) u.old(last-updated *@da))
|
||||
==
|
||||
==
|
||||
[~ state]
|
||||
~| "cannot add a data url to cover!"
|
||||
?> ?| ?=(~ cover.contact)
|
||||
|
||||
@ -54,12 +54,7 @@
|
||||
++ on-pull-nack
|
||||
|= [=resource =tang]
|
||||
^- (quip card _this)
|
||||
%- (slog leaf+"nacked {<resource>}" tang)
|
||||
:_ this
|
||||
?. (~(has in get-keys:gra) resource) ~
|
||||
=- [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update-3 -]~
|
||||
!> ^- update:store
|
||||
[now.bowl [%archive-graph resource]]
|
||||
`this
|
||||
::
|
||||
++ on-pull-kick
|
||||
|= =resource
|
||||
|
||||
@ -11,16 +11,17 @@
|
||||
[%3 network:one:store]
|
||||
[%4 network:store]
|
||||
[%5 network:store]
|
||||
state-6
|
||||
[%6 network:store]
|
||||
state-7
|
||||
==
|
||||
::-
|
||||
+$ state-6 [%6 network:store]
|
||||
+$ state-7 [%7 network:store]
|
||||
++ orm orm:store
|
||||
++ orm-log orm-log:store
|
||||
++ mar %graph-update-3
|
||||
--
|
||||
::
|
||||
=| state-6
|
||||
=| state-7
|
||||
=* state -
|
||||
::
|
||||
%- agent:dbug
|
||||
@ -96,7 +97,43 @@
|
||||
(scag 2 (tap:orm-log update-log))
|
||||
==
|
||||
::
|
||||
%6 [cards this(state old)]
|
||||
%6
|
||||
=/ old-dms
|
||||
%- ~(gas by *(map resource:store marked-graph:store))
|
||||
%+ skim ~(tap by graphs.old)
|
||||
|=([r=resource:store *] (is-old-dm:upgrade:store r))
|
||||
=/ backup (backup:upgrade:store bowl)
|
||||
%_ $
|
||||
-.old %7
|
||||
archive.old ~
|
||||
update-logs.old
|
||||
%- ~(gas by *(map resource:store update-log:store))
|
||||
%+ murn ~(tap by update-logs.old)
|
||||
|= [r=resource:store =update-log:store]
|
||||
?: (is-old-dm:upgrade:store r)
|
||||
~
|
||||
`[r (strip-sigs-log:upgrade:store update-log)]
|
||||
::
|
||||
graphs.old
|
||||
%- ~(gas by *(map resource:store marked-graph:store))
|
||||
%+ murn ~(tap by graphs.old)
|
||||
|= [r=resource:store =graph:store mar=(unit mark)]
|
||||
?: (is-old-dm:upgrade:store r)
|
||||
~
|
||||
`[r (strip-sigs-graph:upgrade:store graph) mar]
|
||||
::
|
||||
cards
|
||||
;: welp
|
||||
cards
|
||||
::
|
||||
(nuke-groups:upgrade:store bowl)
|
||||
::
|
||||
(turn ~(tap by archive.old) backup)
|
||||
(turn ~(tap by old-dms) backup)
|
||||
==
|
||||
==
|
||||
::
|
||||
%7 [cards this(state old)]
|
||||
==
|
||||
::
|
||||
++ on-watch
|
||||
@ -129,9 +166,21 @@
|
||||
?+ mark (on-poke:def mark vase)
|
||||
%graph-update-3 (graph-update !<(update:store vase))
|
||||
%import (poke-import q.vase)
|
||||
%migrated (poke-migrated !<(resource:store vase))
|
||||
==
|
||||
[cards this]
|
||||
::
|
||||
++ poke-migrated
|
||||
|= r=resource:res
|
||||
^- (quip card _state)
|
||||
=/ =path /(rap 3 'backup-' (scot %p entity.r) '-' name.r ~)/noun
|
||||
=/ graph (~(got by graphs) r)
|
||||
:- [%pass /migrate %agent [our.bowl %hood] %poke drum-put+!>([path (jam r graph)])]~
|
||||
%_ state
|
||||
graphs (~(del by graphs) r)
|
||||
update-logs (~(del by update-logs) r)
|
||||
==
|
||||
::
|
||||
++ graph-update
|
||||
|= =update:store
|
||||
^- (quip card _state)
|
||||
|
||||
@ -45,10 +45,7 @@
|
||||
++ on-pull-nack
|
||||
|= [=resource =tang]
|
||||
^- (quip card _this)
|
||||
%- (slog tang)
|
||||
:_ this
|
||||
=- [%pass / %agent [our.bowl %group-store] %poke -]~
|
||||
group-update-0+!>([%remove-group resource ~])
|
||||
`this
|
||||
::
|
||||
++ on-pull-kick
|
||||
|= =resource
|
||||
|
||||
@ -31,13 +31,16 @@
|
||||
::
|
||||
/- *group
|
||||
/+ store=group-store, default-agent, verb, dbug, resource, *migrate, agentio
|
||||
/+ gladio
|
||||
|%
|
||||
+$ card card:agent:gall
|
||||
++ ota-host ~sogryp-dister-dozzod-dozzod
|
||||
::
|
||||
+$ versioned-state
|
||||
$% state-zero
|
||||
state-one
|
||||
state-two
|
||||
state-three
|
||||
==
|
||||
::
|
||||
+$ state-zero
|
||||
@ -52,13 +55,19 @@
|
||||
$: %2
|
||||
=groups
|
||||
==
|
||||
::
|
||||
+$ state-three
|
||||
$: %3
|
||||
=groups
|
||||
wait=(set ship)
|
||||
==
|
||||
--
|
||||
::
|
||||
=| state-two
|
||||
=| state-three
|
||||
=* state -
|
||||
::
|
||||
%- agent:dbug
|
||||
%+ verb |
|
||||
%+ verb &
|
||||
^- agent:gall
|
||||
=<
|
||||
|_ =bowl:gall
|
||||
@ -72,9 +81,23 @@
|
||||
++ on-load
|
||||
|= =old=vase
|
||||
=/ old !<(versioned-state old-vase)
|
||||
=| cards=(list card)
|
||||
|^
|
||||
?- -.old
|
||||
%2 `this(state old)
|
||||
%3 [(flop cards) this(state old)]
|
||||
::
|
||||
%2
|
||||
%_ $
|
||||
old [%3 groups.old ~]
|
||||
cards
|
||||
%- welp
|
||||
:_ cards
|
||||
:~ [%pass /pyre/export %agent [our dap]:bowl %poke noun+!>(%export)]
|
||||
[%pass /pyre/migrate %agent [our dap]:bowl %poke noun+!>(%migrate)]
|
||||
[%pass / %agent [our %hood]:bowl %poke %kiln-install !>([%groups ota-host %groups])]
|
||||
[%pass / %agent [our %hood]:bowl %poke %kiln-install !>([%talk ota-host %talk])]
|
||||
==
|
||||
==
|
||||
::
|
||||
%1
|
||||
%_ $
|
||||
@ -112,6 +135,12 @@
|
||||
=^ cards state
|
||||
?+ mark (on-poke:def mark vase)
|
||||
%sane (poke-sane:gc !<(?(%check %fix) vase))
|
||||
::
|
||||
%noun
|
||||
?+ q.vase !!
|
||||
%migrate poke-migrate:gc
|
||||
%export poke-export:gc
|
||||
==
|
||||
::
|
||||
?(%group-update-0 %group-action)
|
||||
(poke-group-update:gc !<(update:store vase))
|
||||
@ -125,6 +154,8 @@
|
||||
|= =path
|
||||
^- (quip card _this)
|
||||
?> (team:title our.bowl src.bowl)
|
||||
?: ?=([%wait ~] path)
|
||||
`this
|
||||
?> ?=([%groups ~] path)
|
||||
:_ this
|
||||
[%give %fact ~ %group-update-0 !>([%initial groups])]~
|
||||
@ -135,6 +166,8 @@
|
||||
|= =path
|
||||
^- (unit (unit cage))
|
||||
?+ path (on-peek:def path)
|
||||
[%x %wait ~]
|
||||
``ships+!>(~(tap in wait))
|
||||
[%y %groups ~]
|
||||
``noun+!>(`(set resource)`~(key by groups))
|
||||
::
|
||||
@ -159,28 +192,38 @@
|
||||
++ on-agent
|
||||
|= [=wire =sign:agent:gall]
|
||||
^- (quip card _this)
|
||||
?. ?=([%try-rejoin @ *] wire)
|
||||
(on-agent:def wire sign)
|
||||
=^ cards state
|
||||
?+ wire [- state]:(on-agent:def wire sign)
|
||||
[%pyre *] (take-pyre:gc t.wire sign)
|
||||
[%gladio @ ~] (take-migrate:gc sign)
|
||||
::
|
||||
[%try-rejoin @ *]
|
||||
?> ?=(%poke-ack -.sign)
|
||||
=/ rid=resource (de-path:resource t.t.wire)
|
||||
?~ p.sign
|
||||
=/ =cage
|
||||
[%pull-hook-action !>([%add entity.rid rid])]
|
||||
:_ this
|
||||
:_ state
|
||||
[%pass / %agent [our.bowl %group-pull-hook] %poke cage]~
|
||||
=/ nack-count=@ud (slav %ud i.t.wire)
|
||||
=/ wakeup=@da
|
||||
(add now.bowl (mul ~s1 (bex (min 19 nack-count))))
|
||||
:_ this
|
||||
:_ state
|
||||
[%pass wire %arvo %b %wait wakeup]~
|
||||
==
|
||||
[cards this]
|
||||
::
|
||||
++ on-arvo
|
||||
|= [=wire =sign-arvo]
|
||||
|= [=(pole knot) =sign-arvo]
|
||||
^- (quip card _this)
|
||||
?. ?=([%try-rejoin @ *] wire)
|
||||
(on-arvo:def wire sign-arvo)
|
||||
=/ =resource (de-path:resource t.t.wire)
|
||||
=/ nack-count=@ud (slav %ud i.t.wire)
|
||||
?: ?=([%gladio %backoff ship=@ ~] pole)
|
||||
=^ cards state
|
||||
(take-backoff:gc (slav %p ship.pole) sign-arvo)
|
||||
[cards this]
|
||||
?. ?=([%try-rejoin count=@ res=*] pole)
|
||||
(on-arvo:def pole sign-arvo)
|
||||
=/ =resource (de-path:resource res.pole)
|
||||
=/ nack-count=@ud (slav %ud count.pole)
|
||||
?> ?=([%behn %wake *] sign-arvo)
|
||||
~? ?=(^ error.sign-arvo)
|
||||
"behn errored in backoff timers, continuing anyway"
|
||||
@ -192,6 +235,71 @@
|
||||
::
|
||||
|_ bol=bowl:gall
|
||||
+* io ~(. agentio bol)
|
||||
++ poke-export
|
||||
^- (quip card _state)
|
||||
:_ state
|
||||
=; =cage
|
||||
[%pass /export %agent [our.bol %hood] %poke cage]~
|
||||
drum-put+!>([/groups/jam ~(export gladio bol)])
|
||||
::
|
||||
++ poke-migrate
|
||||
^- (quip card _state)
|
||||
=^ cards-1=(list card) wait
|
||||
(~(migrate-start gladio bol) wait)
|
||||
=/ cards-2=(list card)
|
||||
(turn ~(tap in wait) watch-init-migrate)
|
||||
=/ cards (welp cards-1 cards-2)
|
||||
[cards state(wait wait)]
|
||||
::
|
||||
++ watch-init-migrate
|
||||
|= =ship
|
||||
^- card
|
||||
[%pass /gladio/(scot %p ship) %agent [ship %groups] %watch /init]
|
||||
::
|
||||
++ backoff-migrate
|
||||
|= =ship
|
||||
^- card
|
||||
[%pass /gladio/backoff/(scot %p ship) %arvo %b %wait (add ~h1 now.bol)]
|
||||
::
|
||||
++ take-pyre
|
||||
|= [=wire =sign:agent:gall]
|
||||
^- (quip card _state)
|
||||
:_ state
|
||||
?> ?=(%poke-ack -.sign)
|
||||
?~ p.sign
|
||||
~
|
||||
[%pass / %pyre leaf/"{<wire>} failed" u.p.sign]~
|
||||
::
|
||||
++ take-backoff
|
||||
|= [=ship sign=sign-arvo]
|
||||
^- (quip card _state)
|
||||
?> ?=([%behn %wake *] sign)
|
||||
?: ?=(^ error.sign)
|
||||
`state
|
||||
:_ state
|
||||
~[(watch-init-migrate ship)]
|
||||
::
|
||||
++ take-migrate
|
||||
|= =sign:agent:gall
|
||||
^- (quip card _state)
|
||||
?. (~(has in wait) src.bol)
|
||||
:: already succeeded
|
||||
`state
|
||||
?- -.sign
|
||||
?(%poke-ack %fact) `state
|
||||
%kick :_(state (watch-init-migrate src.bol)^~)
|
||||
%watch-ack
|
||||
?~ p.sign
|
||||
:: they have public release
|
||||
~& migrating/src.bol
|
||||
=. wait (~(del in wait) src.bol)
|
||||
:_ state
|
||||
:- [%give %fact ~[/wait] ships+!>(~(tap in wait))]
|
||||
(~(migrate-ship gladio bol) src.bol)
|
||||
:_ state
|
||||
~[(backoff-migrate src.bol)]
|
||||
==
|
||||
::
|
||||
++ peek-group
|
||||
|= rid=resource
|
||||
^- (unit group)
|
||||
@ -243,8 +351,8 @@
|
||||
|= arc=*
|
||||
^- (quip card _state)
|
||||
|^
|
||||
=/ sty=state-two
|
||||
[%2 (remake-groups ;;((tree [resource tree-group]) +.arc))]
|
||||
=/ sty=state-three
|
||||
[%3 (remake-groups ;;((tree [resource tree-group]) +.arc)) ~]
|
||||
:_ sty
|
||||
%+ roll ~(tap by groups.sty)
|
||||
|= [[rid=resource grp=group] out=(list card)]
|
||||
|
||||
@ -321,15 +321,7 @@
|
||||
++ on-pull-nack
|
||||
|= [=resource =tang]
|
||||
^- (quip card _this)
|
||||
=/ =associations:metadata
|
||||
(metadata-for-group:met resource)
|
||||
:_ this
|
||||
%+ turn ~(tap by associations)
|
||||
|= [=md-resource:metadata =association:metadata]
|
||||
%+ poke-our:pass:io:hc %metadata-store
|
||||
:- %metadata-update-2
|
||||
!> ^- update:metadata
|
||||
[%remove resource md-resource]
|
||||
`this
|
||||
::
|
||||
++ on-pull-kick
|
||||
|= =resource
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
:~ title+'Groups'
|
||||
info+'A suite of applications to communicate on Urbit'
|
||||
color+0xee.5432
|
||||
glob-http+['https://bootstrap.urbit.org/glob-0v7.2rpmd.966js.dt2sj.ggv4a.n15nq.glob' 0v7.2rpmd.966js.dt2sj.ggv4a.n15nq]
|
||||
|
||||
base+'landscape'
|
||||
version+[1 1 0]
|
||||
website+'https://tlon.io'
|
||||
license+'MIT'
|
||||
==
|
||||
193
pkg/landscape/lib/gladio.hoon
Normal file
193
pkg/landscape/lib/gladio.hoon
Normal file
@ -0,0 +1,193 @@
|
||||
:: Migrate scripts
|
||||
/- gra=graph-store
|
||||
/- met=metadata-store
|
||||
/- grp=group-store
|
||||
/- i=migrate
|
||||
/- *group
|
||||
|_ =bowl:gall
|
||||
+$ card card:agent:gall
|
||||
:: if false, indicates that OTA should be done in one go, in order to
|
||||
:: allow for testing on partial testnets
|
||||
++ split-ota &
|
||||
++ import-club
|
||||
|= [=^groups =associations:met =network:gra]
|
||||
%- ~(gas by *imports:club:i)
|
||||
%+ murn ~(tap by graphs.network)
|
||||
|= [=flag:i graph=graph:gra mar=(unit mark)]
|
||||
^- (unit [flag:i import:club:i])
|
||||
?. =(mar `%graph-validator-chat)
|
||||
~
|
||||
?~ assoc=(~(get by associations) [%graph flag])
|
||||
~& missing-assoc-club/flag
|
||||
~
|
||||
?~ group=(~(get by groups) group.u.assoc)
|
||||
~& missing-group/[flag group.u.assoc]
|
||||
~
|
||||
?. hidden.u.group
|
||||
~
|
||||
`[flag members.u.group u.assoc graph]
|
||||
::
|
||||
++ import-flags
|
||||
|= [our=ship =^groups =associations:met =network:gra]
|
||||
|= =mark
|
||||
^- (set flag:i)
|
||||
%- ~(gas in *(set flag:i))
|
||||
%+ skim
|
||||
~(tap in ~(key by ((import-for-mark ~ groups associations network) mark)))
|
||||
|= =flag:i
|
||||
!=(our p.flag)
|
||||
::
|
||||
++ import-for-mark
|
||||
|= [her=(unit ship) =^groups =associations:met =network:gra]
|
||||
|= =mark
|
||||
^- imports:graph:i
|
||||
%- ~(gas by *imports:graph:i)
|
||||
%+ murn ~(tap by graphs.network)
|
||||
|= [=flag:i graph=graph:gra mar=(unit ^mark)]
|
||||
?. |(=(`p.flag her) =(her ~))
|
||||
~
|
||||
?. =(mar `mark) :: XX: correct detection?
|
||||
~
|
||||
?~ assoc=(~(get by associations) [%graph flag])
|
||||
~& missing-assoc/flag^mark
|
||||
~
|
||||
?~ group=(~(get by groups) group.u.assoc)
|
||||
~& missing-group/[flag group.u.assoc]
|
||||
~
|
||||
?: hidden.u.group
|
||||
~
|
||||
=/ writers=(set ship)
|
||||
(~(get ju tags.u.group) %graph flag %writers)
|
||||
?~ log=(~(get by update-logs.network) flag)
|
||||
~& missing-log/flag :: XX: doesn't need to fail, but suspect case
|
||||
~
|
||||
`[flag writers u.assoc u.log graph]
|
||||
|
||||
++ scry
|
||||
|= [=dude:gall =path]
|
||||
%- welp
|
||||
:_ path
|
||||
/gx/(scot %p our.bowl)/[dude]/(scot %da now.bowl)
|
||||
++ groups
|
||||
~+ .^([@ =^groups *] (scry %group-store /export/noun))
|
||||
++ groups-raw
|
||||
.^(* (scry %group-store /export/noun))
|
||||
++ network
|
||||
~+ .^([@ =network:gra] (scry %graph-store /export/noun))
|
||||
++ network-raw
|
||||
.^(* (scry %graph-store /export/noun))
|
||||
++ associations
|
||||
~+ .^([@ =associations:met ~] (scry %metadata-store /export/noun))
|
||||
++ associations-raw
|
||||
.^(* (scry %metadata-store /export/noun))
|
||||
++ export
|
||||
%- jam
|
||||
^- *
|
||||
:~ [%group-store groups-raw]
|
||||
[%metadata-store associations-raw]
|
||||
==
|
||||
++ peers
|
||||
|= =network:gra
|
||||
=- (~(del in -) our.bowl)
|
||||
%- ~(gas in *(set ship))
|
||||
(turn ~(tap in ~(key by graphs.network)) head)
|
||||
++ poke-our
|
||||
|= [=dude:gall =cage]
|
||||
[%pass /gladio %agent [our.bowl dude] %poke cage]
|
||||
++ migrate-start
|
||||
|= wait=(set ship)
|
||||
^- (quip card (set ship))
|
||||
=+ network
|
||||
=+ associations
|
||||
=+ groups
|
||||
=/ ships (peers network)
|
||||
=/ dms (~(get by graphs:network) [our.bowl %dm-inbox])
|
||||
=/ import (import-for-mark `our.bowl groups associations network)
|
||||
=/ clubs (import-club groups associations network)
|
||||
=/ chats=imports:graph:i
|
||||
(import %graph-validator-chat)
|
||||
=/ diarys=imports:graph:i
|
||||
(import %graph-validator-publish)
|
||||
=/ links=imports:graph:i
|
||||
(import %graph-validator-link)
|
||||
=/ =imports:groups:i
|
||||
%- ~(gas by *imports:groups:i)
|
||||
%+ murn ~(tap by groups)
|
||||
|= [=flag:i =group]
|
||||
^- (unit [_flag import:groups:i])
|
||||
?: hidden.group
|
||||
~
|
||||
?~ assoc=(~(get by associations) [%groups flag])
|
||||
~& missing-group-assoc/flag
|
||||
~
|
||||
=/ chans=(map flag:i association:met)
|
||||
%- ~(gas by *(map flag:i association:met))
|
||||
%+ murn ~(tap by associations)
|
||||
|= [res=md-resource:met ass=association:met]
|
||||
^- (unit [flag:i association:met])
|
||||
?. =(group.ass flag) ~
|
||||
`[resource.res ass]
|
||||
=/ roles=(set flag:i)
|
||||
%- ~(gas in *(set flag:i))
|
||||
%+ murn ~(tap by chans)
|
||||
|= [=flag:i =association:met]
|
||||
^- (unit flag:i)
|
||||
?^ link=(~(get by links) flag)
|
||||
?: =(writers.u.link ~) ~
|
||||
`flag
|
||||
?^ diary=(~(get by diarys) flag)
|
||||
?: =(writers.u.diary ~) ~
|
||||
`flag
|
||||
?^ chat=(~(get by chats) flag)
|
||||
?: =(writers.u.chat ~) ~
|
||||
`flag
|
||||
~
|
||||
`[flag u.assoc chans roles group]
|
||||
=/ dms (~(get by graphs:network) [our.bowl %dm-inbox])
|
||||
=/ flag-importer (import-flags our.bowl groups associations network)
|
||||
=+ :* chat-flags=(flag-importer %graph-validator-chat)
|
||||
heap-flags=(flag-importer %graph-validator-link)
|
||||
diary-flags=(flag-importer %graph-validator-publish)
|
||||
==
|
||||
=/ setup=(list card)
|
||||
%+ welp (migrate-ship our.bowl)
|
||||
:* (poke-our %groups group-import+!>(imports))
|
||||
(poke-our %chat import-flags+!>(chat-flags))
|
||||
(poke-our %heap import-flags+!>(heap-flags))
|
||||
(poke-our %diary import-flags+!>(diary-flags))
|
||||
(poke-our %chat club-imports+!>(clubs))
|
||||
?~ dms ~
|
||||
(poke-our %chat dm-imports+!>(p.u.dms))^~
|
||||
==
|
||||
?. split-ota
|
||||
:_ ~
|
||||
(welp setup (zing (turn ~(tap in (~(del in ships) our.bowl)) migrate-ship)))
|
||||
[setup (~(uni in ships) wait)]
|
||||
::
|
||||
++ migrate-ship
|
||||
|= her=ship
|
||||
^- (list card)
|
||||
=+ groups
|
||||
=+ network
|
||||
=+ associations
|
||||
=/ import (import-for-mark `her groups associations network)
|
||||
=/ chats=imports:graph:i
|
||||
(import %graph-validator-chat)
|
||||
=/ diarys=imports:graph:i
|
||||
(import %graph-validator-publish)
|
||||
=/ links=imports:graph:i
|
||||
(import %graph-validator-link)
|
||||
=/ graph-flags
|
||||
%. ~(key by links)
|
||||
=- ~(uni in -)
|
||||
(~(uni in ~(key by chats)) ~(key by diarys))
|
||||
%+ welp
|
||||
%+ turn ~(tap in graph-flags)
|
||||
|= =flag:i
|
||||
^- card
|
||||
(poke-our %graph-store migrated+!>(flag))
|
||||
:~ (poke-our %chat graph-imports+!>(chats))
|
||||
(poke-our %diary graph-imports+!>(diarys))
|
||||
(poke-our %heap graph-imports+!>(links))
|
||||
==
|
||||
--
|
||||
@ -528,6 +528,81 @@
|
||||
::
|
||||
++ upgrade
|
||||
|%
|
||||
++ is-old-dm |=(r=resource =('dm--' (end [3 4] name.r)))
|
||||
++ backup
|
||||
|= =bowl:gall
|
||||
|= [r=resource m=marked-graph]
|
||||
^- card:agent:gall
|
||||
=/ pax /(rap 3 'archive-' (scot %p entity.r) '-' name.r ~)/noun
|
||||
=/ =cage drum-put+!>([pax (jam r m)])
|
||||
[%pass /archive %agent [our.bowl %hood] %poke cage]
|
||||
++ strip-sigs-graph
|
||||
|= g=graph
|
||||
^+ g
|
||||
=* loop $
|
||||
%+ gas:orm *graph
|
||||
%+ turn (tap:orm g)
|
||||
|= [key=@ val=node] :: optional: also strip out deleted messages?
|
||||
=? children.val ?=(%graph -.children.val)
|
||||
[%graph loop(g p.children.val)]
|
||||
:- key
|
||||
?. ?=(%& -.post.val)
|
||||
val
|
||||
val(signatures.p.post ~)
|
||||
++ strip-sigs-log
|
||||
|= u=update-log
|
||||
%+ gas:orm-log *update-log
|
||||
%+ turn (tap:orm-log u)
|
||||
|= [key=@ upd=logged-update]
|
||||
:- key
|
||||
:- p.upd
|
||||
?+ -.q.upd q.upd
|
||||
%add-graph
|
||||
q.upd(graph (strip-sigs-graph graph.q.upd))
|
||||
::
|
||||
%add-signatures
|
||||
q.upd(signatures ~)
|
||||
::
|
||||
%remove-signatures
|
||||
q.upd(signatures ~)
|
||||
::
|
||||
%add-nodes
|
||||
%= q.upd
|
||||
nodes
|
||||
%- ~(run by nodes.q.upd)
|
||||
|= =node
|
||||
^+ node
|
||||
%= node
|
||||
children
|
||||
?. ?=(%graph -.children.node)
|
||||
children.node
|
||||
[%graph (strip-sigs-graph p.children.node)]
|
||||
::
|
||||
post
|
||||
?. ?=(%& -.post.node)
|
||||
post.node
|
||||
=. signatures.p.post.node ~
|
||||
post.node
|
||||
==
|
||||
==
|
||||
==
|
||||
::
|
||||
++ nuke-groups
|
||||
|= =bowl:gall
|
||||
|^ ^- (list card:agent:gall)
|
||||
?. .^(? (gall-scry %u %groups))
|
||||
~
|
||||
=+ .^(=desk (gall-scry %d %groups))
|
||||
:~ [%pass /nuke %agent [our.bowl %hood] %poke kiln-nuke+!>([desk &])]
|
||||
[%pass /nuke %agent [our.bowl %docket] %poke docket-uninstall+!>(desk)]
|
||||
[%pass /nuke %agent [our.bowl %docket] %poke docket-uninstall+!>(%talk)]
|
||||
==
|
||||
::
|
||||
++ gall-scry
|
||||
|= [=care:clay dap=dude:gall]
|
||||
^- path
|
||||
/(cat 3 %g care)/(scot %p our.bowl)/[dap]/(scot %da now.bowl)
|
||||
--
|
||||
::
|
||||
:: +two
|
||||
::
|
||||
@ -758,9 +833,9 @@
|
||||
--
|
||||
++ import
|
||||
|= [arc=* our=ship]
|
||||
^- (quip card:agent:gall [%6 network])
|
||||
^- (quip card:agent:gall [%7 network])
|
||||
|^
|
||||
=/ sty [%6 (remake-network ;;(tree-network +.arc))]
|
||||
=/ sty [%7 (remake-network ;;(tree-network +.arc))]
|
||||
:_ sty
|
||||
%+ turn ~(tap by graphs.sty)
|
||||
|= [rid=resource =marked-graph]
|
||||
|
||||
23
pkg/landscape/sur/migrate.hoon
Normal file
23
pkg/landscape/sur/migrate.hoon
Normal file
@ -0,0 +1,23 @@
|
||||
/- met=metadata-store, gra=graph-store
|
||||
/- *group
|
||||
|%
|
||||
+$ flag (pair ship term)
|
||||
++ graph
|
||||
|%
|
||||
+$ import
|
||||
[writers=(set ship) =association:met =update-log:gra =graph:gra]
|
||||
+$ imports (map flag import)
|
||||
--
|
||||
::
|
||||
++ groups
|
||||
|%
|
||||
+$ import [=association:met chans=(map flag =association:met) roles=(set flag) =group]
|
||||
+$ imports (map flag import)
|
||||
--
|
||||
++ club
|
||||
|%
|
||||
+$ import [ships=(set ship) =association:met =graph:gra]
|
||||
+$ imports (map flag import)
|
||||
--
|
||||
--
|
||||
|
||||
19
pkg/landscape/ted/graph/recover-archive.hoon
Normal file
19
pkg/landscape/ted/graph/recover-archive.hoon
Normal file
@ -0,0 +1,19 @@
|
||||
/- spider, graph=graph-store, met=metadata-store, *group, group-store, push-hook
|
||||
/+ strandio, resource, graph-view
|
||||
=>
|
||||
|%
|
||||
++ strand strand:spider
|
||||
++ poke poke:strandio
|
||||
++ poke-our poke-our:strandio
|
||||
--
|
||||
=, strand=strand:spider
|
||||
^- thread:spider
|
||||
|= arg=vase
|
||||
=/ m (strand ,vase)
|
||||
^- form:m
|
||||
=+ !<([~ pax=path] arg)
|
||||
;< =bowl:spider bind:m get-bowl:strandio
|
||||
=+ .^([rid=resource mar=marked-graph:graph] %cx pax)
|
||||
;< ~ bind:m
|
||||
(poke-our:strandio %graph-store %graph-update-3 !>([now.bowl %add-graph p.mar q.mar &]))
|
||||
(pure:m *vase)
|
||||
14
pkg/landscape/ted/keep.hoon
Normal file
14
pkg/landscape/ted/keep.hoon
Normal file
@ -0,0 +1,14 @@
|
||||
/- spider, docket
|
||||
/+ strandio
|
||||
=, strand=strand:spider
|
||||
^- thread:spider
|
||||
|= arg=vase
|
||||
=/ m (strand ,vase)
|
||||
^- form:m
|
||||
=+ !<(jim=@ arg)
|
||||
;< =bowl:spider bind:m get-bowl:strandio
|
||||
=/ home=path /(scot %p our.bowl)/[q.byk.bowl]/(scot %da now.bowl)
|
||||
=/ =path /(cat 3 'backup-' (scot %da now.bowl))/noun
|
||||
:: XX remove prints
|
||||
;< ~ bind:m (poke-our:strandio %hood drum-put+!>([path jim]))
|
||||
(pure:m *vase)
|
||||
91
pkg/landscape/ted/migrate.hoon
Normal file
91
pkg/landscape/ted/migrate.hoon
Normal file
@ -0,0 +1,91 @@
|
||||
:: Migrate scripts
|
||||
/- spider
|
||||
/- gra=graph-store
|
||||
/- met=metadata-store
|
||||
/- grp=group-store
|
||||
/- i=migrate
|
||||
/- *group
|
||||
/+ strandio
|
||||
=, strand=strand:spider
|
||||
|%
|
||||
++ import-for-mark
|
||||
|= [=groups =associations:met =network:gra]
|
||||
|= =mark
|
||||
^- imports:graph:i
|
||||
%- ~(gas by *imports:graph:i)
|
||||
%+ murn ~(tap by graphs.network)
|
||||
|= [=flag:i graph=graph:gra mar=(unit ^mark)]
|
||||
?. =(mar `mark) :: XX: correct detection?
|
||||
~
|
||||
?~ assoc=(~(get by associations) [%graph flag])
|
||||
~& missing-assoc/flag^mark
|
||||
~
|
||||
?~ group=(~(get by groups) group.u.assoc)
|
||||
~& missing-group/[flag group.u.assoc]
|
||||
~
|
||||
=/ writers=(set ship)
|
||||
(~(get ju tags.u.group) %graph flag %writers)
|
||||
?~ log=(~(get by update-logs.network) flag)
|
||||
~& missing-log/flag :: XX: doesn't need to fail, but suspect case
|
||||
~
|
||||
`[flag writers u.assoc u.log graph]
|
||||
::
|
||||
--
|
||||
^- thread:spider
|
||||
|= arg=vase
|
||||
=/ m (strand ,vase)
|
||||
^- form:m
|
||||
;< =bowl:spider bind:m get-bowl:strandio
|
||||
;< [%2 =groups] bind:m
|
||||
(scry:strandio ,[%2 =groups] /gx/group-store/export/noun)
|
||||
;< [%6 =network:gra] bind:m
|
||||
(scry:strandio ,[%6 =network:gra] /gx/graph-store/export/noun)
|
||||
;< =associations:met bind:m
|
||||
(scry:strandio ,associations:met /gx/metadata-store/associations/noun)
|
||||
=/ import (import-for-mark groups associations network)
|
||||
=/ chats=imports:graph:i
|
||||
(import %graph-validator-chat)
|
||||
=/ diarys=imports:graph:i
|
||||
(import %graph-validator-publish)
|
||||
=/ links=imports:graph:i
|
||||
(import %graph-validator-link)
|
||||
=/ =imports:groups:i
|
||||
%- ~(gas by *imports:groups:i)
|
||||
%+ murn ~(tap by groups)
|
||||
|= [=flag:i =group]
|
||||
^- (unit [_flag import:groups:i])
|
||||
?~ assoc=(~(get by associations) [%groups flag])
|
||||
~& missing-group-assoc/flag
|
||||
~
|
||||
=/ chans=(map flag:i association:met)
|
||||
%- ~(gas by *(map flag:i association:met))
|
||||
%+ murn ~(tap by associations)
|
||||
|= [res=md-resource:met ass=association:met]
|
||||
^- (unit [flag:i association:met])
|
||||
?. =(group.ass flag) ~
|
||||
`[resource.res ass]
|
||||
=/ roles=(set flag:i)
|
||||
%- ~(gas in *(set flag:i))
|
||||
%+ murn ~(tap by chans)
|
||||
|= [=flag:i =association:met]
|
||||
^- (unit flag:i)
|
||||
?^ link=(~(get by links) flag)
|
||||
?: =(writers.u.link ~) ~
|
||||
`flag
|
||||
?^ diary=(~(get by diarys) flag)
|
||||
?: =(writers.u.diary ~) ~
|
||||
`flag
|
||||
?^ chat=(~(get by chats) flag)
|
||||
?: =(writers.u.chat ~) ~
|
||||
`flag
|
||||
~
|
||||
`[flag u.assoc chans roles group]
|
||||
;< ~ bind:m (poke-our:strandio %groups group-import+!>(imports))
|
||||
;< ~ bind:m (poke-our:strandio %chat graph-imports+!>(chats))
|
||||
;< ~ bind:m (poke-our:strandio %diary graph-imports+!>(diarys))
|
||||
;< ~ bind:m (poke-our:strandio %heap graph-imports+!>(links))
|
||||
;< ~ bind:m
|
||||
?~ dms=(~(get by graphs.network) [our.bowl %dm-inbox])
|
||||
(pure:(strand ,~) ~)
|
||||
(poke-our:strandio %chat %dm-imports !>(p.u.dms))
|
||||
(pure:m *vase)
|
||||
@ -433,6 +433,7 @@ u3m_signal(u3_noun sig_l)
|
||||
u3_noun
|
||||
u3m_file(c3_c* pas_c)
|
||||
{
|
||||
u3l_log("Loading file: %s\r\n", pas_c);
|
||||
struct stat buf_b;
|
||||
c3_i fid_i = c3_open(pas_c, O_RDONLY, 0644);
|
||||
c3_w fln_w, red_w;
|
||||
@ -443,6 +444,8 @@ u3m_file(c3_c* pas_c)
|
||||
return u3m_bail(c3__fail);
|
||||
}
|
||||
fln_w = buf_b.st_size;
|
||||
//u3l_log("file size: %i\r\n", fln_w);
|
||||
|
||||
pad_y = c3_malloc(buf_b.st_size);
|
||||
|
||||
red_w = read(fid_i, pad_y, fln_w);
|
||||
@ -456,6 +459,9 @@ u3m_file(c3_c* pas_c)
|
||||
u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y);
|
||||
c3_free(pad_y);
|
||||
|
||||
//u3l_log("size of noun\r\n");
|
||||
//u3m_p("size", u3dc("met", 3, u3k(pad)));
|
||||
|
||||
return pad;
|
||||
}
|
||||
}
|
||||
|
||||
@ -78,9 +78,12 @@ _fore_inject(u3_auto* car_u, c3_c* pax_c)
|
||||
static void
|
||||
_fore_import(u3_auto* car_u, c3_c* pax_c)
|
||||
{
|
||||
u3_noun arc = u3ke_cue(u3m_file(pax_c));
|
||||
u3_noun imp = u3dt("cat", 3, u3i_string("#import_"), arc);
|
||||
u3_noun fil = u3m_file(pax_c);
|
||||
//u3m_p("imp file size", u3dc("met", 3, fil));
|
||||
u3_noun imp = u3dt("cat", 3, u3i_string("#import_"), fil);
|
||||
u3_noun siz = u3r_met(3, imp);
|
||||
u3m_p("imp cue size", siz);
|
||||
|
||||
u3_noun dat = u3nt(u3_nul, siz, imp);
|
||||
|
||||
u3_noun req = u3nt(c3n,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user