jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

use pktvec in patch

Browse Source
This commit is contained in:
Jake Probst 2019-08-20 17:55:19 -07:00
parent 076d6e0915
commit 758b2e5ebc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/patch/main.rs
View File

@ -4,16 +4,17 @@ use std::net;
use std::thread;
use std::fs;
use std::io;
use std::io::{Read, Write};
use std::io::{Read};
use std::path::{Path, PathBuf, Components};
use std::convert::AsRef;
use mio::{Events, Poll, Token, Ready, PollOpt};
use rand::{Rng, RngCore};
use crc::{crc32, Hasher32};
use libpso::{PacketParseError, PSOPacket};
use libpso::packet::patch::*;
use libpso::crypto::pc::PSOPCCipher;
use elseware::common::network::{send_packet, recv_packet, PacketNetworkError};
use elseware::pktvec;
use elseware::common::pktvec::PktVec;
use elseware::common::network::{PacketNetworkError};
use elseware::common::client::Client;
use elseware::common::serverstate::{ServerPacket, ServerState, OnConnect};
@ -143,14 +144,13 @@ impl ServerState for PatchServerState {
fn handle(&mut self, pkt: &PatchPacket) -> Box<dyn Iterator<Item = Box<dyn PSOPacket>>> {
match pkt {
PatchPacket::PatchWelcomeReply(_pkt) => {
let p: Vec<Box<dyn PSOPacket>> = vec![Box::new(RequestLogin {})];
Box::new(p.into_iter())
pktvec![RequestLogin {}]
},
PatchPacket::LoginReply(_pkt) => {
let mut p: Vec<Box<dyn PSOPacket>> = vec![Box::new(Message::new("hello player".to_string()))];
p.append(&mut get_file_list_packets(&self.patch_file_tree));
let mut p = pktvec![Message::new("hello player".to_string())];
p.append(get_file_list_packets(&self.patch_file_tree));
p.push(Box::new(PatchEndList {}));
Box::new(p.into_iter())
p
},
PatchPacket::FileInfoReply(pkt) => {
self.patch_file_info.push(pkt.clone());
@ -164,10 +164,10 @@ impl ServerState for PatchServerState {
let total_size = need_update.iter().fold(0, |a, file_info| a + file_info.size);
let total_files = need_update.len() as u32;
let p: Vec<Box<dyn PSOPacket>> = vec![Box::new(FilesToPatchMetadata::new(total_size, total_files)),
Box::new(PatchStartList {}),
let p = pktvec![FilesToPatchMetadata::new(total_size, total_files),
PatchStartList {}
];
Box::new(p.into_iter().chain(SendFileIterator::new(&self)))
Box::new(p.chain(SendFileIterator::new(&self)))
}
}
}
@ -263,10 +263,10 @@ struct SendFileIterator {
impl SendFileIterator {
fn new(state: &PatchServerState) -> SendFileIterator {
let need_update = state.patch_file_info.iter()
let file_ids_to_update = state.patch_file_info.iter()
.filter(|file_info| does_file_need_updating(file_info, &state.patch_file_lookup))
.collect::<Vec<_>>();
let file_ids_to_update = need_update.iter().map(|k| k.id).collect::<HashSet<_>>();
.map(|k| k.id)
.collect::<HashSet<_>>();
SendFileIterator {
done: false,