marks mostly functional

2025-01-02 09:32:29 +03:00 · 2017-02-13 16:02:25 -08:00 · 2017-02-13 16:02:25 -08:00 · 53eef4cd8d
commit 53eef4cd8d
parent 8a175dc6e1
39 changed files with 89 additions and 27 deletions
--- a/lib/gh-parse.hoon
+++ b/lib/gh-parse.hoon
@ -4,6 +4,8 @@
 ::  marks should include this library.
 ::
 /-  gh
+/+  old-zuse
+=,  old-zuse
 |%
 ++  repository
  ^-  $-(json (unit repository:gh))
@ -150,6 +152,7 @@
 ++  id  no:jo
 ++  print-issue
  |=  issue:gh
+  =,  format
  ^-  wain
  =+  c=(cury cat 3)
  :*  :(c 'title: ' title ' (#' (rsh 3 2 (scot %ui number)) ')')
--- a/lib/httr-to-json.hoon
+++ b/lib/httr-to-json.hoon
@ -1 +1,4 @@
+/+  old-zuse
+=,  old-zuse
+=,  format
 |=(hit/httr ~|(hit ?>(?=($2 (div p.hit 100)) (need (de-json q:(need r.hit))))))
--- a/lib/old-zuse.hoon
+++ b/lib/old-zuse.hoon
@ -164,7 +164,7 @@
 ++  mess        mess:eyre                               ::  raw http headers
 ++  meta        !!                                      ::  path metadata
 ++  meth        meth:eyre                               ::  http methods
-++  mime        !!                                      ::  mimetyped data
++  mime        mime.is                                 ::  mimetyped data
 ++  mite        mite:eyre                               ::  mime type
 ++  miso        miso:clay                               ::  ankh delta
 ++  misu        misu:clay                               ::  computed delta
--- a/mar/dill/belt.hoon
+++ b/mar/dill/belt.hoon
@ -3,10 +3,12 @@
  ::
 /?    310
 /-    kyev, sole
+/+    old-zuse
 ::
 ::::
  ::
 =,  sole
+=,  old-zuse
 |_  dill-belt
 ::
 ++  grab                                                ::  convert from
--- a/mar/dill/blit.hoon
+++ b/mar/dill/blit.hoon
@ -3,7 +3,9 @@
  ::
 /?    310
 /-    sole
+/+    old-zuse
 =,  sole
+=,  old-zuse
 |_  dib/dill-blit
 ::
 ++  grab                                                ::  convert from
--- a/mar/gh/issue-comment.hoon
+++ b/mar/gh/issue-comment.hoon
@ -1,6 +1,7 @@
 ::  Converts the result of an 'issues' event into a issues:gh.
 /-  gh
-/+  gh-parse, talk
+/+  gh-parse, talk, old-zuse
+=,  old-zuse
 |_  issue-comment/issue-comment:gh
 ++  grow
  |%
--- a/mar/gh/issue.hoon
+++ b/mar/gh/issue.hoon
@ -1,6 +1,7 @@
 /-  gh
-/+  gh-parse
+/+  gh-parse, old-zuse
 =,  mimes:html
+=,  old-zuse
 |_  issue/issue:gh
 ++  grab
  |%
--- a/mar/gh/issues.hoon
+++ b/mar/gh/issues.hoon
@ -1,6 +1,7 @@
 ::  Converts the result of an 'issues' event into a issues:gh.
 /-  gh
-/+  gh-parse, talk
+/+  gh-parse, talk, old-zuse
+=,  old-zuse
 |_  issues/issues:gh
 ++  grow
  |%
--- a/mar/gh/list-issues.hoon
+++ b/mar/gh/list-issues.hoon
@ -1,6 +1,7 @@
 /-  gh
-/+  gh-parse
+/+  gh-parse, old-zuse
 =,  mimes:html
+=,  old-zuse
 |_  issues/(list issue:gh)
 ++  grab
  |%
--- a/mar/gh/poke.hoon
+++ b/mar/gh/poke.hoon
@ -1,3 +1,5 @@
+/+  old-zuse
+=,  old-zuse
 |_  {method/meth endpoint/(list @t) jon/json}
 ++  grab
  |%
--- a/mar/gmail/req.hoon
+++ b/mar/gmail/req.hoon
@ -1,5 +1,7 @@
 /-  rfc, gmail-label
