styles: format by clang-format

Author: MistEO

source/MaaAdbControlUnit/Input/AutoDetectInput.cpp

@@ -1,8 +1,8 @@
 #include "AutoDetectInput.h"
 
+#include <format>
 #include <ranges>
 #include <unordered_set>
-#include <format>
 
 #include "AdbInput.h"
 #include "MaatouchInput.h"

source/MaaAdbControlUnit/Input/MaatouchInput.cpp

@@ -2,8 +2,8 @@
 
 #include <array>
 #include <cmath>
-#include <ranges>
 #include <format>
+#include <ranges>
 
 #include "Utils/Codec.h"
 #include "Utils/Logger.h"
@@ -68,8 +68,7 @@ bool MaatouchInput::press_key(int key)
     static constexpr std::string_view kKeyDownFormat = "k {} d\nc\n";
     static constexpr std::string_view kKeyUpFormat = "k {} u\nc\n";
 
-    bool ret =
-        pipe_ios_->write(std::format(kKeyDownFormat, key)) && pipe_ios_->write(std::format(kKeyUpFormat, key));
+    bool ret = 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

@@ -2,8 +2,8 @@
 
 #include <array>
 #include <cmath>
-#include <ranges>
 #include <format>
+#include <ranges>
 
 #include "Utils/Logger.h"
 

source/MaaAdbControlUnit/Input/MtouchHelper.cpp

@@ -2,8 +2,8 @@
 
 #include <array>
 #include <cmath>
-#include <ranges>
 #include <format>
+#include <ranges>
 
 #include "Utils/Logger.h"
 

source/MaaAdbControlUnit/Screencap/FastestWay.cpp

@@ -1,8 +1,8 @@
 #include "FastestWay.h"
 
+#include <format>
 #include <ranges>
 #include <unordered_set>
-#include <format>
 
 #include "Encode.h"
 #include "EncodeToFile.h"

source/MaaAdbControlUnit/Screencap/Minicap/MinicapBase.cpp

@@ -1,8 +1,8 @@
 #include "MinicapBase.h"
 
 #include <array>
-#include <ranges>
 #include <format>
+#include <ranges>
 
 #include "Utils/Logger.h"
 #include "Utils/NoWarningCV.hpp"
@@ -63,8 +63,8 @@ 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(std::format("android-{}", fit_sdk)) /
-                          path("minicap.so");
+    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

@@ -12,8 +12,7 @@ std::optional<cv::Mat> MinicapDirect::screencap()
     int width = screencap_helper_.get_w();
     int height = screencap_helper_.get_h();
 
