Sweetbread/Alfis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small refactoring and fix LF escape in domain data.

Browse Source
This commit is contained in:
Revertron
2022-07-26 18:09:37 +02:00
parent 492bb4e16d
commit 8cfc48e9c0
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -84,7 +84,7 @@ dependencies = [
[[package]] [[package]]
name = "alfis" name = "alfis"
version = "0.7.7" version = "0.7.8"
dependencies = [ dependencies = [
"base64", "base64",
"bincode", "bincode",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "alfis" name = "alfis"
version = "0.7.7" version = "0.7.8"
authors = ["Revertron <alfis@revertron.com>"] authors = ["Revertron <alfis@revertron.com>"]
edition = "2021" edition = "2021"
build = "build.rs" build = "build.rs"
src/p2p/network.rs
+3 -2
View File
@@ -250,7 +250,7 @@ impl Network {
debug!("Node from {} disconnected", peer.get_addr().ip()); debug!("Node from {} disconnected", peer.get_addr().ip());
return false; return false;
} }
match peer.get_state().clone() { match *peer.get_state() {
State::Connected => { State::Connected => {
let stream = peer.get_stream(); let stream = peer.get_stream();
return match read_client_handshake(stream) { return match read_client_handshake(stream) {
@@ -333,9 +333,9 @@ impl Network {
let new_state = self.handle_message(message, &event.token(), seen_blocks); let new_state = self.handle_message(message, &event.token(), seen_blocks);
let peer = self.peers.get_mut_peer(&event.token()).unwrap(); let peer = self.peers.get_mut_peer(&event.token()).unwrap();
//debug!("Got message from {}: {:?}", &peer.get_addr(), &m); //debug!("Got message from {}: {:?}", &peer.get_addr(), &m);
let stream = peer.get_stream();
match new_state { match new_state {
State::Message { data } => { State::Message { data } => {
let stream = peer.get_stream();
registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap(); registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap();
peer.set_state(State::Message { data }); peer.set_state(State::Message { data });
} }
@@ -358,6 +358,7 @@ impl Network {
self.peers.ignore_peer(registry, &event.token()); self.peers.ignore_peer(registry, &event.token());
} }
State::SendLoop => { State::SendLoop => {
let stream = peer.get_stream();
registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap(); registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap();
peer.set_state(State::SendLoop); peer.set_state(State::SendLoop);
} }
src/web_ui.rs
+1 -1
View File
@@ -360,7 +360,7 @@ fn load_domains(context: &mut MutexGuard<Context>, handle: &Handle<()>) {
//debug!("Domains: {:?}", &domains.values()); //debug!("Domains: {:?}", &domains.values());
for (_identity, (domain, timestamp, data)) in domains { for (_identity, (domain, timestamp, data)) in domains {
let d = serde_json::to_string(&data).unwrap(); let d = serde_json::to_string(&data).unwrap();
let d = d.replace("'", "\\'"); let d = d.replace("'", "\\'").replace("\\n", "\\\\n");
let command = format!("addMyDomain('{}', {}, {}, '{}');", &domain, timestamp, timestamp + DOMAIN_LIFETIME, &d); let command = format!("addMyDomain('{}', {}, {}, '{}');", &domain, timestamp, timestamp + DOMAIN_LIFETIME, &d);
let _ = handle.dispatch(move |web_view|{ let _ = handle.dispatch(move |web_view|{
web_view.eval(&command) web_view.eval(&command)