graph-store: +on-load

pkg/arvo/app/graph-store.hoon

@@ -83,7 +83,13 @@
       |=(a=* *update-log:zero:store)
     ==
   ::
-    %2  !!
+      %2  
+    %_  $
+      -.old            %3
+      update-logs.old  (~(run by update-logs.old) update-log-to-one:store)
+      graphs.old       (~(run by graphs.old) marked-graph-to-one:store)
+      archive.old      (~(run by archive.old) marked-graph-to-one:store)
+    ==
   ::
     %3  [cards this(state old)]
   ==

pkg/arvo/app/hark-store.hoon

@@ -24,11 +24,12 @@
       state-3
       state-4
       state-5
+      state-6
   ==
 +$  unread-stats
   [indices=(set index:graph-store) last=@da]
 ::
-+$  base-state 
++$  base-state
   $:  unreads-each=(jug stats-index:store index:graph-store)
       unreads-count=(map stats-index:store @ud)
       last-seen=(map stats-index:store @da)
@@ -45,13 +46,16 @@
   [%3 state-two:store]
 ::
 +$  state-4
-  [%4 base-state]
+  [%4 state-three:store]
 ::
 +$  state-5
-  [%5 base-state]
+  [%5 state-three:store]
+::
++$  state-6
+  [%6 base-state]
 ::
 +$  inflated-state
-  $:  state-5
+  $:  state-6
       cache
   ==
 ::  $cache: useful to have precalculated, but can be derived from state
@@ -92,9 +96,16 @@
   =|  cards=(list card)
   |^  
   ?-  -.old
-      %5  
+      %6  
     :-  (flop cards)
     this(-.state old, +.state (inflate-cache:ha old))
+    ::
+      %5
+    %_  $
+      -.old  %6
+      notifications.old  (convert-notifications-4 notifications.old)
+      archive.old        (convert-notifications-4 archive.old)
+    ==
     ::
       %4
     %_  $
@@ -149,15 +160,59 @@
     ==
   ==
   ::
-  ++  convert-notifications-3
-    |=  old=notifications:state-two:store
+  ++  convert-notifications-4
+    |=  old=notifications:state-three:store
     %+  gas:orm  *notifications:store
     ^-  (list [@da timebox:store])
     %+  murn  
-      (tap:orm:state-two:store old)
-    |=  [time=@da =timebox:state-two:store]
+      (tap:orm:state-three:store old)
+    |=  [time=@da =timebox:state-three:store]
     ^-  (unit [@da timebox:store])
     =/  new-timebox=timebox:store
+      (convert-timebox-4 timebox)
+    ?:  =(0 ~(wyt by new-timebox))
+      ~ 
+    `[time new-timebox]
+  ::
+  ++  convert-timebox-4
+    |=  =timebox:state-three:store
+    ^-  timebox:store
+    %-  ~(gas by *timebox:store)
+    ^-  (list [index:store notification:store])
+    %+  murn
+      ~(tap by timebox)
+    |=  [=index:store =notification:state-three:store]
+    ^-  (unit [index:store notification:store])
+    =/  new-notification=(unit notification:store)
+      (convert-notification-4 notification)
+    ?~  new-notification  ~
+    `[index u.new-notification]
+  ::
+  ++  convert-notification-4
+    |=  =notification:state-three:store
+    ^-  (unit notification:store)
+    ?:  ?=(%group -.contents.notification)
+      `notification
+    =/  con=(list post:post)
+      (convert-graph-contents-4 list.contents.notification)
+    ?:  =(~ con)  ~
+    =,  notification
+    `[date read %graph con]
+  ::
+  ++  convert-graph-contents-4
+    |=  con=(list post:post-zero:post)
+    ^-  (list post:post)
+    (turn con post-to-one:graph-store)
+  ::
+  ++  convert-notifications-3
+    |=  old=notifications:state-two:store
+    %+  gas:orm:state-three:store  *notifications:state-three:store
+    ^-  (list [@da timebox:state-three:store])
+    %+  murn  
+      (tap:orm:state-two:store old)
+    |=  [time=@da =timebox:state-two:store]
+    ^-  (unit [@da timebox:state-three:store])
+    =/  new-timebox=timebox:state-three:store
       (convert-timebox-3 timebox)
     ?:  =(0 ~(wyt by new-timebox))
       ~ 
