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

better error log + fix broken accept on file creation error

Browse Source
This commit is contained in:
Green Sky 2023-12-13 15:45:36 +01:00
parent abf2645099
commit 5995059777
No known key found for this signature in database
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solanaceae/ngc_ft1_sha1/file_rw_mapped.hpp
View File

@ -6,6 +6,7 @@
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <iostream>
#include <cstring> #include <cstring>
struct FileRWMapped : public FileI { struct FileRWMapped : public FileI {
@ -25,7 +26,7 @@ struct FileRWMapped : public FileI {
_file_map.map(std::string{file_path}, 0, file_size, err); _file_map.map(std::string{file_path}, 0, file_size, err);
if (err) { if (err) {
// TODO: errro std::cerr << "FileRWMapped error: mapping file failed " << err << "\n";
return; return;
} }
} }

9
solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp
View File

@ -547,11 +547,11 @@ bool SHA1_NGCFT1::onEvent(const Message::Events::MessageUpdated& e) {
// first, open file for write(+readback) // first, open file for write(+readback)
std::string full_file_path{e.e.get<Message::Components::Transfer::ActionAccept>().save_to_path}; std::string full_file_path{e.e.get<Message::Components::Transfer::ActionAccept>().save_to_path};
// TODO: replace with filesystem or something // TODO: replace with filesystem or something
// TODO: ensure dir exists
if (full_file_path.back() != '/') { if (full_file_path.back() != '/') {
full_file_path += "/"; full_file_path += "/";
} }
// ensure dir exists
std::filesystem::create_directories(full_file_path); std::filesystem::create_directories(full_file_path);
const auto& info = ce.get<Components::FT1InfoSHA1>(); const auto& info = ce.get<Components::FT1InfoSHA1>();
@ -559,14 +559,13 @@ bool SHA1_NGCFT1::onEvent(const Message::Events::MessageUpdated& e) {
ce.emplace<Message::Components::Transfer::FileInfoLocal>(std::vector{full_file_path}); ce.emplace<Message::Components::Transfer::FileInfoLocal>(std::vector{full_file_path});
std::unique_ptr<FileRWMapped> file_impl;
const bool file_exists = std::filesystem::exists(full_file_path); const bool file_exists = std::filesystem::exists(full_file_path);
std::unique_ptr<FileRWMapped> file_impl = std::make_unique<FileRWMapped>(full_file_path, info.file_size);
file_impl = std::make_unique<FileRWMapped>(full_file_path, info.file_size);
if (!file_impl->isGood()) { if (!file_impl->isGood()) {
std::cerr << "SHA1_NGCFT1 error: failed opening file '" << full_file_path << "'!\n"; std::cerr << "SHA1_NGCFT1 error: failed opening file '" << full_file_path << "'!\n";
//e.e.remove<Message::Components::Transfer::ActionAccept>(); // stop // we failed opening that filepath, so we should offer the user the oportunity to save it differently
e.e.remove<Message::Components::Transfer::ActionAccept>(); // stop
return false; return false;
} }