+/+    old-zuse

+=,  old-zuse
 |_  {method/meth endpoint/path query/quay mes/?(message:rfc label-req:gmail-label)} :: jon=(unit json)]
 ++  grab
  |%
--- a/mar/lens/command.hoon
+++ b/mar/lens/command.hoon
@ -1,5 +1,7 @@
 /-  lens
+/+    old-zuse
 ::
+=,  old-zuse
 |_  com/command:lens
 ++  grab
  |%
--- a/mar/sole/action.hoon
+++ b/mar/sole/action.hoon
@ -3,10 +3,12 @@
  ::
 /?    310
 /-    sole
+/+    old-zuse
 ::
 ::::
  ::
 =,  sole
+=,  old-zuse
 |_  sole-action
 ::
 ++  grab                                                ::  convert from
--- a/mar/sole/effect.hoon
+++ b/mar/sole/effect.hoon
@ -3,13 +3,16 @@
  ::
 /?    310
 /-    sole
+/+    old-zuse
 ::
 ::::
  ::
 =,  sole
 =,  format
+=,  old-zuse
 |%
 ++  mar-sole-change                       ::  XX  dependency
+  =,  old-zuse
  |_  cha/sole-change
  ++  grow
    |%  ++  json
@ -51,7 +54,7 @@
  ++  lens-json                       :: json for cli client
    ^-  ?($~ ^json)                   :: null = ignore
    ?+    -.sef  ~
-        $tan  (wall (turn (flop p.sef) ~(ram re a))))
+        $tan  (wall (turn (flop p.sef) |=(a/tank ~(ram re a))))
        $txt  s+(crip p.sef)
        $sav
      (pairs file+s+(crip <`path`p.sef>) data+s+(crip (sifo q.sef)) ~)
--- a/mar/talk/command.hoon
+++ b/mar/talk/command.hoon
@ -3,6 +3,7 @@
  ::
 /?    310
 /-    talk
+/+    old-zuse
 ::
 =,  talk
 |_  cod/command
@ -11,7 +12,8 @@
  |%
  ++  noun  command                                     ::  clam from %noun
  ++  json 
-    =>  [jo ..command]
+    =,  old-zuse
+    =,  jo
    |=  a/json  ^-  command
    =-  (need ((of -) a))
    =<  :~  publish+(ar thot)
--- a/mar/talk/comment.hoon
+++ b/mar/talk/comment.hoon
@ -2,7 +2,9 @@
 ::::  /hoon/comment/talk/mar
  ::
 /?    310
+/+    old-zuse
 ::
+=,  old-zuse
 |_  {pax/path sup/spur txt/@t}
 ++  grab
  |%
--- a/mar/talk/fora-post.hoon
+++ b/mar/talk/fora-post.hoon
@ -2,7 +2,9 @@
 ::::  /hoon/fora-post/talk/mar
  ::
 /?    310
+/+    old-zuse
 ::
+=,  old-zuse
 |_  {pax/path sup/spur hed/@t txt/@t}
 ++  grab
  |%
--- a/mar/talk/report.hoon
+++ b/mar/talk/report.hoon
@ -3,11 +3,13 @@
  ::
 /?    310
 /-    talk
-/+    talk
+/+    talk, old-zuse
 ::
 =,  talk
 =,  mimes:html
 =,  html
+=,  format
+=,  old-zuse
 |_  rep/report
 ::
 ++  grab                                                ::  convert from
@ -39,7 +41,7 @@
        delivery+[%s b]
      ==
    ++  jope  |=(a/ship (jape +:<a>)) ::[%s (crip +:(scow %p a))])
-    ++  joke  |=(a/tank (jape (of-wall (wash 0^80 a)))
+    ++  joke  |=(a/tank (jape (of-wall (wash 0^80 a))))
    ++  jode  |=(a/time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1)))
    ++  jome                                            ::  stringify keys
      |*  {a/_cord b/_json}
--- a/mar/talk/telegrams.hoon
+++ b/mar/talk/telegrams.hoon
@ -3,12 +3,13 @@
  ::
 /?    310
 /-  talk
-/+  talk,map-to-json
+/+  talk,map-to-json, old-zuse
 ::
 =,  talk
 =,  mimes:html
 =,  format
 =,  html
