Green-Sky/solanaceae_tox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adopt file2 refactor

Browse Source
This commit is contained in:
Green Sky 2024-05-26 21:34:45 +02:00
parent d423433a22
commit 676e50c61a
No known key found for this signature in database
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
solanaceae/tox_messages/tox_transfer_manager.cpp
View File

@ -18,18 +18,6 @@
// https://youtu.be/4XsL5iYHS6c // https://youtu.be/4XsL5iYHS6c
static ByteSpan spanFromRead(const std::variant<ByteSpan, std::vector<uint8_t>>& data_var) {
if (std::holds_alternative<std::vector<uint8_t>>(data_var)) {
auto& vec = std::get<std::vector<uint8_t>>(data_var);
return {vec.data(), vec.size()};
} else if (std::holds_alternative<ByteSpan>(data_var)) {
return std::get<ByteSpan>(data_var);
} else {
assert(false);
return {};
}
}
void ToxTransferManager::toxFriendLookupAdd(Message3Handle h) { void ToxTransferManager::toxFriendLookupAdd(Message3Handle h) {
const auto& comp = h.get<Message::Components::Transfer::ToxTransferFriend>(); const auto& comp = h.get<Message::Components::Transfer::ToxTransferFriend>();
const uint64_t key {(uint64_t(comp.friend_number) << 32) | comp.transfer_number}; const uint64_t key {(uint64_t(comp.friend_number) << 32) | comp.transfer_number};
@ -667,17 +655,16 @@ bool ToxTransferManager::onToxEvent(const Tox_Event_File_Chunk_Request* e) {
} else { } else {
auto* file = transfer.get<Message::Components::Transfer::File>().get(); auto* file = transfer.get<Message::Components::Transfer::File>().get();
const auto data = file->read(data_size, position); const auto data = file->read(data_size, position);
const auto data_span = spanFromRead(data); if (data.empty()) {
if (data_span.empty()) {
std::cerr << "TMM error: failed to read file!!\n"; std::cerr << "TMM error: failed to read file!!\n";
return true; return true;
} }
// TODO: get rid of the data cast and support spans in the tox api // TODO: get rid of the data cast and support spans in the tox api
const auto err = _t.toxFileSendChunk(friend_number, file_number, position, static_cast<std::vector<uint8_t>>(data_span)); const auto err = _t.toxFileSendChunk(friend_number, file_number, position, static_cast<std::vector<uint8_t>>(data));
// TODO: investigate if i need to retry if sendq full // TODO: investigate if i need to retry if sendq full
if (err == TOX_ERR_FILE_SEND_CHUNK_OK) { if (err == TOX_ERR_FILE_SEND_CHUNK_OK) {
transfer.get<Message::Components::Transfer::BytesSent>().total += data_span.size; transfer.get<Message::Components::Transfer::BytesSent>().total += data.size;
_rmm.throwEventUpdate(transfer); _rmm.throwEventUpdate(transfer);
} }
} }