-    auto res =
-        binary_->invoke_bin_and_read_pipe(std::format("-P {}x{}@{}x{}/{} -s", width, height, width, height, 0));
+    auto res = binary_->invoke_bin_and_read_pipe(std::format("-P {}x{}@{}x{}/{} -s", width, height, width, height, 0));
 
     if (!res) {
         return std::nullopt;

source/MaaFramework/Vision/ColorMatcher.cpp

@@ -2,8 +2,8 @@
 
 #include <format>
 
-#include "Utils/NoWarningCV.hpp"
 #include "Utils/Logger.h"
+#include "Utils/NoWarningCV.hpp"
 #include "VisionUtils.hpp"
 
 MAA_VISION_NS_BEGIN
@@ -118,8 +118,8 @@ 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 = std::format("{}: {}, [{}, {}, {}, {}]", i, res.count, res.box.x, res.box.y,
-                                           res.box.width, res.box.height);
+        std::string flag =
+            std::format("{}: {}, [{}, {}, {}, {}]", i, 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_draw, 1);
         if (i > 10 && res.count < 100) {
             // 太多了画不下，反正后面的也是没用的

source/MaaFramework/Vision/FeatureMatcher.cpp

@@ -230,8 +230,8 @@ 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 = std::format("Cnt: {}, [{}, {}, {}, {}]", res.count, res.box.x, res.box.y, res.box.width,
-                                           res.box.height);
+        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

@@ -113,8 +113,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 =
-            std::format("{} {}: prob {:.3f}, raw {:.3f}", i, param_.labels[i], res.probs[i], res.raw[i]);
+        std::string text = 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

@@ -169,8 +169,8 @@ 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 = std::format("{} {} {:.3f}: [{}, {}, {}, {}]", res.cls_index, res.label, res.score,
-                                           my_box.x, my_box.y, my_box.width, my_box.height);
+        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/TemplateMatcher.cpp

@@ -134,7 +134,7 @@ void TemplateMatcher::draw_result(const cv::Rect& roi, const cv::Mat& templ, con
         cv::rectangle(image_draw, res.box, color, 1);
 
         std::string flag = std::format("{}: {:.3f}, [{}, {}, {}, {}]", i, res.score, res.box.x, res.box.y,
-                                           res.box.width, res.box.height);
+                                       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/MaaProjectInterfaceCli/interactor.cpp

@@ -1,7 +1,7 @@
 #include "interactor.h"
 
-#include <unordered_set>
 #include <format>
+#include <unordered_set>
 
 #include "MaaToolkit/Device/MaaToolkitDevice.h"
 #include "Utils/Logger.h"
@@ -86,10 +86,9 @@ void Interactor::print_config() const
 
     std::cout << "Controller:\n\n";
     std::cout << "\t"
-              << MaaNS::utf8_to_crt(
-                     std::format("{}\n\t\t{}\n\t\t{}", config_.configuration().controller.name,
-                                     MaaNS::path_to_utf8_string(config_.configuration().controller.adb_path),
-                                     config_.configuration().controller.address))
+              << MaaNS::utf8_to_crt(std::format("{}\n\t\t{}\n\t\t{}", config_.configuration().controller.name,
+                                                MaaNS::path_to_utf8_string(config_.configuration().controller.adb_path),
+                                                config_.configuration().controller.address))
               << "\n\n";
 
     std::cout << "Resource:\n\n";

source/MaaProjectInterfaceCli/runner.cpp

@@ -2,7 +2,6 @@
 
 #include <format>
 #include <iostream>
-#include <format>
 
 #include <meojson/json.hpp>
 

source/include/Utils/ImageIo.h

@@ -24,8 +24,8 @@ inline cv::Mat imread(const std::string& utf8_path, int flags = cv::IMREAD_COLOR
 
 inline bool imwrite(const std::filesystem::path& path, cv::InputArray img)
 {
-    if (path.has_parent_path() && !std::filesystem::exists(path.parent_path())
-        && !std::filesystem::create_directories(path.parent_path())) {
+    if (path.has_parent_path() && !std::filesystem::exists(path.parent_path()) &&
+        !std::filesystem::create_directories(path.parent_path())) {
         return false;
     }
 

source/include/Utils/LoggerUtils.h

@@ -1,15 +1,14 @@
 #pragma once
 
 #include <filesystem>
-#include <fstream>
 #include <format>
+#include <fstream>
 #include <iostream>
 #include <mutex>
 #include <ranges>
 #include <thread>
 #include <tuple>
 #include <type_traits>
-#include <format>
 
 #if defined(__APPLE__) || defined(__linux__)
 #include <unistd.h>
@@ -30,7 +29,7 @@
 
 namespace cv
 {
-    class Mat;
+class Mat;
 }
 
 MAA_LOG_NS_BEGIN
@@ -212,4 +211,4 @@ class MAA_UTILS_API LogStream
     std::stringstream buffer_;
 };
 
-MAA_LOG_NS_END
+MAA_LOG_NS_END

source/include/Utils/Time.hpp

@@ -7,38 +7,37 @@
 #endif
 
 #include <chrono>
-#include <string>
 #include <format>
+#include <string>
 
 MAA_NS_BEGIN
 
 inline std::string format_now()
 {
 #ifndef __APPLE__ // Now Apple's compiler cannot build std::chrono::format. 2023/07/21
     return std::format("{}", std::chrono::current_zone()->to_local(
-                                     std::chrono::floor<std::chrono::milliseconds>(std::chrono::system_clock::now())));
+                                 std::chrono::floor<std::chrono::milliseconds>(std::chrono::system_clock::now())));
 #else
     timeval tv = {};
     gettimeofday(&tv, nullptr);
     time_t nowtime = tv.tv_sec;
     tm* tm_info = localtime(&nowtime);
     return std::format("{:0>4}-{:0>2}-{:0>2} {:0>2}:{:0>2}:{:0>2}.{:0>3}", tm_info->tm_year + 1900, tm_info->tm_mon,
-                           tm_info->tm_mday, tm_info->tm_hour, tm_info->tm_min, tm_info->tm_sec, tv.tv_usec / 1000);
+                       tm_info->tm_mday, tm_info->tm_hour, tm_info->tm_min, tm_info->tm_sec, tv.tv_usec / 1000);
 #endif
 }
 
 inline std::string format_now_for_filename()
 {
 #ifndef __APPLE__ // Now Apple's compiler cannot build std::chrono::format. 2023/07/21
-    return std::format("{:%Y.%m.%d-%H.%M.%S}",
-                           std::chrono::current_zone()->to_local(std::chrono::system_clock::now()));
+    return std::format("{:%Y.%m.%d-%H.%M.%S}", std::chrono::current_zone()->to_local(std::chrono::system_clock::now()));
 #else
     timeval tv = {};
     gettimeofday(&tv, nullptr);
     time_t nowtime = tv.tv_sec;
     tm* tm_info = localtime(&nowtime);
     return std::format("{:0>4}.{:0>2}.{:0>2}-{:0>2}.{:0>2}.{:0>2}.{}", tm_info->tm_year + 1900, tm_info->tm_mon,
-                           tm_info->tm_mday, tm_info->tm_hour, tm_info->tm_min, tm_info->tm_sec, tv.tv_usec);
+                       tm_info->tm_mday, tm_info->tm_hour, tm_info->tm_min, tm_info->tm_sec, tv.tv_usec);
 #endif
 }