phundrak/chat-reseau-p8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed request 4.2.2 in server and client

Browse Source
This commit is contained in:
Phuntsok Drak-pa 2018-03-25 16:31:53 +02:00
parent 741dff0195
commit c0e43b4a46
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Rust/src/client.rs
View File

@ -12,7 +12,7 @@ use self::chrono::Local;
/* /*
0.1 [ ] 0.1 [X]
1.1 [X] 1.1 [X]
1.2 [ ] 1.2 [ ]
1.3 [X] 1.3 [X]
@ -29,7 +29,7 @@ use self::chrono::Local;
4.1.1 [X] 4.1.1 [X]
4.1.2 [X] 4.1.2 [X]
4.2.1 [X] 4.2.1 [X]
4.2.2 [-] 4.2.2 [X]
*/ */
@ -259,6 +259,7 @@ fn exchange_with_server(stream: TcpStream) {
} }
msg = String::new(); msg = String::new();
#[allow(unused_assignments)] #[allow(unused_assignments)]
#[allow(unused_assignments)]
i = i - 1; i = i - 1;
} }
} }
@ -296,8 +297,13 @@ fn exchange_with_server(stream: TcpStream) {
return Ok("Ok"); return Ok("Ok");
} }
"LIST" => { "LIST" => {
println!("{}", ">>>> LIST OF CLIENTS CONNECTED <<<<".bold().yellow()); println!(
for i in 2..spliced_input.len() { "{}{}{}",
">>>> LIST OF CLIENTS CONNECTED (".bold().yellow(),
spliced_input[2],
") <<<<".bold().yellow()
);
for i in 3..spliced_input.len() {
println!("\t\t{}", spliced_input[i]); println!("\t\t{}", spliced_input[i]);
} }
} }

6
Rust/src/server.rs
View File

@ -31,7 +31,7 @@ use self::chrono::Local;
4.1.1 [X] 4.1.1 [X]
4.1.2 [X] 4.1.2 [X]
4.2.1 [X] 4.2.1 [X]
4.2.2 [-] 4.2.2 [X]
*/ */
@ -100,7 +100,9 @@ fn distribute_message(
fn send_clients_name(to: &SocketAddr, lock: &mut MutexGuard<UserMap>) { fn send_clients_name(to: &SocketAddr, lock: &mut MutexGuard<UserMap>) {
let mut clients = String::new(); let mut clients = String::new();
let mut num_client = 0usize;
for (client, entry) in (*lock).iter() { for (client, entry) in (*lock).iter() {
num_client += 1;
clients.push_str(&format!( clients.push_str(&format!(
"{}{} ", "{}{} ",
&entry.0.trim(), &entry.0.trim(),
@ -112,7 +114,7 @@ fn send_clients_name(to: &SocketAddr, lock: &mut MutexGuard<UserMap>) {
if client == to { if client == to {
let stream = &entry.1; let stream = &entry.1;
let mut writer = BufWriter::new(stream); let mut writer = BufWriter::new(stream);
let mut req = String::from("LIST CLIENTS "); let mut req = String::from(format!("{}{} ", "LIST CLIENTS ", num_client));
req.push_str(clients); req.push_str(clients);
println!( println!(
"{time} to {nick}@{addr} : {message}", "{time} to {nick}@{addr} : {message}",