+=,  old-zuse
 |_  gam/(list telegram)
 ::
 ++  grab  
@ -128,7 +129,7 @@
      ==
    ::
    ++  jope  |=(a/ship (jape +:<a>)) ::[%s (crip +:(scow %p a))])
-    ++  joke  |=(a/tank (jape (of-wall (wash 0^80 a)))])
+    ++  joke  |=(a/tank (jape (of-wall (wash 0^80 a))))
    ++  jode  |=(a/time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1)))
    ::
    ++  thot
--- a/mar/tree/hymn.hoon
+++ b/mar/tree/hymn.hoon
@ -2,7 +2,9 @@
 ::::  /hoon/hymn/tree/mar
  ::
 /?    310
+/+    old-zuse
 =,  mimes:html
+=,  old-zuse
 |_  own/manx
 ::
 ++  grow                                                ::  convert to
--- a/mar/tree/json.hoon
+++ b/mar/tree/json.hoon
@ -11,7 +11,7 @@
 ::
 ++  grow                                                ::  convert to
  |%
-  ++  mime  [/text/json (as-octs (en-json jon))]        ::  convert to %mime
+  ++  mime  [/text/json (as-octt (en-json jon))]        ::  convert to %mime
  --
 ++  grab
  |%                                                    ::  convert from
--- a/mar/twit/cred.hoon
+++ b/mar/twit/cred.hoon
@ -3,7 +3,8 @@
 ::::  /hoon/cred/twit/mar
  ::
 /-  plan-acct
-/+  httr-to-json, twitter
+/+  httr-to-json, twitter, old-zuse
+=,  old-zuse
 |_  {acc/plan-acct raw/json}
 ++  grab
  |%
--- a/mar/twit/feed.hoon
+++ b/mar/twit/feed.hoon
@ -3,7 +3,8 @@
 ::::  /hoon/feed/twit/mar
  ::
 /-  talk
-/+  twitter, httr-to-json
+/+  twitter, httr-to-json, old-zuse
+=,  old-zuse
 |_  fed/(list post:twitter)
 ++  grab
  |%
--- a/mar/twit/post.hoon
+++ b/mar/twit/post.hoon
@ -2,7 +2,8 @@
 ::
 ::::  /hoon/post/twit/mar
  ::
-/+  twitter, httr-to-json
+/+  twitter, httr-to-json, old-zuse
+=,  old-zuse
 |_  post:twitter
 ++  grab
  |%
--- a/mar/twit/req.hoon
+++ b/mar/twit/req.hoon
@ -2,7 +2,8 @@
 ::
 ::::  /hoon/req/twit/mar
  ::
-/+  twitter
+/+  twitter, old-zuse
+=,  old-zuse
 |_  {req/endpoint:reqs:twitter quy/quay}
 ++  grab
  |%
--- a/mar/twit/usel.hoon
+++ b/mar/twit/usel.hoon
@ -2,7 +2,8 @@
 ::
 ::::  /hoon/usel/twit/mar
  ::
-/+  twitter, httr-to-json
+/+  twitter, httr-to-json, old-zuse
+=,  old-zuse
 |_  (list who/@ta)
 ++  grab
  |%
--- a/mar/womb/balance.hoon
+++ b/mar/womb/balance.hoon
@ -2,10 +2,11 @@
 ::::  /hoon/stat-all/womb/mar
  ::
 /?    310
-/+    womb
+/+    womb, old-zuse
 ::
 ::::  ~fyr
  ::
+=,  old-zuse
 |_  balance:womb
 ::
 ++  grab                                                ::  convert from
--- a/mar/womb/bonus.hoon
+++ b/mar/womb/bonus.hoon
@ -2,6 +2,8 @@
 ::::  /hoon/bonus/womb/mar
  ::
 /?    310
+/+    old-zuse
+=,  old-zuse
 |_  {aut/@uvH pla/@u sta/@u}
 ::
 ++  grab                                                ::  convert from
--- a/mar/womb/claim.hoon
+++ b/mar/womb/claim.hoon
@ -2,6 +2,8 @@
 ::::  /hoon/claim/womb/mar
  ::
 /?    310
+/+    old-zuse
+=,  old-zuse
 |_  {aut/@uvH her/@p}
 ::
 ++  grab                                                ::  convert from
