Skip to content

Keep builder state when a property is None #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pojntfx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Keep builder state when a property is None #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 35 additions & 20 deletions p2panda-gobject/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,53 +167,68 @@ pub mod imp {
self.node_builder.replace_with(|builder| {
let builder = builder.take().unwrap_or_else(node::Node::builder);

match pspec.name() {
"private-key" => value
let builder = match pspec.name() {
"private-key" => match value
.get::<Option<PrivateKey>>()
.expect("type conformity checked by `Object::set_property`")
.map(|private_key| builder.private_key(private_key.0)),
"database-url" => value
{
Some(private_key) => builder.private_key(private_key.0),
None => builder,
},
"database-url" => match value
.get::<Option<&str>>()
.expect("type conformity checked by `Object::set_property`")
.map(|database_url| builder.database_url(database_url)),
{
Some(database_url) => builder.database_url(database_url),
None => builder,
},
/*"ack-policy" => {
let ack_policy = value
.get::<AckPolicy>()
.expect("type conformity checked by `Object::set_property`");
Some(builder.ack_policy(ack_policy.into()))
builder.ack_policy(ack_policy.into())
}*/
"network-id" => value
"network-id" => match value
.get::<Option<NetworkId>>()
.expect("type conformity checked by `Object::set_property`")
.map(|network_id| builder.network_id(network_id.0)),
"relay-url" => value
{
Some(network_id) => builder.network_id(network_id.0),
None => builder,
},
"relay-url" => match value
.get::<Option<glib::Uri>>()
.expect("type conformity checked by `Object::set_property`")
.map(|relay_url| {
builder.relay_url(
node::RelayUrl::from_str(relay_url.to_str().as_str())
.expect("Malformed URL"),
)
}),
"bootstrap" => value
{
Some(relay_url) => builder.relay_url(
node::RelayUrl::from_str(relay_url.to_str().as_str())
.expect("Malformed URL"),
),
None => builder,
},
"bootstrap" => match value
.get::<Option<NodeId>>()
.expect("type conformity checked by `Object::set_property`")
.map(|node_id| {
{
Some(node_id) => {
let id = node_id.id;
let relay_url = node_id
.relay_url
.expect("A boostrap node needs a known relay url");

builder.bootstrap(id, relay_url)
}),
}
None => builder,
},
"mdns-mode" => {
let mdns_mode = value
.get::<MdnsDiscoveryMode>()
.expect("type conformity checked by `Object::set_property`");
Some(builder.mdns_mode(mdns_mode.into()))
builder.mdns_mode(mdns_mode.into())
}
_ => unimplemented!(),
}
};

Some(builder)
});
}
}
Expand Down