@@ -165,21 +220,21 @@
   ::
   ++  convert-timebox-3
     |=  =timebox:state-two:store
-    ^-  timebox:store
-    %-  ~(gas by *timebox:store)
-    ^-  (list [index:store notification:store])
+    ^-  timebox:state-three:store
+    %-  ~(gas by *timebox:state-three:store)
+    ^-  (list [index:state-three:store notification:state-three:store])
     %+  murn
       ~(tap by timebox)
     |=  [=index:store =notification:state-two:store]
-    ^-  (unit [index:store notification:store])
-    =/  new-notification=(unit notification:store)
+    ^-  (unit [index:store notification:state-three:store])
+    =/  new-notification=(unit notification:state-three:store)
       (convert-notification-3 notification)
     ?~  new-notification  ~
     `[index u.new-notification]
   ::
   ++  convert-notification-3
     |=  =notification:state-two:store
-    ^-  (unit notification:store)
+    ^-  (unit notification:state-three:store)
     ?:  ?=(%graph -.contents.notification)
       `notification
     =/  con=(list group-contents:store)
@@ -778,7 +833,7 @@
   ==
 ::
 ++  inflate-cache
-  |=  state-5
+  |=  state-6
   ^+  +.state
   =.  +.state
     *cache

pkg/arvo/lib/graph-store.hoon

@@ -5,6 +5,101 @@
 =,  sur
 =,  pos
 |%
