chore: use std::format

Author: MistEO

.github/workflows/build.yml

@@ -223,14 +223,10 @@ jobs:
           brew install cmake python ninja
         # ccache?
 
-      - name: Download fmtlib
-        run: |
-          sh tools/fetch-fmt.sh
-
       - name: Install compiler
         run: |
           brew install llvm
-        # 16
+        # 17
 
       # Download host arch tools for Thrift of ThriftControlUnit
       - name: Download host tools from MaaDeps

.github/workflows/test.yml

@@ -233,14 +233,10 @@ jobs:
           brew install cmake python ninja
         # ccache?
 
-      - name: Download fmtlib
-        run: |
-          sh tools/fetch-fmt.sh
-
       - name: Install compiler
         run: |
           brew install llvm
-        # 16
+        # 17
 
       - name: Bootstrap MaaDeps
         env:

cmake/config.cmake

@@ -30,7 +30,6 @@ endif()
 
 if(APPLE)
     set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path")
-    add_compile_definitions(MAA_USE_FMTLIB)
     add_compile_options("-Wno-deprecated-declarations") # supress tmpnam
     if("${MAADEPS_TRIPLET}" STREQUAL "maa-arm64-osx")
         add_compile_options("-arch;arm64")

docs/en_us/4.1-BuildGuide.md

@@ -10,13 +10,7 @@ _Please note that you only need to read this chapter if you are ready to develop
     python3 tools/maadeps-download.py
     ```
 
-2. _(macOS only)_ Download fmt
-
-    ```sh
-    sh tools/fetch-fmt.sh
-    ```
-
-3. Configure cmake
+2. Configure cmake
 
     - Windows
 
@@ -30,7 +24,7 @@ _Please note that you only need to read this chapter if you are ready to develop
     cmake --preset "NinjaMulti"
     ```
 
-4. Build the project using cmake
+3. Build the project using cmake
 
     ```bash
     cmake --build build --config Release

docs/zh_cn/4.1-构建指南.md

@@ -10,13 +10,7 @@ _请留意，仅当您准备开发 MaaFramework 本身时，才需要阅读本
     python3 tools/maadeps-download.py
     ```
 
-2. _(macOS only)_ 下载 fmt
-
-    ```sh
-    sh tools/fetch-fmt.sh
-    ```
-
-3. 配置 cmake
+2. 配置 cmake
 
     - Windows  
 
@@ -30,7 +24,7 @@ _请留意，仅当您准备开发 MaaFramework 本身时，才需要阅读本
     cmake --preset "NinjaMulti"
     ```
 
-4. 使用 cmake 构建工程
+3. 使用 cmake 构建工程
 
     ```bash
     cmake --build build --config Release

source/MaaAdbControlUnit/Input/MaatouchInput.cpp

@@ -3,9 +3,9 @@
 #include <array>
 #include <cmath>
 #include <ranges>
+#include <format>
 
 #include "Utils/Codec.h"
-#include "Utils/Format.hpp"
 #include "Utils/Logger.h"
 
 MAA_CTRL_UNIT_NS_BEGIN
@@ -64,7 +64,7 @@ bool MaatouchInput::press_key(int key)
     static constexpr std::string_view kKeyUpFormat = "k {} u\nc\n";
 
     bool ret =
