fix(log): charset

修复log文件上传的路径编码问题

Dice/DiceJob.cpp

@@ -500,8 +500,8 @@ void log_put(AttrObject& job) {
 		"ap-southeast-1");
 	if (job->at("ret") == "SUCCESS") {
 #endif //_Win32
-		job->at("log_file") = nameLog;
-		job->at("log_url") = "https://logpainter.kokona.tech/?s3=" + nameLog;
+		job->set("log_file",nameLog);
+		job->set("log_url", "https://logpainter.kokona.tech/?s3=" + nameLog);
 		reply(job, "{strLogUpSuccess}");
 	}
 	else if (++cntExec > 2) {

Dice/DicePython.cpp

@@ -690,7 +690,7 @@ PYDEF(getDiceID) {
 }
 PYDEF(getDiceDir) {
 	auto dir{ DiceDir.wstring() };
-	return PyUnicode_FromUnicode(dir.c_str(), (Py_ssize_t)dir.length());
+	return PyUnicode_FromWideChar(dir.c_str(), (Py_ssize_t)dir.length());
 }
 typedef struct {
 	PyObject_HEAD
@@ -1170,11 +1170,12 @@ PyGlobal::PyGlobal() {
 		|| std::filesystem::exists((dirPy = dirExe) / "python3.dll")) {
 		//Py_SetPythonHome(dirPy.wstring().c_str());
 		PyConfig_SetString(&config, &config.home, dirPy.wstring().c_str());
+		//Py_SetProgramName(L"DiceMaid");
+		PyConfig_SetString(&config, &config.program_name, L"DiceMaid");
 		//Py_SetPath((dirPy / "python311.zip").wstring().c_str());
 		PyWideStringList_Append(&config.module_search_paths, (dirPy / "python311.zip").wstring().c_str());
 	}
 	status = PyConfig_Read(&config);
-	Py_SetProgramName(L"DiceMaid");
 	try {
 		static auto import_dice = PyImport_AppendInittab(DiceModuleName, PyInit_DiceMaid);
 		if (import_dice) {

Dice/DiceSession.cpp

@@ -29,7 +29,7 @@ void LogInfo::append(const string& s) {
 }
 
 bool DiceSession::empty()const {
-	return dict.empty() && player->empty() && obs->empty() && !logger.tLastMsg && decks.empty();
+	return dict.empty() && player->empty() && obs->empty() && !logger.tStart && decks.empty();
 }
 bool DiceSession::has(const string& key)const {
 	static std::unordered_set<string> items{ "name", "gms", "pls", "obs", "log_name", "log_file" };
@@ -256,7 +256,7 @@ void DiceSession::log_end(DiceEvent* msg) {
 		return;
 	}
 	msg->set("log_file", logger.fileLog);
-	msg->set("log_path", log_path().string());
+	msg->set("log_path", log_path().u8string());
 	msg->replyMsg("strLogEnd");
 	update();
 	msg->set("hook","LogEnd");

Dice/EncodingConvert.cpp

@@ -150,7 +150,7 @@ std::string UTF8toLocal(const std::string& str) {
 #ifdef _WIN32
 	return UTF8toGBK(str);
 #else
-	return str
+	return str;
 #endif
 }
 std::string GBKtoLocal(const std::string& strGBK){
@@ -211,7 +211,7 @@ std::wstring UTF8toU(const std::string& strUTF8) {
 	delete[] strUTF16;
 	return wstrOut;
 #else
-	return ConvertEncoding<char>(strUTF8, "utf-8", "gb18030");
+	return ConvertEncoding<wchar_t>(strUTF8, "utf-8", "utf-32le");
 #endif
 }