chore: rename FileSearch to FileSearchResult

This commit is contained in:
Michel de Graaf
2025-06-30 00:06:19 +02:00
parent c75bdd29c5
commit d07e9ec113
4 changed files with 11 additions and 12 deletions
+4 -4
View File
@@ -1,7 +1,7 @@
use crate::{ use crate::{
peer::{DefaultPeer, Peer}, peer::{DefaultPeer, Peer},
server::{PeerAddress, Server}, server::{PeerAddress, Server},
types::FileSearch, types::FileSearchResult,
utils::{md5, thread_pool::ThreadPool}, utils::{md5, thread_pool::ThreadPool},
}; };
use std::{ use std::{
@@ -20,12 +20,12 @@ use std::{
const MAX_THREADS: usize = 100; const MAX_THREADS: usize = 100;
pub enum ClientOperation { pub enum ClientOperation {
ConnectToPeer(Peer), ConnectToPeer(Peer),
SearchResult(FileSearch), SearchResult(FileSearchResult),
} }
struct ClientContext { struct ClientContext {
peers: HashMap<String, DefaultPeer>, peers: HashMap<String, DefaultPeer>,
sender: Option<Sender<ClientOperation>>, sender: Option<Sender<ClientOperation>>,
search_results: Vec<FileSearch>, search_results: Vec<FileSearchResult>,
thread_pool: ThreadPool, thread_pool: ThreadPool,
} }
impl ClientContext { impl ClientContext {
@@ -103,7 +103,7 @@ impl Client {
} }
} }
pub fn search(&self, query: &str, timeout: Duration) -> Vec<FileSearch> { pub fn search(&self, query: &str, timeout: Duration) -> Vec<FileSearchResult> {
println!("Searching for {}", query); println!("Searching for {}", query);
if let Some(server) = &self.server { if let Some(server) = &self.server {
let hash = md5::md5(query); let hash = md5::md5(query);
+4 -5
View File
@@ -1,15 +1,14 @@
use crate::message::{Message, MessageHandler}; use crate::message::{Message, MessageHandler};
use crate::peer::PeerOperation; use crate::peer::PeerOperation;
use crate::types::{File, FileSearch}; use crate::types::{File, FileSearchResult};
use crate::utils::zlib::deflate; use crate::utils::zlib::deflate;
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
fn decompress_buffer(buffer: &[u8]) -> Result<Vec<u8>, String> { fn decompress_buffer(buffer: &[u8]) -> Result<Vec<u8>, String> {
deflate(buffer) deflate(buffer)
} }
impl FileSearch { impl FileSearchResult {
pub fn new_from_message(message: &mut Message) -> Self { pub fn new_from_message(message: &mut Message) -> Self {
let pointer = message.get_pointer(); let pointer = message.get_pointer();
let size = message.get_size(); let size = message.get_size();
@@ -57,7 +56,7 @@ impl MessageHandler<PeerOperation> for FileSearchResponse {
9 9
} }
fn handle(&self, message: &mut Message, sender: Sender<PeerOperation>) { fn handle(&self, message: &mut Message, sender: Sender<PeerOperation>) {
let file_search = FileSearch::new_from_message(message); let file_search = FileSearchResult::new_from_message(message);
sender sender
.send(PeerOperation::FileSearchResult(file_search)) .send(PeerOperation::FileSearchResult(file_search))
@@ -85,7 +84,7 @@ fn test_new_from_message() {
let mut message = Message::new_with_data(data); let mut message = Message::new_with_data(data);
message.set_pointer(8); message.set_pointer(8);
let file_search = FileSearch::new_from_message(&mut message); let file_search = FileSearchResult::new_from_message(&mut message);
assert_eq!(file_search.token, "6d2b9434"); assert_eq!(file_search.token, "6d2b9434");
assert_eq!(file_search.files.len(), 2); assert_eq!(file_search.files.len(), 2);
let file = &file_search.files[0]; let file = &file_search.files[0];
+2 -2
View File
@@ -2,7 +2,7 @@ use crate::dispatcher::MessageDispatcher;
use crate::message::peer::FileSearchResponse; use crate::message::peer::FileSearchResponse;
use crate::message::server::MessageFactory; use crate::message::server::MessageFactory;
use crate::message::{Handlers, Message, MessageReader}; use crate::message::{Handlers, Message, MessageReader};
use crate::types::FileSearch; use crate::types::FileSearchResult;
use std::sync::mpsc; use std::sync::mpsc;
use std::sync::mpsc::{Receiver, Sender}; use std::sync::mpsc::{Receiver, Sender};
@@ -28,7 +28,7 @@ pub struct DefaultPeer {
#[allow(dead_code)] #[allow(dead_code)]
pub enum PeerOperation { pub enum PeerOperation {
SendMessage(Message), SendMessage(Message),
FileSearchResult(FileSearch), FileSearchResult(FileSearchResult),
} }
impl DefaultPeer { impl DefaultPeer {
pub fn new(peer: Peer, client_channel: Sender<ClientOperation>) -> Self { pub fn new(peer: Peer, client_channel: Sender<ClientOperation>) -> Self {
+1 -1
View File
@@ -11,7 +11,7 @@ pub struct File {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)] #[allow(dead_code)]
pub struct FileSearch { pub struct FileSearchResult {
pub token: String, pub token: String,
pub files: Vec<File>, pub files: Vec<File>,
pub slots: i8, pub slots: i8,