+::
+++  update-log-to-one
+  |=  =update-log:zero
+  ^-  ^update-log
+  %+  gas:orm-log  *^update-log
+  %+  turn  (tap:orm-log:zero update-log)
+  |=  [=time =logged-update:zero]
+  :-  time
+  :-  p.logged-update  
+  (logged-update-to-one q.logged-update)
+::
+++  logged-update-to-one
+  |=  upd=logged-update-0:zero
+  ?+  -.upd  upd
+    %add-graph  upd(graph (graph-to-one graph.upd))
+    %add-nodes  upd(nodes (~(run by nodes.upd) node-to-one))
+  ==
+::
+++  node-to-one
+  |=  =node:zero
+  (node:(upgrade ,post:zero ,post) node post-to-one)
+::
+++  graph-to-one
+  |=  =graph:zero
+  (graph:(upgrade ,post:zero ,post) graph post-to-one)
+::
+++  marked-graph-to-one
+  |=  [=graph:zero m=(unit mark)]
+  [(graph-to-one graph) m]
+::
+++  post-to-one
+  |=  p=post:zero
+  ^-  post
+  p(contents (contents-to-one contents.p))
+::
+++  contents-to-one
+  |=  cs=(list content:zero)
+  ^-  (list content)
+  %+  murn  cs
+  |=  =content:zero
+  ^-  (unit ^content)
+  ?:  ?=(%reference -.content)  ~
+  `content
+::
+++  upgrade
+  |*  [in-pst=mold out-pst=mold]
+  =>
+    |%
+    ++  in-orm
+      ((ordered-map atom in-node) gth)
+    +$  in-node
+      [post=in-pst children=in-internal-graph]
+    +$  in-graph
+      ((mop atom in-node) gth)
+    +$  in-internal-graph
+      $~  [%empty ~]
+      $%  [%graph p=in-graph]
+          [%empty ~]
+      ==
+    ::
+    ++  out-orm
+      ((ordered-map atom out-node) gth)
+    +$  out-node
+      [post=out-pst children=out-internal-graph]
+    +$  out-graph
+      ((mop atom out-node) gth)
+    +$  out-internal-graph
+      $~  [%empty ~]
+      $%  [%graph p=out-graph]
+          [%empty ~]
+      ==
+    --
+  |%
+  ::
+  ++  graph
+    |=  $:  gra=in-graph
+            fn=$-(in-pst out-pst)
+        ==
+    ^-  out-graph
+    %+  gas:out-orm  *out-graph
+    ^-  (list [atom out-node])
+    %+  turn  (tap:in-orm gra)
+    |=  [a=atom n=in-node]
+    ^-  [atom out-node]
+    [a (node n fn)]
+  ::
+  ++  node
+    |=  [nod=in-node fn=$-(in-pst out-pst)]
+    ^-  out-node
+    :-  (fn post.nod)
+    ^-  out-internal-graph
+    ?:  ?=(%empty -.children.nod)
+      [%empty ~]
+    [%graph (graph p.children.nod fn)]
+  --
 ::  NOTE: move these functions to zuse
 ++  nu                                              ::  parse number as hex
   |=  jon=json

pkg/arvo/lib/graph.hoon

@@ -32,6 +32,47 @@
       %run-updates        ~[resource.q.update]
   ==
 ::
+++  upgrade
+  |*  [pst=mold out-pst=mold]
+  =>
+    |%
+    ++  orm
+      ((ordered-map atom node) gth)
+    +$  node
+      [post=pst children=internal-graph]
+    +$  graph
+      ((mop atom node) gth)
+    +$  internal-graph
+      $~  [%empty ~]
+      $%  [%graph p=graph]
+          [%empty ~]
+      ==
+    ::
+    ++  out-orm
+      ((ordered-map atom out-node) gth)
+    +$  out-node
+      [post=out-pst children=out-internal-graph]
+    +$  out-graph
+      ((mop atom out-node) gth)
+    +$  out-internal-graph
+      $~  [%empty ~]
+      $%  [%graph p=out-graph]
+          [%empty ~]
+      ==
+    --
+
+  |=  $:  gra=graph
+          fn=$-(pst out-pst)
+      ==
+  ^-  out-graph
+  %-  gas:out-orm
+  %+  turn  (tap:orm gra)
+  |=  [=atom =node]
+  :-  (fn post.node)
+  ?:  ?=(%empty -.children.node)
+    [%empty ~]
+  $(gra p.children.node)
+::
 ++  get-graph
   |=  res=resource
   ^-  update:store

pkg/arvo/sur/hark-store.hoon

@@ -33,7 +33,7 @@
     ==
   ::
   +$  contents
-    $%  [%graph =(list post:post)]
+    $%  [%graph =(list post:post-zero:post)]
         [%group =(list group-contents)]
         [%chat =(list envelope:chat-store)]
     ==
@@ -75,7 +75,7 @@
     [date=@da read=? =contents]
   ::
   +$  contents
-    $%  [%graph =(list post:post)]
+    $%  [%graph =(list post:post-zero:post)]
         [%group =(list group-contents)]
     ==
   ::
@@ -90,6 +90,38 @@
   ::
   --
 ::
+++  state-three
+  =<  state
+  |% 
+  +$  state
+    $:  unreads-each=(jug stats-index index:graph-store)
+        unreads-count=(map stats-index @ud)
+        last-seen=(map stats-index @da)
+        =notifications
+        archive=notifications
+        current-timebox=@da
+        dnd=_|
+    ==
+  ::
+  ++  orm
+    ((ordered-map @da timebox) gth)
+  ::
+  +$  notification
+    [date=@da read=? =contents]
+  ::
+  +$  contents
+    $%  [%graph =(list post:post-zero:post)]
+        [%group =(list group-contents)]
+    ==
+  ::
+  +$  timebox
+    (map index notification)
+  ::
+  +$  notifications
+    ((mop @da timebox) gth)
+  ::
+  --
+::
 +$  index
   $%  $:  %graph
           group=resource