用s2ws替换xmlCharToWideString里面重复的内容；删除了没有用到的include：Windows.h；修改了README；

Author: sieveLau

README.md

@@ -1,13 +1,16 @@
 ## 编译要求
 
-cpp分支是sln格式（CMake在Windows上实在搞不定libxml2），linux和mac的CMake分支基本是同步的。在Windows上建议使用[vcpkg](https://github.com/microsoft/vcpkg)
+cpp分支是sln格式。cmake分支当前正在Windows上的优化，Mac和Linux平台暂时还没有测试，应该会缺少一些header。在Windows上建议使用[vcpkg](https://github.com/microsoft/vcpkg)
 安装依赖。只测试了64位系统（x64-windows和arm64）。
 
 - C++20
 - plog
 - libxml2
 - fmt
 
+编译前请自行添加cmake命令行参数指向你的`vcpkg.cmake`
+，例如`-DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake`。
+
 ## 用法
 
 运行`RWSimplifiedPatcher.exe`
@@ -35,8 +38,7 @@ cpp分支是sln格式（CMake在Windows上实在搞不定libxml2），linux和ma
 xml的方法翻译了[WallStuff](https://steamcommunity.com/sharedfiles/filedetails/?id=1994340640)
 的defs。然后我发现这个xml生成过程是可以自动化的……~~
 
-最近趁休假，重新按照本来应该用的翻译方式[Mod_folder_structure](https://rimworldwiki.com/wiki/Modding_Tutorials/Mod_folder_structure#The
-Languages folder)
+最近趁休假，重新按照本来应该用的翻译方式[Mod_folder_structure](https://rimworldwiki.com/wiki/Modding_Tutorials/Mod_folder_structure#The_Languages_folder)
 ，参考[Rimworld Mod教程 第七章：翻译包文件](https://blog.csdn.net/qq_58145131/article/details/123726403)
 ，重写了程序。
 
@@ -56,5 +58,6 @@ xml。~~
 
 ## Todo
 
-- [ ] 自动读取和成成About.xml
-- [ ] ~~[ ] [[notlikely]] GUI~~
+- [ ] 自动读取和生成汉化Mod的所有结构
+- [ ] Mac平台的wchar_t支持测试
+- [ ] 简单的图形界面

README_EN.md

@@ -1,3 +1,5 @@
+Warning: Hasn't been updated. Please use Google Translate to read README.md
+
 ## Compile Requirement
 
 - c++20: for `std::format` and `std::filesystem`

helper/helper.cpp

@@ -1,23 +1,8 @@
 #include "helper.hpp"
 
-std::wstring xmlCharToWideString(const xmlChar *xmlString) {
-    if (!xmlString) {
-        PLOGF << "provided string was null";
-        abort();
-    }//provided string was null
-    try {
-        std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> conv;
-        return conv.from_bytes((const char *) xmlString);
-    } catch (const std::range_error &e) {
-        PLOGF << e.what();
-        abort();//wstring_convert failed
-    }
-}
-
 std::wstring s2ws(const std::string &str) {
     using convert_typeX = std::codecvt_utf8<wchar_t>;
     std::wstring_convert<convert_typeX, wchar_t> converterX;
-
     return converterX.from_bytes(str);
 }
 
@@ -28,6 +13,19 @@ std::string ws2s(const std::wstring &wstr) {
     return converterX.to_bytes(wstr);
 }
 
+std::wstring xmlCharToWideString(const xmlChar *xmlString) {
+    if (!xmlString) {
+        PLOGF << "provided string was null";
+        abort();
+    }
+    try {
+        return s2ws((const char *) xmlString);
+    } catch (const std::exception &e) {
+        PLOGF << e.what();
+        abort();//wstring_convert failed
+    }
+}
+
 std::wstring getXPath(xmlNodePtr node) {
     auto internal_str = xmlGetNodePath(node);
     std::wstring rval = xmlCharToWideString(internal_str);
@@ -78,7 +76,7 @@ std::wstring getDefNameFromXPath(xmlDocPtr doc, const std::wstring &node_xpath)
     return L"";
 }
 
-std::wstring getliParentTagName(const std::wstring &xpath_containing_li) {
+std::wstring get_li_parent_tag_name(const std::wstring &xpath_containing_li) {
     std::wregex li_pattern(L"/(\\w*)/li(\\[|/)");
     std::wsmatch li_match;
     if (std::regex_search(xpath_containing_li, li_match, li_pattern)) {
@@ -87,7 +85,7 @@ std::wstring getliParentTagName(const std::wstring &xpath_containing_li) {
     throw std::runtime_error("Invalid xpath: no li found");
 }
 
-bool getliNumber(const std::wstring &xpath_containing_li, long *result) {
+bool get_li_number(const std::wstring &xpath_containing_li, long *result) {
     std::wregex li_number_pattern(LR"(/\w*/li\[(\d*)\]/)");
     std::wsmatch li_match;
     if (std::regex_search(xpath_containing_li, li_match, li_number_pattern)) {

helper/helper.hpp

@@ -2,9 +2,6 @@
 
 #ifdef WIN32
 #pragma warning(disable : 4996)
-
-#include <Windows.h>
-
 #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 #define _CRT_SECURE_NO_WARNINGS
 #endif
@@ -40,9 +37,9 @@ std::vector<xmlNodePtr> getNodeSet(const xmlXPathObject *xpath_result);
 
 std::wstring getDefNameFromXPath(xmlDocPtr doc, const std::wstring &node_xpath);
 
-std::wstring getliParentTagName(const std::wstring &xpath_containing_li);
+std::wstring get_li_parent_tag_name(const std::wstring &xpath_containing_li);
 
-bool getliNumber(const std::wstring &xpath_containing_li, long *result);
+bool get_li_number(const std::wstring &xpath_containing_li, long *result);
 
 /**
  * generate corresponding output directory for this xpath

main.cpp

@@ -3,7 +3,6 @@
 //
 
 #ifdef WIN32
-#include <Windows.h>
 #endif
 
 #include "helper/helper.hpp"
@@ -110,10 +109,10 @@ int main(int argc, char **argv) {
                     } else {
                         // 这里处理的就是作为某个li元素里面的label了
                         // 例子是/Defs/AlienRace.ThingDef_AlienRace/tools/li[1]/label
-                        auto name = getliParentTagName(xpath);
+                        auto name = get_li_parent_tag_name(xpath);
                         long int li_number;
                         // 有的li有序号，有的没有
-                        if (getliNumber(xpath, &li_number)) {
+                        if (get_li_number(xpath, &li_number)) {
                             auto final_tag_name =
                                 // clang-format off
                                 fmt::format(L"<{defName}.{liName}.{liNumber}.{type}>{text}</{defName}.{liName}.{liNumber}.{type}>\n",

replace/replace.cpp

@@ -2,7 +2,6 @@
 #pragma warning(disable : 4996)
 #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 #define _CRT_SECURE_NO_WARNINGS
-#include <Windows.h>
 #endif
 
 #include "../helper/helper.hpp"