incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix download quests on proxy server

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-25 22:28:39 -07:00
parent 5e14a8449c
commit 187bfa1756
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyCommands.cc
+10 -5
View File
@@ -1116,8 +1116,7 @@ static HandlerResult S_44_A6(shared_ptr<ProxyServer::LinkedSession> ses, uint16_
// Episode 3 download quests aren't DLQ-encoded
bool decode_dlq = is_download && !(ses->newserv_client_config.cfg.flags & Client::Flag::IS_EPISODE_3);
ProxyServer::LinkedSession::SavingFile sf(
cmd.filename, output_filename, cmd.file_size, decode_dlq);
ProxyServer::LinkedSession::SavingFile sf(cmd.filename, output_filename, cmd.file_size, decode_dlq);
ses->saving_files.emplace(cmd.filename, std::move(sf));
if (ses->options.save_files) {
ses->log.info("Saving %s from server to %s", filename.c_str(), output_filename.c_str());
@@ -1159,13 +1158,19 @@ static HandlerResult S_13_A7(shared_ptr<ProxyServer::LinkedSession> ses, uint16_
if (!sf->output_filename.empty()) {
ses->log.info("Adding %" PRIu32 " bytes to %s => %s",
cmd.data_size.load(), sf->basename.c_str(), sf->output_filename.c_str());
sf->blocks.emplace_back(reinterpret_cast<const char*>(cmd.data.data()), cmd.data_size);
if (ses->options.save_files) {
sf->blocks.emplace_back(reinterpret_cast<const char*>(cmd.data.data()), cmd.data_size);
}
}
sf->remaining_bytes -= cmd.data_size;
if (sf->remaining_bytes == 0) {
ses->log.info("Writing file %s => %s", sf->basename.c_str(), sf->output_filename.c_str());
sf->write();
if (ses->options.save_files) {
ses->log.info("Writing file %s => %s", sf->basename.c_str(), sf->output_filename.c_str());
sf->write();
} else {
ses->log.info("Download complete for file %s", sf->basename.c_str());
}
ses->saving_files.erase(cmd.filename);
}