From d03d8f9db0836add8c9738f6ca65223394a30e28 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 15 Mar 2024 12:22:44 +0000 Subject: [PATCH] Something --- src/icalendar_actor.nim | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/icalendar_actor.nim b/src/icalendar_actor.nim index 007e7b6..5fe92bc 100644 --- a/src/icalendar_actor.nim +++ b/src/icalendar_actor.nim @@ -2,13 +2,10 @@ # SPDX-License-Identifier: Unlicense import std/[json, sequtils, tables, uri] -import preserves, preserves/jsonhooks, syndicate -from syndicate/protocols/dataspace import Observe +import preserves, preserves/jsonhooks, syndicate, syndicate/relays import ./icalendar_components -type Observe = dataspace.Observe[Cap] - type BootArgs {.preservesDictionary.} = object dataspace: Cap @@ -19,8 +16,8 @@ proc importCalendar(location: string): Component = else: var js = parseFile(uri.path) - pr = jsonhooks.toPreserveHook(js, void) - if not result.fromPreserve(pr): + pr = jsonhooks.toPreservesHook(js) + if not result.fromPreserves(pr): # TODO: convert directly from JsonNode raise newException(ValueError, "Preserves was not a valid iCalendar component") if result.label != "vcalendar": @@ -50,9 +47,9 @@ proc serve(turn: var Turn; url: string): Cap = ds runActor("icalendar_actor") do (root: Cap; turn: var Turn): - connectStdio(root, turn) + connectStdio(turn, root) stderr.writeLine "connected stdio to ", root - during(turn, root, ?BootArgs) do (ds: Cap): + during(turn, root, ?:BootArgs) do (ds: Cap): stderr.writeLine "got dataspace at ", ds during(turn, ds, ?Observe(pattern: !CalendarDataspace) ?? {0: grabLit()}) do (url: string): let cap = serve(turn, url)