fix: recognized text may have special chars hurting json

swigger · Nov 6, 2024 · de82245 · de82245
1 parent 2faebdc
commit de82245
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -16,6 +16,29 @@ int APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserve
 	return TRUE;
 }
 
+static string json_encode(const string& input) {
+	string output;
+	output.reserve(input.size() + 2);
+	for (auto c : input) {
+		switch (c) {
+		case '"': output += "\\\"";	break;
+		case '\\': output += "\\\\"; break;
+		case '\n': output += "\\n"; break;
+		case '\r': output += "\\r";	break;
+		case '\t': output += "\\t";	break;
+		default:
+			if (c>=0 && c < 0x20) {
+				char buf[16];
+				snprintf(buf, sizeof(buf), "\\u%04x", c);
+				output += buf;
+			} else {
+				output.push_back(c);
+			}
+		}
+	}
+	return output;
+}
+
 extern "C" __declspec(dllexport)
 bool wechat_ocr(const wchar_t* ocr_exe, const wchar_t * wechat_dir, const char * imgfn, void(*set_res)(const char * dt))
 {
@@ -28,7 +51,7 @@ bool wechat_ocr(const wchar_t* ocr_exe, const wchar_t * wechat_dir, const char *
 	string json;
 	json += "{";
 	json += "\"errcode\":" + std::to_string(res.errcode) + ",";
-	json += "\"imgpath\":\"" + res.imgpath + "\",";
+	json += "\"imgpath\":\"" + json_encode(res.imgpath) + "\",";
 	json += "\"width\":" + std::to_string(res.width) + ",";
 	json += "\"height\":" + std::to_string(res.height) + ",";
 	json += "\"ocr_response\":[";
@@ -39,10 +62,10 @@ bool wechat_ocr(const wchar_t* ocr_exe, const wchar_t * wechat_dir, const char *
 		json += "\"right\":" + std::to_string(blk.right) + ",";
 		json += "\"bottom\":" + std::to_string(blk.bottom) + ",";
 		json += "\"rate\":" + std::to_string(blk.rate) + ",";
-		json += "\"text\":\"" + blk.text + "\"";
+		json += "\"text\":\"" + json_encode(blk.text) + "\"";
 		json += "},";
 	}
-	if (!res.ocr_response.empty()) {
+	if (json.back() == ',') {
 		json.pop_back();
 	}
 	json += "]}";

diff --git a/src/pyspt.cpp b/src/pyspt.cpp
@@ -2,7 +2,7 @@
 #include "pyspt.h"
 #include "wechatocr.h"
 
-#ifdef USE_PYTHON
+#if USE_PYTHON+0
 
 wstring utf8towstr(const char* utf8)
 {

diff --git a/src/pyspt.h b/src/pyspt.h
@@ -1,12 +1,15 @@
 #pragma once
+
+#ifndef USE_PYTHON
 #if __has_include(<Python.h>)
 #define USE_PYTHON 1
-#define Py_LIMITED_API 0x03080000
-
-// we dont have python310_d.lib, so temporarily disable debug mode
-#pragma push_macro("_DEBUG")
-#undef _DEBUG
-#include <Python.h>
-#pragma pop_macro("_DEBUG")
+#endif
+#endif
 
+#if USE_PYTHON+0
+# define Py_LIMITED_API 0x03080000
+# pragma push_macro("_DEBUG")
+# undef _DEBUG  // we dont have python310_d.lib, so temporarily disable debug mode
+# include <Python.h>
+# pragma pop_macro("_DEBUG")
 #endif
diff --git a/vs.proj/wcocr.vcxproj b/vs.proj/wcocr.vcxproj
@@ -153,7 +153,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;USE_PYTHON=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>.;../include;../spt;X:\tools\Python310\include</AdditionalIncludeDirectories>