feat: improved cli

Cargo.toml

@@ -6,5 +6,5 @@ resolver = "2"
 version = "0.1.0"
 authors = ["Michel de Graaf"]
 edition = "2021"
-license = "MIT OR Apache-2.0"
+license = "MIT"
-repository = "https://github.com/yourusername/soulseek-rs"
+repository = "https://github.com/michel/soulseek-rs"

soulseek-rs-lib/Cargo.toml

@@ -14,7 +14,3 @@ name = "soulseek_rs"
 path = "src/lib.rs"
 
 [dependencies]
-# Add your dependencies here as needed
-# For example:
-# tokio = { version = "1", features = ["full"] }
-# serde = { version = "1", features = ["derive"] }

soulseek-rs-lib/src/client.rs

@@ -5,7 +5,7 @@ use crate::utils::logger;
 use crate::{
     actor::{peer_registry::PeerRegistry, ActorSystem},
     error::{Result, SoulseekRs},
-    peer::{ConnectionType, DownloadPeer, NewPeer, Peer},
+    peer::{listen::Listen, ConnectionType, DownloadPeer, NewPeer, Peer},
     types::{Download, FileSearchResult},
     utils::{md5, thread_pool::ThreadPool},
     Transfer,
@@ -24,7 +24,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use crate::{debug, error, info, trace};
+use crate::{debug, error, info, trace, warn};
 const DEFALT_LISTEN_PORT: u32 = 2234;
 
 #[derive(Debug, Clone)]
@@ -58,7 +58,7 @@ impl Default for ClientSettings {
                 "server.slsknet.org".to_string(),
                 2416,
             ),
-            enable_listen: false,
+            enable_listen: true,
             listen_port: DEFALT_LISTEN_PORT,
         }
     }
@@ -161,6 +161,8 @@ impl Client {
             PeerRegistry::new(ctx.actor_system.clone(), sender.clone());
         ctx.peer_registry = Some(peer_registry);
 
+        let listen_sender = sender.clone();
+
         let server_actor = ServerActor::new(
             self.address.clone(),
             sender,
@@ -175,6 +177,22 @@ impl Client {
             },
         ));
 
