taynpg/transm
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 29 Wiki Activity

fix：修正Linux下获取文件名为全路径的错误问题，修正Linux的pthread库未链接的问题。

Browse Source
This commit is contained in:
taynpg 2024-12-16 13:54:54 +08:00
parent a2df59cc07
commit 8889bd061d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/CMakeLists.txt
View File

@ -10,3 +10,6 @@ endif()
add_executable(transmc main.cpp client.h client.cpp file_oper.h file_oper.cpp) add_executable(transmc main.cpp client.h client.cpp file_oper.h file_oper.cpp)
target_link_libraries(transmc PRIVATE trans_net trans_util) target_link_libraries(transmc PRIVATE trans_net trans_util)
if (UNIX)
target_link_libraries(transmc PRIVATE pthread)
endif()

5
client/client.cpp
View File

@ -89,7 +89,6 @@ bool CClient::down_task(const std::string& param)
// 开始传输文件 // 开始传输文件
for (const auto& item : vec) { for (const auto& item : vec) {
logger_->warn("Start Down => {}", item);
down_one_file(task_list_[id]->id, item); down_one_file(task_list_[id]->id, item);
} }
return true; return true;
@ -130,8 +129,9 @@ bool CClient::down_one_file(const std::string& id, const std::string& file)
down_->cur_remote_id_ = id; down_->cur_remote_id_ = id;
down_->cur_remote_file_ = file; down_->cur_remote_file_ = file;
fs::path remote_file(down_->cur_remote_file_); fs::path remote_file(ofen::COfPath::normalize(down_->cur_remote_file_));
down_->cur_file_ = COfPath::to_full(remote_file.filename().string()); down_->cur_file_ = COfPath::to_full(remote_file.filename().string());
logger_->warn("Start Down => {} To {}", file, down_->cur_file_);
// 请求下载文件 // 请求下载文件
std::shared_ptr<CFrameBuffer> buf = std::make_shared<CFrameBuffer>(); std::shared_ptr<CFrameBuffer> buf = std::make_shared<CFrameBuffer>();
@ -155,6 +155,7 @@ void CClient::cancel_trans_file(const std::string& key)
if (key.empty()) { if (key.empty()) {
t = down_; t = down_;
} else { } else {
std::lock_guard<std::mutex> lock(mutex_);
if (up_.count(key)) { if (up_.count(key)) {
t = up_[key]; t = up_[key];
} }

3
server/CMakeLists.txt
View File

@ -9,3 +9,6 @@ endif()
add_executable(transms main.cpp server.h server.cpp) add_executable(transms main.cpp server.h server.cpp)
target_link_libraries(transms PRIVATE trans_net trans_util) target_link_libraries(transms PRIVATE trans_net trans_util)
if (UNIX)
target_link_libraries(transms PRIVATE pthread)
endif()