-        pipe_ios_->write(MAA_FMT::format(kKeyDownFormat, key)) && pipe_ios_->write(MAA_FMT::format(kKeyUpFormat, key));
+        pipe_ios_->write(std::format(kKeyDownFormat, key)) && pipe_ios_->write(std::format(kKeyUpFormat, key));
 
     if (!ret) {
         LogError << "failed to write";

source/MaaAdbControlUnit/Input/MinitouchInput.cpp

@@ -3,8 +3,8 @@
 #include <array>
 #include <cmath>
 #include <ranges>
+#include <format>
 
-#include "Utils/Format.hpp"
 #include "Utils/Logger.h"
 
 MAA_CTRL_UNIT_NS_BEGIN

source/MaaAdbControlUnit/Input/MtouchHelper.cpp

@@ -3,8 +3,8 @@
 #include <array>
 #include <cmath>
 #include <ranges>
+#include <format>
 
-#include "Utils/Format.hpp"
 #include "Utils/Logger.h"
 
 MAA_CTRL_UNIT_NS_BEGIN
@@ -70,8 +70,8 @@ bool MtouchHelper::click(int x, int y)
 
     LogInfo << VAR(x) << VAR(y) << VAR(touch_x) << VAR(touch_y);
 
-    bool ret = pipe_ios_->write(MAA_FMT::format(kDownFormat, 0, touch_x, touch_y, press_)) &&
-               pipe_ios_->write(MAA_FMT::format(kUpFormat, 0));
+    bool ret = pipe_ios_->write(std::format(kDownFormat, 0, touch_x, touch_y, press_)) &&
+               pipe_ios_->write(std::format(kUpFormat, 0));
 
     if (!ret) {
         LogError << "failed to write";
@@ -110,7 +110,7 @@ bool MtouchHelper::swipe(int x1, int y1, int x2, int y2, int duration)
     auto start = std::chrono::steady_clock::now();
     auto now = start;
     bool ret = true;
-    ret &= pipe_ios_->write(MAA_FMT::format(kDownFormat, 0, touch_x1, touch_y1, press_));
+    ret &= pipe_ios_->write(std::format(kDownFormat, 0, touch_x1, touch_y1, press_));
     if (!ret) {
         LogError << "write error";
         return false;
@@ -127,19 +127,19 @@ bool MtouchHelper::swipe(int x1, int y1, int x2, int y2, int duration)
         std::this_thread::sleep_until(now + delay);
         now = std::chrono::steady_clock::now();
 
-        ret &= pipe_ios_->write(MAA_FMT::format(kMoveFormat, 0, tx, ty, press_));
+        ret &= pipe_ios_->write(std::format(kMoveFormat, 0, tx, ty, press_));
         if (!ret) {
             LogWarn << "write error";
         }
     }
 
     std::this_thread::sleep_until(now + delay);
     now = std::chrono::steady_clock::now();
-    ret &= pipe_ios_->write(MAA_FMT::format(kMoveFormat, 0, touch_x2, touch_y2, press_));
+    ret &= pipe_ios_->write(std::format(kMoveFormat, 0, touch_x2, touch_y2, press_));
 
     std::this_thread::sleep_until(now + delay);
     now = std::chrono::steady_clock::now();
-    ret &= pipe_ios_->write(MAA_FMT::format(kUpFormat, 0));
+    ret &= pipe_ios_->write(std::format(kUpFormat, 0));
 
     if (!ret) {
         LogError << "failed to write";
@@ -160,7 +160,7 @@ bool MtouchHelper::touch_down(int contact, int x, int y, int pressure)
 
     LogInfo << VAR(contact) << VAR(x) << VAR(y) << VAR(touch_x) << VAR(touch_y);
 
-    bool ret = pipe_ios_->write(MAA_FMT::format(kDownFormat, contact, touch_x, touch_y, pressure));
+    bool ret = pipe_ios_->write(std::format(kDownFormat, contact, touch_x, touch_y, pressure));
 
     if (!ret) {
         LogError << "failed to write";
@@ -181,7 +181,7 @@ bool MtouchHelper::touch_move(int contact, int x, int y, int pressure)
 
     LogInfo << VAR(contact) << VAR(x) << VAR(y) << VAR(touch_x) << VAR(touch_y);
 
-    bool ret = pipe_ios_->write(MAA_FMT::format(kMoveFormat, contact, touch_x, touch_y, pressure));
+    bool ret = pipe_ios_->write(std::format(kMoveFormat, contact, touch_x, touch_y, pressure));
 
     if (!ret) {
         LogError << "failed to write";
@@ -200,7 +200,7 @@ bool MtouchHelper::touch_up(int contact)
 
     LogInfo << VAR(contact);
 
-    bool ret = pipe_ios_->write(MAA_FMT::format(kUpFormat, contact));
+    bool ret = pipe_ios_->write(std::format(kUpFormat, contact));
 
     if (!ret) {
         LogError << "failed to write";

source/MaaAdbControlUnit/Screencap/FastestWay.cpp

@@ -2,8 +2,8 @@
 
 #include <ranges>
 #include <unordered_set>
+#include <format>
 
-#include "Utils/Format.hpp"
 #include "Utils/Logger.h"
 #include "Utils/NoWarningCV.hpp"
 

source/MaaAdbControlUnit/Screencap/Minicap/MinicapBase.cpp

@@ -2,8 +2,8 @@
 
 #include <array>
 #include <ranges>
+#include <format>
 
-#include "Utils/Format.hpp"
 #include "Utils/Logger.h"
 #include "Utils/NoWarningCV.hpp"
 
@@ -63,7 +63,7 @@ bool MinicapBase::init(int swidth, int sheight)
 
     // TODO: 确认低版本是否使用minicap-nopie
     const auto bin_path = agent_path_ / path(target_arch) / path("bin") / path("minicap");
-    const auto lib_path = agent_path_ / path(target_arch) / path("lib") / path(MAA_FMT::format("android-{}", fit_sdk)) /
+    const auto lib_path = agent_path_ / path(target_arch) / path("lib") / path(std::format("android-{}", fit_sdk)) /
                           path("minicap.so");
     if (!binary_->push(bin_path) || !library_->push(lib_path)) {
         return false;

source/MaaAdbControlUnit/Screencap/Minicap/MinicapDirect.cpp

@@ -1,6 +1,7 @@
 #include "MinicapDirect.h"
 
-#include "Utils/Format.hpp"
+#include <format>
+
 #include "Utils/Logger.h"
 #include "Utils/NoWarningCV.hpp"
 
@@ -12,7 +13,7 @@ std::optional<cv::Mat> MinicapDirect::screencap()
     int height = screencap_helper_.get_h();
 
     auto res =
-        binary_->invoke_bin_and_read_pipe(MAA_FMT::format("-P {}x{}@{}x{}/{} -s", width, height, width, height, 0));
+        binary_->invoke_bin_and_read_pipe(std::format("-P {}x{}@{}x{}/{} -s", width, height, width, height, 0));
 
     if (!res) {
         return std::nullopt;

source/MaaAdbControlUnit/Screencap/Minicap/MinicapStream.cpp

@@ -1,7 +1,8 @@
 #include "MinicapStream.h"
-#include "MinicapDef.h"
 
-#include "Utils/Format.hpp"
+#include <format>
+
+#include "MinicapDef.h"
 #include "Utils/Logger.h"
 #include "Utils/NoWarningCV.hpp"
 
@@ -49,7 +50,7 @@ bool MinicapStream::init(int swidth, int sheight)
     uint32_t width = screencap_helper_.get_w();
     uint32_t height = screencap_helper_.get_h();
 
-    pipe_ios_ = binary_->invoke_bin(MAA_FMT::format("-P {}x{}@{}x{}/{}", width, height, width, height, 0));
+    pipe_ios_ = binary_->invoke_bin(std::format("-P {}x{}@{}x{}/{}", width, height, width, height, 0));
 
     if (!pipe_ios_) {
         LogError << "pipe_ios_ is nullptr";

source/MaaFramework/Controller/ControllerAgent.cpp

@@ -509,7 +509,7 @@ void ControllerAgent::init_recording()
 {
     auto recording_dir = GlobalOptionMgr::get_instance().log_dir() / "Recording";
     std::filesystem::create_directories(recording_dir);
-    recording_path_ = recording_dir / MAA_FMT::format("MaaRecording_{}.txt", format_now_for_filename());
+    recording_path_ = recording_dir / std::format("MaaRecording_{}.txt", format_now_for_filename());
 }
 
 void ControllerAgent::append_recording(json::value info, const std::chrono::steady_clock::time_point& start_time,

source/MaaFramework/Task/Recognizer.cpp

@@ -308,7 +308,7 @@ void Recognizer::show_hit_draw(const cv::Mat& image, const Result& res, const st
         return;
     }
 
-    const std::string kWinName = MAA_FMT::format("Hit: {}", task_name);
+    const std::string kWinName = std::format("Hit: {}", task_name);
 
     cv::Mat draw = image.clone();
 

source/MaaFramework/Vision/ColorMatcher.cpp

@@ -1,8 +1,8 @@
 #include "ColorMatcher.h"
 
-#include "Utils/NoWarningCV.hpp"
+#include <format>
 
-#include "Utils/Format.hpp"
+#include "Utils/NoWarningCV.hpp"
 #include "Utils/Logger.h"
 #include "VisionUtils.hpp"
 
@@ -115,7 +115,7 @@ void ColorMatcher::draw_result(const cv::Rect& roi, const cv::Mat& color, const
         const auto& res = results[i];
         cv::rectangle(image_draw, res.box, color_draw, 1);
 
-        std::string flag = MAA_FMT::format("{}: {}, [{}, {}, {}, {}]", i, res.score, res.box.x, res.box.y,
+        std::string flag = std::format("{}: {}, [{}, {}, {}, {}]", i, res.score, res.box.x, res.box.y,
                                            res.box.width, res.box.height);
         cv::putText(image_draw, flag, cv::Point(res.box.x, res.box.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, color_draw, 1);
         if (i > 10 && res.score < 100) {

source/MaaFramework/Vision/FeatureMatcher.cpp

@@ -227,7 +227,7 @@ void FeatureMatcher::draw_result(const cv::Mat& templ, const std::vector<cv::Key
         const auto& res = results.at(i);
         cv::rectangle(image_draw, res.box, color, 1);
 
-        std::string flag = MAA_FMT::format("Cnt: {}, [{}, {}, {}, {}]", res.count, res.box.x, res.box.y, res.box.width,
+        std::string flag = std::format("Cnt: {}, [{}, {}, {}, {}]", res.count, res.box.x, res.box.y, res.box.width,
                                            res.box.height);
         cv::putText(image_draw, flag, cv::Point(res.box.x, res.box.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, color, 1);
     }

source/MaaFramework/Vision/NeuralNetworkClassifier.cpp

@@ -112,7 +112,7 @@ void NeuralNetworkClassifier::draw_result(const Result& res) const
     for (size_t i = 0; i != param_.cls_size; ++i) {
         const auto color = i == res.cls_index ? cv::Scalar(0, 0, 255) : cv::Scalar(255, 0, 0);
         std::string text =
-            MAA_FMT::format("{} {}: prob {:.3f}, raw {:.3f}", i, param_.labels[i], res.probs[i], res.raw[i]);
+            std::format("{} {}: prob {:.3f}, raw {:.3f}", i, param_.labels[i], res.probs[i], res.raw[i]);
         cv::putText(image_draw, text, pt, cv::FONT_HERSHEY_PLAIN, 1.2, color, 1);
         pt.y += 20;
     }

source/MaaFramework/Vision/NeuralNetworkDetector.cpp

@@ -167,7 +167,7 @@ void NeuralNetworkDetector::draw_result(const cv::Rect& roi, const ResultsVec& r
 
         const auto color = cv::Scalar(0, 0, 255);
         cv::rectangle(image_draw, my_box, color, 1);
-        std::string flag = MAA_FMT::format("{} {} {:.3f}: [{}, {}, {}, {}]", res.cls_index, res.label, res.score,
+        std::string flag = std::format("{} {} {:.3f}: [{}, {}, {}, {}]", res.cls_index, res.label, res.score,
                                            my_box.x, my_box.y, my_box.width, my_box.height);
         cv::putText(image_draw, flag, cv::Point(my_box.x, my_box.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, color, 1);
     }

source/MaaFramework/Vision/OCRer.cpp

@@ -141,7 +141,7 @@ void OCRer::draw_result(const cv::Rect& roi, const ResultsVec& results) const
 
         const auto color = cv::Scalar(0, 0, 255);
         cv::rectangle(image_draw, my_box, color, 1);
-        std::string flag = MAA_FMT::format("{}: [{}, {}, {}, {}]", i, my_box.x, my_box.y, my_box.width, my_box.height);
+        std::string flag = std::format("{}: [{}, {}, {}, {}]", i, my_box.x, my_box.y, my_box.width, my_box.height);
         cv::putText(image_draw, flag, cv::Point(my_box.x, my_box.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, color, 1);
     }
 

source/MaaFramework/Vision/TemplateMatcher.cpp

@@ -130,7 +130,7 @@ void TemplateMatcher::draw_result(const cv::Rect& roi, const cv::Mat& templ, con
         const auto& res = results.at(i);
         cv::rectangle(image_draw, res.box, color, 1);
 
-        std::string flag = MAA_FMT::format("{}: {:.3f}, [{}, {}, {}, {}]", i, res.score, res.box.x, res.box.y,
+        std::string flag = std::format("{}: {:.3f}, [{}, {}, {}, {}]", i, res.score, res.box.x, res.box.y,
                                            res.box.width, res.box.height);
         cv::putText(image_draw, flag, cv::Point(res.box.x, res.box.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, color, 1);
     }

source/MaaFramework/Vision/VisionBase.cpp

@@ -36,7 +36,7 @@ cv::Mat VisionBase::draw_roi(const cv::Rect& roi, const cv::Mat& base) const
     cv::putText(image_draw, name_, cv::Point(5, image_.rows - 5), cv::FONT_HERSHEY_SIMPLEX, 1, color, 2);
 
     cv::rectangle(image_draw, roi, color, 1);
-    std::string flag = MAA_FMT::format("ROI: [{}, {}, {}, {}]", roi.x, roi.y, roi.width, roi.height);
+    std::string flag = std::format("ROI: [{}, {}, {}, {}]", roi.x, roi.y, roi.width, roi.height);
     cv::putText(image_draw, flag, cv::Point(roi.x, roi.y - 5), cv::FONT_HERSHEY_PLAIN, 1.2, color, 1);
 
     return image_draw;
@@ -51,7 +51,7 @@ void VisionBase::handle_draw(const cv::Mat& draw) const
 
 void VisionBase::save_image(const cv::Mat& image) const
 {
-    std::string filename = MAA_FMT::format("{}_{}.png", name_, format_now_for_filename());
+    std::string filename = std::format("{}_{}.png", name_, format_now_for_filename());
     auto filepath = GlobalOptionMgr::get_instance().log_dir() / "Vision" / filename;
     MAA_NS::imwrite(filepath, image);
     LogDebug << "save image to" << filepath;