vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

Making all bk commands in the same thread

Browse source
This commit is contained in:
Daniel García Moreno 2017-08-25 13:06:50 +02:00
parent ee892b0c89
commit 5f62e3210e
1 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/backend.rs
View file

@ -373,16 +373,14 @@ impl Backend {
let userid = self.data.lock().unwrap().user_id.clone();
let tx = self.tx.clone();
thread::spawn(move || {
match get_user_avatar(&baseu, &userid) {
Ok(fname) => {
tx.send(BKResponse::Avatar(fname)).unwrap();
},
Err(err) => {
tx.send(BKResponse::AvatarError(err)).unwrap();
}
match get_user_avatar(&baseu, &userid) {
Ok(fname) => {
tx.send(BKResponse::Avatar(fname)).unwrap();
},
Err(err) => {
tx.send(BKResponse::AvatarError(err)).unwrap();
}
});
};
Ok(())
}
@ -564,16 +562,14 @@ impl Backend {
let baseu = self.get_base_url()?;
let tx = self.tx.clone();
thread::spawn(move || {
match thumb!(&baseu, &avatar_url) {
Ok(fname) => {
tx.send(BKResponse::RoomMemberAvatar(memberid, fname)).unwrap();
},
Err(err) => {
tx.send(BKResponse::RoomMemberAvatarError(err)).unwrap();
}
match thumb!(&baseu, &avatar_url) {
Ok(fname) => {
tx.send(BKResponse::RoomMemberAvatar(memberid, fname)).unwrap();
},
Err(err) => {
tx.send(BKResponse::RoomMemberAvatarError(err)).unwrap();
}
});
}
Ok(())
}
@ -588,10 +584,8 @@ impl Backend {
let base = self.get_base_url()?;
let u = url.clone();
thread::spawn(move || {
let fname = thumb!(&base, &u).unwrap();
tx.send(fname).unwrap();
});
let fname = thumb!(&base, &u)?;
tx.send(fname).unwrap();
Ok(())
}
@ -600,12 +594,10 @@ impl Backend {
let baseu = self.get_base_url()?;
let u = String::from(uid);
thread::spawn(move || {
match get_user_avatar(&baseu, &u) {
Ok(fname) => { tx.send(fname).unwrap(); },
Err(_) => { tx.send(String::from("")).unwrap(); }
};
});
match get_user_avatar(&baseu, &u) {
Ok(fname) => { tx.send(fname).unwrap(); },
Err(_) => { tx.send(String::from("")).unwrap(); }
};
Ok(())
}