+        if self.enable_listen {
+            let listen_port = self.listen_port;
+            let client_sender = listen_sender;
+            let context = self.context.clone();
+            let own_username = self.username.clone();
+
+            thread::spawn(move || {
+                Listen::start(
+                    listen_port,
+                    client_sender,
+                    context,
+                    own_username,
+                );
+            });
+        }
+
         Self::listen_to_client_operations(
             message_reader,
             self.context.clone(),
@@ -366,7 +384,7 @@ impl Client {
                                 }
                             }
                             if let Some(error) = error {
-                                error!(
+                                warn!(
                                                 "[client] Peer {} disconnected with error: {:?}",
                                                 username, error
                                             );

soulseek-rs-lib/src/utils/logger.rs

@@ -1,5 +1,8 @@
 use std::env;
-use std::sync::Once;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Mutex, Once,
+};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub enum LogLevel {
@@ -13,6 +16,9 @@ pub enum LogLevel {
 static INIT: Once = Once::new();
 static mut LOG_LEVEL: LogLevel = LogLevel::Warn;
 
+static BUFFER: Mutex<Vec<String>> = Mutex::new(Vec::new());
+static BUFFERING: AtomicBool = AtomicBool::new(false);
+
 pub fn init() {
     INIT.call_once(|| {
         let level = env::var("LOG_LEVEL")
@@ -97,7 +103,7 @@ pub fn log(level: LogLevel, message: &str) {
             let minutes = (seconds_in_day % 3600) / 60;
             let seconds = seconds_in_day % 60;
 
-            eprintln!(
+            let formatted_message = format!(
                 "[{:04}-{:02}-{:02} {:02}:{:02}:{:02}.{:03}] [{}] {}",
                 year,
                 month,
@@ -109,10 +115,37 @@ pub fn log(level: LogLevel, message: &str) {
                 level_str,
                 message
             );
+
+            if BUFFERING.load(Ordering::Relaxed) {
+                if let Ok(mut buffer) = BUFFER.lock() {
+                    buffer.push(formatted_message);
+                }
+            } else {
+                eprintln!("{}", formatted_message);
+            }
         }
     }
 }
 
+pub fn enable_buffering() {
+    BUFFERING.store(true, Ordering::Relaxed);
+}
+
+pub fn disable_buffering() {
+    BUFFERING.store(false, Ordering::Relaxed);
+}
+
+pub fn flush_buffered_logs() {
+    disable_buffering();
+
+    if let Ok(mut buffer) = BUFFER.lock() {
+        for message in buffer.iter() {
+            eprintln!("{}", message);
+        }
+        buffer.clear();
+    }
+}
+
 #[macro_export]
 macro_rules! error {
     ($($arg:tt)*) => {

soulseek-rs/Cargo.toml

@@ -14,10 +14,8 @@ name = "soulseek"
 path = "src/main.rs"
 
 [dependencies]
-# Depend on your library
 soulseek-rs-lib = { version = "0.1.0", path = "../soulseek-rs-lib" }
 
-# Add client-specific dependencies here
+clap = { version = "4.5.51", features = ["derive", "color", "wrap_help", "env"] }
-# For example:
+ratatui = "0.29.0"
-# clap = { version = "4", features = ["derive"] }
+color-eyre = "0.6.5"
-# anyhow = "1"

soulseek-rs/src/main.rs

@@ -1,28 +1,373 @@
-use soulseek_rs::Client;
+use clap::{Parser, Subcommand};
-use std::time::Duration;
+use color_eyre::Result;
+use ratatui::{
+    crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind},
+    style::{Color, Modifier, Style},
+    widgets::{
+        Block, Borders, HighlightSpacing, List, ListItem, ListState,
+        StatefulWidget,
+    },
+    DefaultTerminal, Frame,
+};
+use soulseek_rs::{Client, ClientSettings, PeerAddress};
+use std::{env, time::Duration};
 
-fn main() -> Result<(), Box<dyn std::error::Error>> {
+#[derive(Parser, Debug)]
-    // Create and connect to Soulseek server
+#[command(
-    let mut client = Client::new("username", "password");
+    name = "soulseek",
+    author,
+    version,
+    about = "Soulseek client in Rust 🦀",
+    long_about = None,
+    arg_required_else_help = true
+)]
+struct Cli {
+    #[arg(short, long, env = "SOULSEEK_USERNAME")]
+    username: Option<String>,
 
+    #[arg(short, long, env = "SOULSEEK_PASSWORD")]
+    password: Option<String>,
+
+    #[arg(
+        short,
+        long,
+        env = "SOULSEEK_SERVER",
+        default_value = "server.slsknet.org:2416"
+    )]
+    server: String,
+
+    #[arg(long, env = "DISABLE_LISTENER")]
+    disable_listener: bool,
+
+    #[arg(short, long, env = "LISTENER_PORT", default_value = "2234")]
+    listener_port: u32,
+
+    #[arg(short, long, global = true, action = clap::ArgAction::Count)]
+    verbose: u8,
+
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[derive(Subcommand, Debug)]
+enum Commands {
+    Search {
+        query: String,
+
+        #[arg(short, long, default_value = "10")]
+        timeout: u64,
+
+        #[arg(short, long, default_value = "~/Downloads")]
+        download_dir: String,
+    },
+}
+
+fn parse_server_address(server: &str) -> Result<(String, u16)> {
+    let parts: Vec<&str> = server.split(':').collect();
+    if parts.len() != 2 {
+        return Err(color_eyre::eyre::eyre!(
+            "Invalid server format. Expected 'host:port', got '{}'",
+            server
+        ));
+    }
+    let host = parts[0].to_string();
+    let port = parts[1].parse::<u16>().map_err(|_| {
+        color_eyre::eyre::eyre!("Invalid port number: {}", parts[1])
+    })?;
+    Ok((host, port))
+}
+
+fn main() -> Result<()> {
+    color_eyre::install()?;
+
+    let cli = Cli::parse();
+
+    let log_level = match cli.verbose {
+        0 => "ERROR",
+        1 => "WARN",
+        2 => "INFO",
+        3 => "DEBUG",
+        _ => "TRACE",
+    };
+    env::set_var("LOG_LEVEL", log_level);
+
+    let username = cli.username
+        .ok_or_else(|| color_eyre::eyre::eyre!("Username required: use --username or set SOULSEEK_USERNAME env var"))?;
+
+    let password = cli.password
+        .ok_or_else(|| color_eyre::eyre::eyre!("Password required: use --password or set SOULSEEK_PASSWORD env var"))?;
+
+    let (server_host, server_port) = parse_server_address(&cli.server)?;
+
+    match cli.command {
+        Commands::Search {
+            query,
+            timeout,
+            download_dir,
+        } => search_and_download(
+            &username,
+            &password,
+            &server_host,
+            server_port,
+            !cli.disable_listener,
+            cli.listener_port,
+            &query,
+            timeout,
+            &download_dir,
+            cli.verbose,
+        ),
+    }
+}
+
+fn search_and_download(
+    username: &str,
+    password: &str,
+    server_host: &str,
+    server_port: u16,
+    enable_listener: bool,
+    listener_port: u32,
+    query: &str,
+    timeout: u64,
+    download_dir: &str,
+    verbose: u8,
+) -> Result<()> {
+    if verbose > 0 {
+        println!(
+            "🔌 Connecting to Soulseek server {}:{}...",
+            server_host, server_port
+        );
+    }
+
+    let settings = ClientSettings {
+        username: username.to_string(),
+        password: password.to_string(),
+        server_address: PeerAddress::new(server_host.to_string(), server_port),
+        enable_listen: enable_listener,
+        listen_port: listener_port,
+    };
+
+    let mut client = Client::with_settings(settings);
     client.connect();
-    client.login()?;
+    client
+        .login()
+        .map_err(|e| color_eyre::eyre::eyre!("Failed to login: {}", e))?;
 
-    // Search for files
+    if verbose > 0 {
-    let results =
+        println!("🔍 Searching for: {}", query);
-        client.search("Alex Kassian lifestream", Duration::from_secs(10))?;
+    }
 
-    // Download first available file
+    let results = client
-    if let Some(result) = results.iter().find(|r| !r.files.is_empty()) {
+        .search(query, Duration::from_secs(timeout))
-        let file = &result.files[0];
+        .map_err(|e| color_eyre::eyre::eyre!("Search failed: {}", e))?;
-        client.download(
+
-            file.name.clone(),
+    if results.is_empty() {
-            file.username.clone(),
+        println!("❌ No results found for '{}'", query);
-            file.size,
+        return Ok(());
-            "~/Downloads".to_string(),
+    }
-        )?;
+
-        println!("Downloaded: {}", file.name);
+    let mut all_files: Vec<(String, &soulseek_rs::File)> = Vec::new();
+
+    for result in &results {
+        for file in &result.files {
+            all_files.push((result.username.clone(), file));
+        }
+    }
+
+    if all_files.is_empty() {
+        println!("❌ No files found in search results");
+        return Ok(());
+    }
+
+    println!("\n📋 Found {} file(s)\n", all_files.len());
+
+    let mut options: Vec<String> = all_files
+        .iter()
+        .enumerate()
+        .map(|(i, (username, file))| {
+            let size_mb = file.size as f64 / 1_048_576.0;
+            format!(
+                "{}. {} ({:.2} MB) - from {}",
+                i + 1,
+                file.name,
+                size_mb,
+                username
+            )
+        })
+        .collect();
+
+    options.push("❌ Cancel".to_string());
+
+    // Show TUI file selector
+    let selection = show_file_selector(options)?;
+
+    match selection {
+        None => {
+            println!("❌ Cancelled");
+            return Ok(());
+        }
+        Some(idx) if idx == all_files.len() => {
+            println!("❌ Cancelled");
+            return Ok(());
+        }
+        Some(idx) => {
+            let (username, file) = &all_files[idx];
+            download_file(&mut client, username, file, download_dir)?;
+        }
     }
 
     Ok(())
 }
+
+fn download_file(
+    client: &mut Client,
+    username: &str,
+    file: &soulseek_rs::File,
+    download_dir: &str,
+) -> Result<()> {
+    println!(
+        "⬇️  Downloading: {} ({:.2} MB)",
+        file.name,
+        file.size as f64 / 1_048_576.0
+    );
+
+    client
+        .download(
+            file.name.clone(),
+            username.to_string(),
+            file.size,
+            download_dir.to_string(),
+        )
+        .map_err(|e| {
+            color_eyre::eyre::eyre!("Failed to download {}: {}", file.name, e)
+        })?;
+
+    let filename = file
+        .name
+        .split(['/', '\\'])
+        .next_back()
+        .unwrap_or(&file.name);
+    let download_path = format!("{}/{}", download_dir, filename);
+
+    println!("✅ Downloaded: {} → {}", file.name, download_path);
+    Ok(())
+}
+
+struct FileSelector {
+    items: Vec<String>,
+    state: ListState,
+    should_exit: bool,
+    selected_index: Option<usize>,
+}
+
+impl FileSelector {
+    fn new(items: Vec<String>) -> Self {
+        let mut state = ListState::default();
+        state.select(Some(0));
+
+        Self {
+            items,
+            state,
+            should_exit: false,
+            selected_index: None,
+        }
+    }
+
+    fn run(&mut self, mut terminal: DefaultTerminal) -> Result<Option<usize>> {
+        while !self.should_exit {
+            terminal.draw(|frame| self.render(frame))?;
+
+            if let Event::Key(key) = event::read()? {
+                self.handle_key(key);
+            }
+        }
+
+        Ok(self.selected_index)
+    }
+
+    fn handle_key(&mut self, key: KeyEvent) {
+        if key.kind != KeyEventKind::Press {
+            return;
+        }
+
+        match key.code {
+            KeyCode::Up | KeyCode::Char('k') => self.select_previous(),
+            KeyCode::Down | KeyCode::Char('j') => self.select_next(),
+            KeyCode::Home | KeyCode::Char('g') => self.select_first(),
+            KeyCode::End | KeyCode::Char('G') => self.select_last(),
+            KeyCode::Enter => {
+                self.selected_index = self.state.selected();
+                self.should_exit = true;
+            }
+            KeyCode::Esc | KeyCode::Char('q') => {
+                self.selected_index = None;
+                self.should_exit = true;
+            }
+            _ => {}
+        }
+    }
+
+    fn select_previous(&mut self) {
+        let i = match self.state.selected() {
+            Some(i) if i > 0 => i - 1,
+            _ => self.items.len() - 1,
+        };
+        self.state.select(Some(i));
+    }
+
+    fn select_next(&mut self) {
+        let i = match self.state.selected() {
+            Some(i) if i < self.items.len() - 1 => i + 1,
+            _ => 0,
+        };
+        self.state.select(Some(i));
+    }
+
+    fn select_first(&mut self) {
+        self.state.select(Some(0));
+    }
+
+    fn select_last(&mut self) {
+        self.state.select(Some(self.items.len() - 1));
+    }
+
+    fn render(&mut self, frame: &mut Frame) {
+        let area = frame.area();
+
+        let list_items: Vec<ListItem> = self
+            .items
+            .iter()
+            .map(|item| ListItem::new(item.as_str()))
+            .collect();
+
+        let list = List::new(list_items)
+            .block(
+                Block::default()
+                    .borders(Borders::ALL)
+                    .title("Select a file to download (↑↓/jk: navigate, Enter: select, Esc/q: cancel)")
+            )
+            .highlight_style(
+                Style::default()
+                    .bg(Color::DarkGray)
+                    .add_modifier(Modifier::BOLD)
+            )
+            .highlight_symbol("> ")
+            .highlight_spacing(HighlightSpacing::Always);
+
+        StatefulWidget::render(list, area, frame.buffer_mut(), &mut self.state);
+    }
+}
+
+fn show_file_selector(options: Vec<String>) -> Result<Option<usize>> {
+    // Enable log buffering before TUI starts
+    soulseek_rs::utils::logger::enable_buffering();
+
+    let terminal = ratatui::init();
+    let mut selector = FileSelector::new(options);
+    let result = selector.run(terminal);
+    ratatui::restore();
+
+    // Flush all buffered logs after TUI exits
+    soulseek_rs::utils::logger::flush_buffered_logs();
+
+    result
+}