--- a/mar/womb/invite.hoon
+++ b/mar/womb/invite.hoon
@ -2,10 +2,11 @@
 ::::  /hoon/stat-all/womb/mar
  ::
 /?    310
-/+    womb
+/+    womb, old-zuse
 ::
 ::::  ~fyr
  ::
+=,  old-zuse
 |_  {cord invite}:womb
 ::
 ++  grab                                                ::  convert from
--- a/mar/womb/recycle.hoon
+++ b/mar/womb/recycle.hoon
@ -2,6 +2,8 @@
 ::::  /hoon/recycle/womb/mar
  ::
 /?    310
+/+    old-zuse
+=,  old-zuse
 |_  {who/@txmail him/knot tik/knot}
 ::
 ++  grab                                                ::  convert from
--- a/mar/womb/stat-all.hoon
+++ b/mar/womb/stat-all.hoon
@ -2,10 +2,11 @@
 ::::  /hoon/stat-all/womb/mar
  ::
 /?    310
-/+    womb
+/+    womb, old-zuse
 ::
 ::::  ~fyr
  ::
+=,  old-zuse
 |_  all/(map ship stat:womb)
 ::
 ++  grab                                                ::  convert from
--- a/mar/womb/ticket-info.hoon
+++ b/mar/womb/ticket-info.hoon
@ -2,9 +2,11 @@
 ::::  /hoon/stat-all/womb/mar
  ::
 /?    310
+/+    old-zuse
 ::
 ::::  ~fyr
  ::
+=,  old-zuse
 |_  {pas/@uvH status/?($fail $good $used)}
 ::
 ++  grab
--- a/mar/write/paste.hoon
+++ b/mar/write/paste.hoon
@ -2,7 +2,9 @@
 ::::  /hoon/paste/write/mar
  ::
 /?    310
+/+    old-zuse
 ::
+=,  old-zuse
 |_  {typ/?($hoon $md $txt) txt/@t}
 ++  grab
  |%
--- a/mar/write/plan-info.hoon
+++ b/mar/write/plan-info.hoon
@ -2,7 +2,9 @@
 ::::  /hoon/paste/write/mar
  ::
 /?    310
+/+    old-zuse
 ::
+=,  old-zuse
 |_  {who/@txname loc/@txloc}
 ++  grab
  |%
--- a/mar/write/tree.hoon
+++ b/mar/write/tree.hoon
@ -2,8 +2,10 @@
 ::::  /hoon/tree/write/mar
  ::
 /?    310
+/+    old-zuse
 ::
 =,  mimes:html
+=,  old-zuse
 |_  {sup/spur mim/mime}
 ++  grab
  |%
--- a/mar/write/wipe.hoon
+++ b/mar/write/wipe.hoon
@ -2,7 +2,9 @@
 ::::  /hoon/wipe/write/mar
  ::
 /?    310
+/+    old-zuse
 ::
+=,  old-zuse
 |_  spur
 ++  grab
  |%
--- a/sur/gmail-label.hoon
+++ b/sur/gmail-label.hoon
@ -22,13 +22,14 @@
 ::  the label resource returned by gmail in response to your successful request
 ++  label  *                       

-++  label-req-to-json
-  |=  label-req
-  %-  jobe  :^
-  ['name' `json`s+name]
-  ['labelListVisibility' `json`s+(crip (sifo `cord`llv))]
-  ['messageListVisibility' `json`s+(crip (sifo `cord`mlv))]
-  ~
++  label-req-to-json  !! 
+::  XX belongs in a lib/
+::   |=  label-req
+::   %-  jobe  :^
+::   ['name' `json`s+name]
+::   ['labelListVisibility' `json`s+(crip (sifo `cord`llv))]
+::   ['messageListVisibility' `json`s+(crip (sifo `cord`mlv))]
+::   ~
 --


--- a/sys/vane/ford.hoon
+++ b/sys/vane/ford.hoon
@ -1696,6 +1696,7 @@
        ?~  bir  (fine cof ..neck)
        =.  boy
          ?:  p.i.bir  boy
+::           ~&  ford+tscm+[q.i.bir boy]
          (welp boy [[%use [%limb q.i.bir] [%$ 1]] ~])
        =+  byf=(~(get by bil) q.i.bir)
        ?^  byf