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

code more readable, cleaned up a bit, still ugly

Browse Source
This commit is contained in:
Phuntsok Drak-pa 2018-03-26 12:01:49 +02:00
parent 5b60be1c2e
commit ba9d82b086
1 changed files with 51 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Rust/src/client.rs
View File

@ -42,6 +42,31 @@ fn hash_name(name: &str) -> usize {
s.finish() as usize s.finish() as usize
} }
fn get_time() -> String {
let date = Local::now();
date.format("[%H:%M:%S]").to_string()
}
fn print_line(name: &str, name_hash: usize, msg: &str, first_line: &mut bool, colors: &Vec<&str>) {
let date = get_time();
if *first_line == true {
println!(
"{}{}{}{}",
date.dimmed(),
name.color(colors[name_hash]),
" |".green(),
msg.yellow().dimmed()
);
*first_line = false;
} else {
println!(
"{}{}",
" | ".green(),
msg.yellow().dimmed()
);
}
}
fn get_entry() -> String { fn get_entry() -> String {
let mut buf = String::new(); let mut buf = String::new();
stdin().read_line(&mut buf).unwrap(); stdin().read_line(&mut buf).unwrap();
@ -206,20 +231,17 @@ fn exchange_with_server(stream: TcpStream) {
"BAD" => { "BAD" => {
println!("{}", "Bad request from client".red()); println!("{}", "Bad request from client".red());
} }
"WELCOME" => { "WELCOME" => println!(
println!("{}", ">>> Login Successful <<<".green()); "{}\n{}\n{}",
println!("Type /clients to get the list of users connected"); ">>> Login Successful <<<".green(),
println!("Type /quit to disconnect and quit"); "Type /clients to get the list of users connected",
} "Type /quit to disconnect and quit"
),
"FROM" => { "FROM" => {
let date = Local::now(); let date = Local::now();
let name = String::from(spliced_input[1]);
let mut first_line = true; let mut first_line = true;
let name_hash = hash_name(spliced_input[1]) % COLORS.len();
// Hashing name for color
let mut s = DefaultHasher::new();
name.hash(&mut s);
let name_hash: usize = (s.finish() as usize) % COLORS.len();
// Formatting name // Formatting name
let mut name = String::new(); let mut name = String::new();
@ -237,48 +259,21 @@ fn exchange_with_server(stream: TcpStream) {
// format message // format message
for mut i in 3..spliced_input.len() { for mut i in 3..spliced_input.len() {
// If the width of the terminal allows the length of the
// current width of the message plus the new word, then
// add the latter, otherwise print the former and create
// a new line from the current message
if w > msg.len() + spliced_input[i].len() + 1 { if w > msg.len() + spliced_input[i].len() + 1 {
msg.push(' '); msg.push(' ');
msg.push_str(spliced_input[i]); msg.push_str(spliced_input[i]);
} else { } else {
if first_line == true { print_line(&name, name_hash, &msg, &mut first_line, &COLORS);
println!( msg = String::from(spliced_input[i]);
"{}{}{}{}",
date.format("[%H:%M:%S]").to_string().dimmed(),
name.color(COLORS[name_hash]),
" |".green(),
msg.yellow().dimmed()
);
first_line = false;
} else {
println!(
"{}{}",
" |".green(),
msg.yellow().dimmed()
);
}
msg = String::new();
#[allow(unused_assignments)]
#[allow(unused_assignments)]
i = i - 1;
} }
} }
if first_line == true { // print leftovers
println!( print_line(&name, name_hash, &msg, &mut first_line, &COLORS);
"{}{}{}{}",
date.format("[%H:%M:%S]").to_string().dimmed(),
name.color(COLORS[name_hash]),
" |".green(),
msg.yellow().dimmed()
);
} else {
println!(
"{}{}",
" |".green(),
msg.yellow().dimmed()
);
}
} else { } else {
let mut msg = String::new(); let mut msg = String::new();
for i in 3..spliced_input.len() { for i in 3..spliced_input.len() {
@ -286,16 +281,15 @@ fn exchange_with_server(stream: TcpStream) {
msg.push_str(spliced_input[i]); msg.push_str(spliced_input[i]);
} }
println!( println!(
"{} {}{}", "{}{}{}",
date.format("[%H:%M:%S]").to_string().dimmed(), date.format("[%H:%M:%S]").to_string().dimmed(),
name.color(COLORS[name_hash]), name.color(COLORS[name_hash]),
msg.yellow().dimmed() msg.yellow().dimmed()
); );
} }
} }
"BYE" => { "BYE" => return Ok("Ok"),
return Ok("Ok");
}
"LIST" => { "LIST" => {
println!( println!(
"{}{}{}", "{}{}{}",
@ -308,34 +302,31 @@ fn exchange_with_server(stream: TcpStream) {
} }
} }
"JOIN" => { "JOIN" => {
let date = Local::now(); let date = get_time();
let name_hash: usize = hash_name(spliced_input[1].clone()) % COLORS.len(); let name_hash: usize = hash_name(spliced_input[1]) % COLORS.len();
println!( println!(
"{}{}{}{}", "{}{}{}{}",
date.format("[%H:%M:%S]").to_string().dimmed(), date.dimmed(),
" ------> ".green(), " ------> ".green(),
spliced_input[1].color(COLORS[name_hash]), spliced_input[1].color(COLORS[name_hash]),
" has joined".green() " has joined".green()
) )
} }
"LOGOUT" => { "LOGOUT" => {
let date = Local::now(); let date = get_time();
let name_hash: usize = hash_name(spliced_input[1].clone()) % COLORS.len(); let name_hash = hash_name(spliced_input[1]) % COLORS.len();
println!( println!(
"{}{}{}{}", "{}{}{}{}",
date.format("[%H:%M:%S]").to_string().dimmed(), date.dimmed(),
" <------ ".red(), " <------ ".red(),
spliced_input[1].color(COLORS[name_hash]), spliced_input[1].color(COLORS[name_hash]),
" has left".red() " has left".red()
) )
} }
_ => { _ => println!("{}", input),
println!("{}", input);
} }
}
// println!("{}", input);
})() })()
{ {
Ok(_) => { Ok(_) => {