add:添加可以不用重启切换配置文件重新加载。
This commit is contained in:
@@ -15,8 +15,7 @@ CXmlOpr::~CXmlOpr() = default;
|
||||
bool CXmlOpr::open(const std::string& xml_path)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
if (doc_.LoadFile(CUtil::utf8_to_gbk(xml_path).c_str()) !=
|
||||
tinyxml2::XML_SUCCESS) {
|
||||
if (doc_.LoadFile(CUtil::utf8_to_gbk(xml_path).c_str()) != tinyxml2::XML_SUCCESS) {
|
||||
return false;
|
||||
}
|
||||
xml_path_ = CUtil::utf8_to_gbk(xml_path);
|
||||
@@ -29,8 +28,7 @@ bool CXmlOpr::open(const std::string& xml_path)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CXmlOpr::backup_file(const std::string& desti_folder,
|
||||
const std::string& time)
|
||||
bool CXmlOpr::backup_file(const std::string& desti_folder, const std::string& time)
|
||||
{
|
||||
if (!fs::exists(xml_path_)) {
|
||||
return false;
|
||||
@@ -39,8 +37,7 @@ bool CXmlOpr::backup_file(const std::string& desti_folder,
|
||||
fs::create_directories(desti_folder);
|
||||
}
|
||||
fs::path file_path = fs::path(xml_path_);
|
||||
fs::path des = fs::path(desti_folder)
|
||||
.append(file_path.stem().string() + "_" + time + ".xml");
|
||||
fs::path des = fs::path(desti_folder).append(file_path.stem().string() + "_" + time + ".xml");
|
||||
return fs::copy_file(xml_path_, des);
|
||||
}
|
||||
|
||||
@@ -49,8 +46,7 @@ void CXmlOpr::set_baseinfo(const OneGroupIni& base)
|
||||
opr_base_ = base;
|
||||
}
|
||||
|
||||
bool CXmlOpr::get_all_elements(std::vector<Element_t*>& vec,
|
||||
const std::string& unit)
|
||||
bool CXmlOpr::get_all_elements(std::vector<Element_t*>& vec, const std::string& unit)
|
||||
{
|
||||
vec.clear();
|
||||
|
||||
@@ -68,8 +64,7 @@ bool CXmlOpr::get_all_elements(std::vector<Element_t*>& vec,
|
||||
}
|
||||
}
|
||||
|
||||
auto purpose_node =
|
||||
parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
auto purpose_node = parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
while (purpose_node) {
|
||||
vec.push_back(purpose_node);
|
||||
purpose_node = purpose_node->NextSiblingElement();
|
||||
@@ -131,13 +126,11 @@ bool CXmlOpr::get_all_unit(std::vector<std::string>& units)
|
||||
}
|
||||
|
||||
// 排序后(仅指针排序)的节点进行复制(让实际内容有序),删除原始节点
|
||||
void CXmlOpr::copy_and_del(std::vector<Element_t*>& vec,
|
||||
std::vector<Element_t*>& out)
|
||||
void CXmlOpr::copy_and_del(std::vector<Element_t*>& vec, std::vector<Element_t*>& out)
|
||||
{
|
||||
out.clear();
|
||||
// 先找到最后一个节点
|
||||
Element_t* last_node =
|
||||
parent_node2_->LastChildElement(opr_base_.item_key.c_str());
|
||||
Element_t* last_node = parent_node2_->LastChildElement(opr_base_.item_key.c_str());
|
||||
Element_t* last_node_bk = last_node;
|
||||
if (last_node == nullptr) {
|
||||
return;
|
||||
@@ -149,8 +142,7 @@ void CXmlOpr::copy_and_del(std::vector<Element_t*>& vec,
|
||||
last_node = n;
|
||||
}
|
||||
// 删除原有的节点
|
||||
Element_t* fnode =
|
||||
parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
Element_t* fnode = parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
Element_t* fnext = fnode->NextSiblingElement();
|
||||
while (fnode != last_node_bk) {
|
||||
parent_node2_->DeleteChild(fnode);
|
||||
@@ -194,8 +186,7 @@ bool CXmlOpr::check_valid_xml_data(const std::string& data)
|
||||
|
||||
bool CXmlOpr::check_same_struct(const std::string& data)
|
||||
{
|
||||
auto* own_ele =
|
||||
parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
auto* own_ele = parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
if (own_ele == nullptr) {
|
||||
return true;
|
||||
}
|
||||
@@ -234,12 +225,10 @@ bool CXmlOpr::check_same_struct(const std::string& data)
|
||||
|
||||
// Warning: 不检查 xml 格式合法性,请自行调用 check_valid_xml_data
|
||||
// 且导入前每条数据请自行使用 check_same_struct 检测。
|
||||
bool CXmlOpr::import_newer_data(const std::vector<std::string>& vec,
|
||||
std::size_t& success_count)
|
||||
bool CXmlOpr::import_newer_data(const std::vector<std::string>& vec, std::size_t& success_count)
|
||||
{
|
||||
success_count = 0;
|
||||
auto* last_item =
|
||||
parent_node2_->LastChildElement(opr_base_.item_key.c_str());
|
||||
auto* last_item = parent_node2_->LastChildElement(opr_base_.item_key.c_str());
|
||||
if (last_item == nullptr) {
|
||||
return false;
|
||||
}
|
||||
@@ -262,8 +251,7 @@ bool CXmlOpr::import_newer_data(const std::vector<std::string>& vec,
|
||||
}
|
||||
return true;
|
||||
}
|
||||
std::string CXmlOpr::handle_space(const std::string& content,
|
||||
const std::vector<std::string>& keychars)
|
||||
std::string CXmlOpr::handle_space(const std::string& content, const std::vector<std::string>& keychars)
|
||||
{
|
||||
std::string result;
|
||||
size_t pos = 0;
|
||||
@@ -276,10 +264,8 @@ std::string CXmlOpr::handle_space(const std::string& content,
|
||||
}
|
||||
std::string op(keychars[i]);
|
||||
for (const char& c : op) {
|
||||
if (c == '|' || c == '\\' || c == '(' || c == ')' || c == '[' ||
|
||||
c == ']' || c == '{' || c == '}' || c == '^' || c == '$' ||
|
||||
c == '.' || c == '*' || c == '+' || c == '?' || c == '|' ||
|
||||
c == '\\') {
|
||||
if (c == '|' || c == '\\' || c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' || c == '^' ||
|
||||
c == '$' || c == '.' || c == '*' || c == '+' || c == '?' || c == '|' || c == '\\') {
|
||||
oss << '\\'; // 添加转义字符
|
||||
}
|
||||
oss << c;
|
||||
@@ -308,10 +294,8 @@ std::string CXmlOpr::handle_space(const std::string& content,
|
||||
}
|
||||
|
||||
// Extract the quoted content
|
||||
std::string quoted_content =
|
||||
content.substr(start_quote + 1, end_quote - start_quote - 1);
|
||||
std::string processed_content =
|
||||
std::regex_replace(quoted_content, operators_regex, " $& ");
|
||||
std::string quoted_content = content.substr(start_quote + 1, end_quote - start_quote - 1);
|
||||
std::string processed_content = std::regex_replace(quoted_content, operators_regex, " $& ");
|
||||
|
||||
// Process quoted content to replace multiple spaces with a single space
|
||||
std::istringstream iss(processed_content);
|
||||
@@ -335,8 +319,7 @@ std::string CXmlOpr::handle_space(const std::string& content,
|
||||
|
||||
return result;
|
||||
}
|
||||
bool CXmlOpr::handle_transfer(const std::string& path,
|
||||
const std::vector<std::string>& keychars)
|
||||
bool CXmlOpr::handle_transfer(const std::string& path, const std::vector<std::string>& keychars)
|
||||
{
|
||||
std::ifstream file(path);
|
||||
if (!file.is_open()) {
|
||||
@@ -414,8 +397,7 @@ bool CXmlOpr::check_key_exists(const std::string& key)
|
||||
if (keys_.size() < 1 || key.empty()) {
|
||||
return false;
|
||||
}
|
||||
Element_t* purpose_node =
|
||||
parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
Element_t* purpose_node = parent_node2_->FirstChildElement(opr_base_.item_key.c_str());
|
||||
while (purpose_node) {
|
||||
const char* value = purpose_node->Attribute(keys_[0].c_str());
|
||||
if (key == std::string(value)) {
|
||||
@@ -435,8 +417,17 @@ bool CXmlOpr::save()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CXmlOpr::handle_save(const std::string& path,
|
||||
const std::vector<std::string>& keychars)
|
||||
void CXmlOpr::clear_data()
|
||||
{
|
||||
xml_path_.clear();
|
||||
parent_node_ = nullptr;
|
||||
parent_node2_ = nullptr;
|
||||
keys_.clear();
|
||||
units_.clear();
|
||||
doc_.Clear();
|
||||
}
|
||||
|
||||
bool CXmlOpr::handle_save(const std::string& path, const std::vector<std::string>& keychars)
|
||||
{
|
||||
if (!open(path)) {
|
||||
return false;
|
||||
|
||||
@@ -28,15 +28,14 @@ public:
|
||||
void set_baseinfo(const OneGroupIni& base);
|
||||
bool parse_xml(std::vector<Element_t*>& vec);
|
||||
bool get_all_unit(std::vector<std::string>& units);
|
||||
bool get_all_elements(std::vector<Element_t*>& vec,
|
||||
const std::string& unit = "");
|
||||
void copy_and_del(std::vector<Element_t*>& vec,
|
||||
std::vector<Element_t*>& out);
|
||||
bool get_all_elements(std::vector<Element_t*>& vec, const std::string& unit = "");
|
||||
void copy_and_del(std::vector<Element_t*>& vec, std::vector<Element_t*>& out);
|
||||
void insert_brother_node(Element_t* brother, Element_t* newer);
|
||||
void del_element(Element_t* ele);
|
||||
bool check_key_exists(const Property_t& property);
|
||||
bool check_key_exists(const std::string& key);
|
||||
bool save();
|
||||
void clear_data();
|
||||
bool handle_save(const std::string& path, const std::vector<std::string>& keychars);
|
||||
std::string handle_space(const std::string& content, const std::vector<std::string>& keychars);
|
||||
|
||||
@@ -47,8 +46,7 @@ public:
|
||||
// 不检查 xml 格式合法性,请自行调用 check_valid_xml_data
|
||||
bool check_same_struct(const std::string& data);
|
||||
// 不检查 xml 格式合法性,请自行调用 check_valid_xml_data
|
||||
bool import_newer_data(const std::vector<std::string>& vec,
|
||||
std::size_t& success_count);
|
||||
bool import_newer_data(const std::vector<std::string>& vec, std::size_t& success_count);
|
||||
// 处理转义
|
||||
bool handle_transfer(const std::string& path, const std::vector<std::string>& keychars);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user