Skip to content

Commit

Permalink
chore: cargo format
Browse files Browse the repository at this point in the history
  • Loading branch information
matteodev8 committed Jan 24, 2025
1 parent 808042c commit 5dec682
Show file tree
Hide file tree
Showing 11 changed files with 192 additions and 180 deletions.
13 changes: 6 additions & 7 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
use std::io::{stdout, Result};
use std::env;
use std::io::{stdout, Result};

use ratatui::prelude::*;

use crossterm::terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen};
use crossterm::terminal::{enable_raw_mode, EnterAlternateScreen};
use crossterm::ExecutableCommand;

use crate::tui::app::App;

mod tui;
mod net;
mod tui;
mod util;

fn main() -> Result<()> {
fn main() -> Result<()> {
let args: Vec<String> = env::args().collect();

let default_addr = String::from("127.0.0.1");

let address = args.get(1).unwrap_or(&default_addr);
let port: u16 = args.get(2).map_or(52800, |p| p.parse().unwrap_or(52800));

let host = (address.clone(), port);


enable_raw_mode()?;

let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
Expand Down
15 changes: 7 additions & 8 deletions src/net/keep_alive.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
use std::net::TcpStream;
use stblib::colors::{BOLD, C_RESET, RED};
use stblib::stbchat::net::OutgoingPacketStream;
use stblib::stbchat::packet::ServerPacket;
use std::net::TcpStream;

pub fn keep_alive(mut server: OutgoingPacketStream<TcpStream>) {
loop {
stblib::utilities::sleep(30);
server.write(ServerPacket::KeepAlive)
.unwrap_or_else(|_| {
eprintln!(
"{BOLD}{RED}An error occurred when sending Keep Alive to the server.\n\
server.write(ServerPacket::KeepAlive).unwrap_or_else(|_| {
eprintln!(
"{BOLD}{RED}An error occurred when sending Keep Alive to the server.\n\
Could it be that the connection to the server has been lost?{C_RESET}"
);
});
);
});
}
}
}
2 changes: 1 addition & 1 deletion src/net/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pub mod keep_alive;
pub mod recv;
pub mod send;
pub mod keep_alive;
23 changes: 13 additions & 10 deletions src/net/recv.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
use std::sync::Arc;
use std::net::TcpStream;
use std::sync::mpsc::Sender;
use std::sync::Arc;

use stblib::stbchat::net::IncomingPacketStream;
use stblib::stbchat::packet::ClientPacket;


use crate::tui::app::{AppEvent, AppState, Views};
use crate::tui::formatter::{badge_handler, MessageFormatter};

Expand All @@ -19,27 +18,31 @@ pub fn recv(

loop {
match r_server.read::<ClientPacket>() {
Ok(ClientPacket::SystemMessage { message}) => {
app_state.write().unwrap().messages.push(formatter.system(message));
},
Ok(ClientPacket::SystemMessage { message }) => {
app_state
.write()
.unwrap()
.messages
.push(formatter.system(message));
}

Ok(ClientPacket::UserMessage { author, message }) => {
app_state.write().unwrap().messages.push(formatter.user(
author.username,
author.nickname,
author.role_color,
badge_handler(author.badge),
message
message,
));
},
}

Ok(ClientPacket::Event { event_type}) => {
Ok(ClientPacket::Event { event_type }) => {
if event_type == "event.login" {
app_state.write().unwrap().current_view = Views::Authentication;
}
}
Err(_) => break,
_ => ()
_ => (),
}
}
}
}
23 changes: 10 additions & 13 deletions src/net/send.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ use crate::tui::app::AppEvent;
pub fn send(
mut w_server: OutgoingPacketStream<TcpStream>,
rx: Receiver<AppEvent>,
rx_login: Receiver<(String, String, String)>
rx_login: Receiver<(String, String, String)>,
) {
let tx_data = rx_login.recv().unwrap();

if tx_data.0 == "event.login" {
w_server.write(ServerPacket::Login {
username: tx_data.1,
password: tx_data.2
}).unwrap();
w_server
.write(ServerPacket::Login {
username: tx_data.1,
password: tx_data.2,
})
.unwrap();
}

loop {
let message = rx.recv().unwrap_or_else(|_| {
println!("Client closed connection");
Expand All @@ -28,13 +30,8 @@ pub fn send(

match message {
AppEvent::SendMessage(message) => {
w_server.write(
ServerPacket::Message {
message
})
.unwrap();
w_server.write(ServerPacket::Message { message }).unwrap();
}
}
}

}
}
Loading

0 comments on commit 5dec682

Please sign in to comment.