allow setting the file path directly (not just dir)
This commit is contained in:
parent
0e6556cd86
commit
f904b321bc
@ -233,6 +233,40 @@ bool ToxTransferManager::setFileI(Message3Handle transfer, std::unique_ptr<FileI
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ToxTransferManager::setFilePath(Message3Handle transfer, std::string_view file_path) {
|
||||||
|
if (!static_cast<bool>(transfer)) {
|
||||||
|
std::cerr << "TTM error: setFilePath() transfer " << entt::to_integral(transfer.entity()) << " is not a valid transfer\n";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t file_size {0};
|
||||||
|
std::filesystem::path full_file_path{file_path};
|
||||||
|
std::filesystem::create_directories(full_file_path.parent_path());
|
||||||
|
|
||||||
|
// TODO: read file name(s) from comp
|
||||||
|
if (transfer.all_of<Message::Components::Transfer::FileInfo>()) {
|
||||||
|
const auto& file_info = transfer.get<Message::Components::Transfer::FileInfo>();
|
||||||
|
file_size = file_info.total_size; // hack
|
||||||
|
// HACK: use fist enty
|
||||||
|
assert(file_info.file_list.size() == 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
transfer.emplace<Message::Components::Transfer::FileInfoLocal>(std::vector{full_file_path.u8string()});
|
||||||
|
|
||||||
|
auto file_impl = std::make_unique<FileWFile>(full_file_path.u8string(), file_size);
|
||||||
|
if (!file_impl->isGood()) {
|
||||||
|
std::cerr << "TTM error: failed opening file '" << file_path << "'!\n";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
transfer.emplace_or_replace<Message::Components::Transfer::File>(std::move(file_impl));
|
||||||
|
|
||||||
|
// TODO: is this a good idea????
|
||||||
|
_rmm.throwEventUpdate(transfer);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool ToxTransferManager::setFilePathDir(Message3Handle transfer, std::string_view file_path) {
|
bool ToxTransferManager::setFilePathDir(Message3Handle transfer, std::string_view file_path) {
|
||||||
if (!static_cast<bool>(transfer)) {
|
if (!static_cast<bool>(transfer)) {
|
||||||
std::cerr << "TTM error: setFilePathDir() transfer " << entt::to_integral(transfer.entity()) << " is not a valid transfer\n";
|
std::cerr << "TTM error: setFilePathDir() transfer " << entt::to_integral(transfer.entity()) << " is not a valid transfer\n";
|
||||||
@ -278,7 +312,7 @@ bool ToxTransferManager::setFilePathDir(Message3Handle transfer, std::string_vie
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ToxTransferManager::accept(Message3Handle transfer, std::string_view file_path) {
|
bool ToxTransferManager::accept(Message3Handle transfer, std::string_view file_path, bool is_file_path) {
|
||||||
if (!static_cast<bool>(transfer)) {
|
if (!static_cast<bool>(transfer)) {
|
||||||
std::cerr << "TTM error: accepted transfer " << entt::to_integral(transfer.entity()) << " is not a valid transfer\n";
|
std::cerr << "TTM error: accepted transfer " << entt::to_integral(transfer.entity()) << " is not a valid transfer\n";
|
||||||
return false;
|
return false;
|
||||||
@ -293,9 +327,16 @@ bool ToxTransferManager::accept(Message3Handle transfer, std::string_view file_p
|
|||||||
std::cerr << "TTM warning: overwriting existing file_impl " << entt::to_integral(transfer.entity()) << "\n";
|
std::cerr << "TTM warning: overwriting existing file_impl " << entt::to_integral(transfer.entity()) << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!setFilePathDir(transfer, file_path)) {
|
if (is_file_path) {
|
||||||
std::cerr << "TTM error: accepted transfer " << entt::to_integral(transfer.entity()) << " failed setting path\n";
|
if (!setFilePath(transfer, file_path)) {
|
||||||
return false;
|
std::cerr << "TTM error: accepted transfer " << entt::to_integral(transfer.entity()) << " failed setting path\n";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!setFilePathDir(transfer, file_path)) {
|
||||||
|
std::cerr << "TTM error: accepted transfer " << entt::to_integral(transfer.entity()) << " failed setting path dir\n";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!resume(transfer)) {
|
if (!resume(transfer)) {
|
||||||
@ -316,7 +357,11 @@ bool ToxTransferManager::onEvent(const Message::Events::MessageConstruct&) {
|
|||||||
|
|
||||||
bool ToxTransferManager::onEvent(const Message::Events::MessageUpdated& e) {
|
bool ToxTransferManager::onEvent(const Message::Events::MessageUpdated& e) {
|
||||||
if (e.e.all_of<Message::Components::Transfer::ActionAccept, Message::Components::Transfer::ToxTransferFriend>()) {
|
if (e.e.all_of<Message::Components::Transfer::ActionAccept, Message::Components::Transfer::ToxTransferFriend>()) {
|
||||||
accept(e.e, e.e.get<Message::Components::Transfer::ActionAccept>().save_to_path);
|
accept(
|
||||||
|
e.e,
|
||||||
|
e.e.get<Message::Components::Transfer::ActionAccept>().save_to_path,
|
||||||
|
e.e.get<Message::Components::Transfer::ActionAccept>().path_is_file
|
||||||
|
);
|
||||||
|
|
||||||
// should?
|
// should?
|
||||||
e.e.remove<Message::Components::Transfer::ActionAccept>();
|
e.e.remove<Message::Components::Transfer::ActionAccept>();
|
||||||
|
@ -43,10 +43,11 @@ class ToxTransferManager : public RegistryMessageModelEventI, public ToxEventI {
|
|||||||
bool resume(Message3Handle transfer);
|
bool resume(Message3Handle transfer);
|
||||||
bool pause(Message3Handle transfer);
|
bool pause(Message3Handle transfer);
|
||||||
bool setFileI(Message3Handle transfer, std::unique_ptr<FileI>&& new_file); // note, does not emplace FileInfoLocal
|
bool setFileI(Message3Handle transfer, std::unique_ptr<FileI>&& new_file); // note, does not emplace FileInfoLocal
|
||||||
|
bool setFilePath(Message3Handle transfer, std::string_view file_path);
|
||||||
bool setFilePathDir(Message3Handle transfer, std::string_view file_path);
|
bool setFilePathDir(Message3Handle transfer, std::string_view file_path);
|
||||||
|
|
||||||
// calls setFileI() and resume()
|
// calls setFileI() and resume()
|
||||||
bool accept(Message3Handle transfer, std::string_view file_path);
|
bool accept(Message3Handle transfer, std::string_view file_path, bool is_file_path);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool onEvent(const Message::Events::MessageConstruct&) override;
|
bool onEvent(const Message::Events::MessageConstruct&) override;
|
||||||
|
Loading…
Reference in New Issue
Block a user