From ec86c9c99b0ae87429ff140e3ff893d3a0da984e Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 13 Jan 2023 15:16:18 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=E7=9A=84=E6=97=A5=E5=BF=97=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/AsstCaller.cpp | 4 ++-- src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp | 1 + src/MaaCore/Config/Miscellaneous/OcrPack.cpp | 9 ++++++++- src/MaaCore/Config/Miscellaneous/TilePack.cpp | 3 +++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/MaaCore/AsstCaller.cpp b/src/MaaCore/AsstCaller.cpp index 538761230b..6b05092401 100644 --- a/src/MaaCore/AsstCaller.cpp +++ b/src/MaaCore/AsstCaller.cpp @@ -46,7 +46,7 @@ bool inited() AsstBool AsstSetUserDir(const char* path) { - auto os_path = asst::utils::path(path); + auto os_path = std::filesystem::absolute(asst::utils::path(path)); return asst::UserDir.set(os_path); } @@ -54,7 +54,7 @@ AsstBool AsstLoadResource(const char* path) { using namespace asst::utils::path_literals; - auto os_path = asst::utils::path(path); + auto os_path = std::filesystem::absolute(asst::utils::path(path)); auto res_path = os_path / "resource"_p; if (asst::ResDir.empty()) { asst::ResDir.set(res_path); diff --git a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp index 9c541cc71a..6b543c92a6 100644 --- a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp +++ b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp @@ -7,6 +7,7 @@ bool asst::AvatarCacheManager::load(const std::filesystem::path& path) { LogTraceFunction; + Log.info("load", path); m_path = path; diff --git a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp index c42820b919..74ed9dc2b7 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp +++ b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp @@ -29,13 +29,20 @@ static std::filesystem::path prepare_paddle_dir(const std::filesystem::path& dir asst::OcrPack::OcrPack() : m_ocr_option(std::make_unique()), m_det(nullptr), m_rec(nullptr), m_ocr(nullptr) { + LogTraceFunction; m_ocr_option->UseOrtBackend(); } -asst::OcrPack::~OcrPack() {} +asst::OcrPack::~OcrPack() +{ + LogTraceFunction; +} bool asst::OcrPack::load(const std::filesystem::path& path) { + LogTraceFunction; + Log.info("load", path); + bool use_temp_dir = false; auto paddle_dir = prepare_paddle_dir(path, &use_temp_dir); diff --git a/src/MaaCore/Config/Miscellaneous/TilePack.cpp b/src/MaaCore/Config/Miscellaneous/TilePack.cpp index dc42f85b61..33d42976ec 100644 --- a/src/MaaCore/Config/Miscellaneous/TilePack.cpp +++ b/src/MaaCore/Config/Miscellaneous/TilePack.cpp @@ -9,6 +9,9 @@ ASST_SUPPRESS_CV_WARNINGS_END bool asst::TilePack::load(const std::filesystem::path& path) { + LogTraceFunction; + Log.info("load", path); + if (!std::filesystem::exists(path)) { return false; }