urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-19 00:13:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3024 from urbit/la/hood-spa

Browse Source 
spa: fixes for ota
This commit is contained in:
matildepark 2020-06-17 17:08:04 -04:00 committed by GitHub
commit 69dbd1f2f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/arvo/app/hood.hoon
View File

@ -43,9 +43,9 @@
!:
=> |% ::
++ hood-old :: unified old-state
{?($1 $2 $3 $4 $5) lac/(map @tas hood-part-old)}
{?($1 $2 $3 $4 $5 $6) lac/(map @tas hood-part-old)}
++ hood-1 :: unified state
{$5 lac/(map @tas hood-part)} ::
{$6 lac/(map @tas hood-part)} ::
++ hood-good :: extract specific
=+ hed=$:hood-head
|@ ++ $
@ -140,7 +140,7 @@
`..on-init
::
++ on-save
!>([%5 lac])
!>([%6 lac])
::
++ on-load
|= =old-state=vase
@ -152,7 +152,8 @@
%2 ((wrap on-load):from-drum:(help hid) %2)
%3 ((wrap on-load):from-drum:(help hid) %3)
%4 ((wrap on-load):from-drum:(help hid) %4)
%5 `lac
%5 ((wrap on-load):from-drum:(help hid) %5)
%6 `lac
==
[cards ..on-init]
::

11
pkg/arvo/app/launch.hoon
View File

@ -52,7 +52,8 @@
^- (quip card _this)
=/ old-state !<(versioned-state old)
?: ?=(%4 -.old-state)
[~ this(state old-state)]
:- [%pass / %arvo %e %disconnect [~ /]]~
this(state old-state)
=/ new-state *state-zero
=. new-state
%_ new-state
@ -72,7 +73,13 @@
tile-ordering [%chat %publish %links %weather %clock %dojo ~]
==
:_ this(state [%4 new-state])
:- [%pass / %arvo %e %disconnect [~ /]]
%+ welp
:~ [%pass / %arvo %e %disconnect [~ /]]
:* %pass /srv %agent [our.bowl %file-server]
%poke %file-server-action
!>([%serve-dir / /app/landscape %.n])
==
==
%+ turn ~(tap by wex.bowl)
|= [[=wire =ship =term] *]
^- card

17
pkg/arvo/app/publish.hoon
View File

@ -71,7 +71,7 @@
^- (quip card _this)
=/ rav [%sing %t [%da now.bol] /app/publish/notebooks]
:_ this
:~ [%pass /bind %arvo %e %connect [~ /'publish-view'] %publish]
:~ [%pass /view-bind %arvo %e %connect [~ /'publish-view'] %publish]
[%pass /read/paths %arvo %c %warp our.bol q.byk.bol `rav]
[%pass /permissions %agent [our.bol %permission-store] %watch /updates]
(invite-poke:main [%create /publish])
@ -108,7 +108,8 @@
:* %pass /invites %agent [our.bol %invite-store] %watch
/invitatory/publish
==
[%pass / %arvo %e %disconnect [~ /'~publish']]
[%pass /bind %arvo %e %disconnect [~ /'~publish']]
[%pass /view-bind %arvo %e %connect [~ /'publish-view'] %publish]
:* %pass /srv %agent [our.bol %file-server]
%poke %file-server-action
!>([%serve-dir /'~publish' /app/landscape %.n])
@ -174,7 +175,14 @@
==
::
%3
[cards this(state p.old-state)]
:_ this(state p.old-state)
%+ welp cards
:~ [%pass /bind %arvo %e %disconnect [~ /'~publish']]
[%pass /view-bind %arvo %e %connect [~ /'publish-view'] %publish]
:* %pass /srving %agent [our.bol %file-server]
%poke %file-server-action
!>([%serve-dir /'~publish' /app/landscape %.n])
== ==
==
::
++ convert-comment-2-3
@ -500,6 +508,9 @@
::
[%bind ~]
[~ this]
::
[%view-bind ~]
[~ this]
==
::
++ on-fail on-fail:def

13
pkg/arvo/lib/hood/drum.hoon
View File

@ -225,10 +225,10 @@
==
::
++ on-load
|= ver=?(%1 %2 %3 %4)
|= ver=?(%1 %2 %3 %4 %5)
=< se-abet =< se-view
=? . (lte ver %3)
=. ver %4
=? . (lte ver %4)
=. ver %5
=. ..on-load
=< (se-emit %pass /kiln %arvo %g %sear ~wisrut-nocsub)
=< (se-born %home %goad)
@ -241,10 +241,11 @@
=< (se-born %home %link-proxy-hook)
=< (se-born %home %link-listen-hook)
=< (se-born %home %link-view)
=< (se-born %home %file-server)
(se-born %home %s3-store)
=< (se-born %home %s3-store)
(se-born %home %file-server)
.
?> ?=(%4 ver)
?> ?=(%5 ver)
=> (se-born %home %file-server)
=> (se-drop:(se-pull our.hid %dojo) | our.hid %dojo)
(se-drop:(se-pull our.hid %chat-cli) | our.hid %chat-cli)
::