cyonjan/WeChatFerry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #140 #220

Browse Source
This commit is contained in:
Changhua 2024-11-03 18:39:15 +08:00
parent 075de2e5fe
commit 5ca2eb65f3
1 changed files with 11 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
WeChatFerry/spy/rpc_server.cpp
View File

@ -33,10 +33,6 @@
#include "user_info.h" #include "user_info.h"
#include "util.h" #include "util.h"
#ifdef _WIN32
#include <windows.h>
#endif
#define URL_SIZE 20 #define URL_SIZE 20
#define BASE_URL "tcp://0.0.0.0" #define BASE_URL "tcp://0.0.0.0"
#define G_BUF_SIZE (16 * 1024 * 1024) #define G_BUF_SIZE (16 * 1024 * 1024)
@ -256,36 +252,13 @@ bool func_send_img(char *path, char *receiver, uint8_t *out, size_t *len)
if ((path == NULL) || (receiver == NULL)) { if ((path == NULL) || (receiver == NULL)) {
LOG_ERROR("Empty path or receiver."); LOG_ERROR("Empty path or receiver.");
rsp.msg.status = -1; rsp.msg.status = -1;
} else { } else if (!fs::exists(String2Wstring(path))) {
bool fileExist = false; LOG_ERROR("Path does not exists: {}", path);
#ifdef _WIN32
// 将 char* 路径转换为 wide-char 格式
std::wstring wpath = String2Wstring(path);
// 使用 GetFileAttributesW() 检查文件是否存在
DWORD attributes = GetFileAttributesW(wpath.c_str());
if (attributes == INVALID_FILE_ATTRIBUTES) {
LOG_ERROR("Path does not exist: {}", path);
rsp.msg.status = -2; rsp.msg.status = -2;
} else { } else {
fileExist = true;
}
#else
// On Linux and other systems
std::string spath(path);
if (!fs::exists(spath)) {
LOG_ERROR("Path does not exist: {}", path);
rsp.msg.status = -2;
return false;
} else {
fileExist = true;
}
#endif
if(fileExist) {
SendImageMessage(receiver, path); SendImageMessage(receiver, path);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}
pb_ostream_t stream = pb_ostream_from_buffer(out, *len); pb_ostream_t stream = pb_ostream_from_buffer(out, *len);
if (!pb_encode(&stream, Response_fields, &rsp)) { if (!pb_encode(&stream, Response_fields, &rsp)) {
@ -306,39 +279,13 @@ bool func_send_file(char *path, char *receiver, uint8_t *out, size_t *len)
if ((path == NULL) || (receiver == NULL)) { if ((path == NULL) || (receiver == NULL)) {
LOG_ERROR("Empty path or receiver."); LOG_ERROR("Empty path or receiver.");
rsp.msg.status = -1; rsp.msg.status = -1;
} } else if (!fs::exists(String2Wstring(path))) {
else { LOG_ERROR("Path does not exists: {}", path);
bool fileExist = false;
#ifdef _WIN32
// 将 char* 路径转换为 wide-char 格式
std::wstring wpath = String2Wstring(path);
// 使用 GetFileAttributesW() 检查文件是否存在
DWORD attributes = GetFileAttributesW(wpath.c_str());
if (attributes == INVALID_FILE_ATTRIBUTES) {
LOG_ERROR("Path does not exist: {}", path);
rsp.msg.status = -2; rsp.msg.status = -2;
} } else {
else { SendFileMessage(receiver, path);
fileExist = true;
}
#else
// On Linux and other systems
std::string spath(path);
if (!fs::exists(spath)) {
LOG_ERROR("Path does not exist: {}", path);
rsp.msg.status = -2;
return false;
}
else {
fileExist = true;
}
#endif
if (fileExist) {
SendImageMessage(receiver, path);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}
pb_ostream_t stream = pb_ostream_from_buffer(out, *len); pb_ostream_t stream = pb_ostream_from_buffer(out, *len);
if (!pb_encode(&stream, Response_fields, &rsp)) { if (!pb_encode(&stream, Response_fields, &rsp)) {