[vcpkg] Reformat and refactor to reduce function size

3 files changed, 278 insertions, 237 deletions

diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index 19210facf..9f85992be 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -175,18 +175,21 @@ namespace vcpkg
 
     static fs::path get_ifw_installerbase_path(const fs::path& downloads_folder, const fs::path& scripts_folder)
     {
-        static constexpr std::array<int, 3> EXPECTED_VERSION = { 3, 1, 81 };
+        static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 1, 81};
         static const std::wstring VERSION_CHECK_ARGUMENTS = L"--framework-version";
 
-        const fs::path downloaded_copy = downloads_folder / "QtInstallerFramework-win-x86" / "bin" / "installerbase.exe";
+        const fs::path downloaded_copy =
+            downloads_folder / "QtInstallerFramework-win-x86" / "bin" / "installerbase.exe";
 
         std::vector<fs::path> candidate_paths;
         candidate_paths.push_back(downloaded_copy);
         // TODO: Uncomment later
-        //const std::vector<fs::path> from_path = Files::find_from_PATH(L"installerbase");
-        //candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend());        
-        //candidate_paths.push_back(fs::path(System::get_environment_variable(L"HOMEDRIVE").value_or("C:")) / "Qt" / "Tools" / "QtInstallerFramework" / "3.1" / "bin" / "installerbase.exe");
-        //candidate_paths.push_back(fs::path(System::get_environment_variable(L"HOMEDRIVE").value_or("C:")) / "Qt" / "QtIFW-3.1.0" / "bin" / "installerbase.exe");
+        // const std::vector<fs::path> from_path = Files::find_from_PATH(L"installerbase");
+        // candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend());
+        // candidate_paths.push_back(fs::path(System::get_environment_variable(L"HOMEDRIVE").value_or("C:")) / "Qt" /
+        // "Tools" / "QtInstallerFramework" / "3.1" / "bin" / "installerbase.exe");
+        // candidate_paths.push_back(fs::path(System::get_environment_variable(L"HOMEDRIVE").value_or("C:")) / "Qt" /
+        // "QtIFW-3.1.0" / "bin" / "installerbase.exe");
 
         const Optional<fs::path> path =
             find_if_has_equal_or_greater_version(candidate_paths, VERSION_CHECK_ARGUMENTS, EXPECTED_VERSION);
@@ -283,17 +286,20 @@ namespace vcpkg
 
     const fs::path& VcpkgPaths::get_ifw_installerbase_exe() const
     {
-        return this->ifw_installerbase_exe.get_lazy([this]() { return get_ifw_installerbase_path(this->downloads, this->scripts); });
+        return this->ifw_installerbase_exe.get_lazy(
+            [this]() { return get_ifw_installerbase_path(this->downloads, this->scripts); });
     }
 
     const fs::path& VcpkgPaths::get_ifw_binarycreator_exe() const
     {
-        return this->ifw_binarycreator_exe.get_lazy([this]() { return get_ifw_installerbase_exe().parent_path() / "binarycreator.exe"; });
+        return this->ifw_binarycreator_exe.get_lazy(
+            [this]() { return get_ifw_installerbase_exe().parent_path() / "binarycreator.exe"; });
     }
 
     const fs::path& VcpkgPaths::get_ifw_repogen_exe() const
     {
-        return this->ifw_repogen_exe.get_lazy([this]() { return get_ifw_installerbase_exe().parent_path() / "repogen.exe"; });
+        return this->ifw_repogen_exe.get_lazy(
+            [this]() { return get_ifw_installerbase_exe().parent_path() / "repogen.exe"; });
     }
 
     static std::vector<std::string> get_vs2017_installation_instances(const VcpkgPaths& paths)
diff --git a/toolsrc/src/commands_export.cpp b/toolsrc/src/commands_export.cpp
index 3662a46d8..a24f2eac7 100644
--- a/toolsrc/src/commands_export.cpp
+++ b/toolsrc/src/commands_export.cpp
@@ -211,17 +211,17 @@ namespace vcpkg::Commands::Export
         return nullopt;
     }
 
-    void export_integration_files(const fs::path &raw_exported_dir_path, const VcpkgPaths& paths)
+    void export_integration_files(const fs::path& raw_exported_dir_path, const VcpkgPaths& paths)
     {
         const std::vector<fs::path> integration_files_relative_to_root = {
-            { ".vcpkg-root" },
-            { fs::path{ "scripts" } / "buildsystems" / "msbuild" / "applocal.ps1" },
-            { fs::path{ "scripts" } / "buildsystems" / "msbuild" / "vcpkg.targets" },
-            { fs::path{ "scripts" } / "buildsystems" / "vcpkg.cmake" },
-            { fs::path{ "scripts" } / "cmake" / "vcpkg_get_windows_sdk.cmake" },
-            { fs::path{ "scripts" } / "getWindowsSDK.ps1" },
-            { fs::path{ "scripts" } / "getProgramFilesPlatformBitness.ps1" },
-            { fs::path{ "scripts" } / "getProgramFiles32bit.ps1" },
+            {".vcpkg-root"},
+            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
+            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
+            {fs::path{"scripts"} / "buildsystems" / "vcpkg.cmake"},
+            {fs::path{"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
+            {fs::path{"scripts"} / "getWindowsSDK.ps1"},
+            {fs::path{"scripts"} / "getProgramFilesPlatformBitness.ps1"},
+            {fs::path{"scripts"} / "getProgramFiles32bit.ps1"},
         };
 
         for (const fs::path& file : integration_files_relative_to_root)
@@ -237,8 +237,27 @@ namespace vcpkg::Commands::Export
         }
     }
 
-    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    struct ExportArguments
+    {
+        bool dry_run;
+        bool raw;
+        bool nuget;
+        bool ifw;
+        bool zip;
+        bool seven_zip;
+
+        Optional<std::string> maybe_nuget_id;
+        Optional<std::string> maybe_nuget_version;
+
+        IFW::Options ifw_options;
+        std::vector<PackageSpec> specs;
+    };
+
+    static ExportArguments handle_export_command_arguments(const VcpkgCmdArguments& args,
+                                                           const Triplet& default_triplet)
     {
+        ExportArguments ret;
+
         static const std::string OPTION_DRY_RUN = "--dry-run";
         static const std::string OPTION_RAW = "--raw";
         static const std::string OPTION_NUGET = "--nuget";
@@ -258,11 +277,9 @@ namespace vcpkg::Commands::Export
             Commands::Help::create_example_string("export zlib zlib:x64-windows boost --nuget");
         args.check_min_arg_count(1, EXAMPLE);
 
-        const std::vector<PackageSpec> specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
+        ret.specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
             return Input::check_and_get_package_spec(arg, default_triplet, EXAMPLE);
         });
-        for (auto&& spec : specs)
-            Input::check_triplet(spec.triplet(), paths);
 
         const auto options = args.check_and_get_optional_command_arguments(
             {
@@ -280,16 +297,16 @@ namespace vcpkg::Commands::Export
                 OPTION_IFW_PACKAGES_DIR_PATH,
                 OPTION_IFW_REPOSITORY_DIR_PATH,
                 OPTION_IFW_CONFIG_FILE_PATH,
-                OPTION_IFW_INSTALLER_FILE_PATH
+                OPTION_IFW_INSTALLER_FILE_PATH,
             });
-        const bool dry_run = options.switches.find(OPTION_DRY_RUN) != options.switches.cend();
-        const bool raw = options.switches.find(OPTION_RAW) != options.switches.cend();
-        const bool nuget = options.switches.find(OPTION_NUGET) != options.switches.cend();
-        const bool ifw = options.switches.find(OPTION_IFW) != options.switches.cend();
-        const bool zip = options.switches.find(OPTION_ZIP) != options.switches.cend();
-        const bool seven_zip = options.switches.find(OPTION_SEVEN_ZIP) != options.switches.cend();
-
-        if (!raw && !nuget && !ifw && !zip && !seven_zip && !dry_run)
+        ret.dry_run = options.switches.find(OPTION_DRY_RUN) != options.switches.cend();
+        ret.raw = options.switches.find(OPTION_RAW) != options.switches.cend();
+        ret.nuget = options.switches.find(OPTION_NUGET) != options.switches.cend();
+        ret.ifw = options.switches.find(OPTION_IFW) != options.switches.cend();
+        ret.zip = options.switches.find(OPTION_ZIP) != options.switches.cend();
+        ret.seven_zip = options.switches.find(OPTION_SEVEN_ZIP) != options.switches.cend();
+
+        if (!ret.raw && !ret.nuget && !ret.ifw && !ret.zip && !ret.seven_zip && !ret.dry_run)
         {
             System::println(System::Color::error,
                             "Must provide at least one export type: --raw --nuget --ifw --zip --7zip");
@@ -297,38 +314,152 @@ namespace vcpkg::Commands::Export
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
 
-        auto maybe_nuget_id = maybe_lookup(options.settings, OPTION_NUGET_ID);
-        auto maybe_nuget_version = maybe_lookup(options.settings, OPTION_NUGET_VERSION);
+        ret.maybe_nuget_id = maybe_lookup(options.settings, OPTION_NUGET_ID);
+        ret.maybe_nuget_version = maybe_lookup(options.settings, OPTION_NUGET_VERSION);
 
-        Checks::check_exit(VCPKG_LINE_INFO, !maybe_nuget_id || nuget, "--nuget-id is only valid with --nuget");
+        Checks::check_exit(VCPKG_LINE_INFO, !ret.maybe_nuget_id || ret.nuget, "--nuget-id is only valid with --nuget");
         Checks::check_exit(
-            VCPKG_LINE_INFO, !maybe_nuget_version || nuget, "--nuget-version is only valid with --nuget");
+            VCPKG_LINE_INFO, !ret.maybe_nuget_version || ret.nuget, "--nuget-version is only valid with --nuget");
 
-        IFW::Options ifw_options;
+        ret.ifw_options.maybe_repository_url = maybe_lookup(options.settings, OPTION_IFW_REPOSITORY_URL);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ret.ifw_options.maybe_repository_url || ret.ifw,
+                           "--ifw-repository-url is only valid with --ifw");
 
-        ifw_options.maybe_repository_url = maybe_lookup(options.settings, OPTION_IFW_REPOSITORY_URL);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !ifw_options.maybe_repository_url || ifw, "--ifw-repository-url is only valid with --ifw");
+        ret.ifw_options.maybe_packages_dir_path = maybe_lookup(options.settings, OPTION_IFW_PACKAGES_DIR_PATH);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ret.ifw_options.maybe_packages_dir_path || ret.ifw,
+                           "--ifw-packages-directory-path is only valid with --ifw");
 
-        ifw_options.maybe_packages_dir_path = maybe_lookup(options.settings, OPTION_IFW_PACKAGES_DIR_PATH);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !ifw_options.maybe_packages_dir_path || ifw, "--ifw-packages-directory-path is only valid with --ifw");
+        ret.ifw_options.maybe_repository_dir_path = maybe_lookup(options.settings, OPTION_IFW_REPOSITORY_DIR_PATH);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ret.ifw_options.maybe_repository_dir_path || ret.ifw,
+                           "--ifw-repository-directory-path is only valid with --ifw");
 
-        ifw_options.maybe_repository_dir_path = maybe_lookup(options.settings, OPTION_IFW_REPOSITORY_DIR_PATH);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !ifw_options.maybe_repository_dir_path || ifw, "--ifw-repository-directory-path is only valid with --ifw");
+        ret.ifw_options.maybe_config_file_path = maybe_lookup(options.settings, OPTION_IFW_CONFIG_FILE_PATH);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ret.ifw_options.maybe_config_file_path || ret.ifw,
+                           "--ifw-configuration-file-path is only valid with --ifw");
 
-        ifw_options.maybe_config_file_path = maybe_lookup(options.settings, OPTION_IFW_CONFIG_FILE_PATH);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !ifw_options.maybe_config_file_path || ifw, "--ifw-configuration-file-path is only valid with --ifw");
+        ret.ifw_options.maybe_installer_file_path = maybe_lookup(options.settings, OPTION_IFW_INSTALLER_FILE_PATH);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ret.ifw_options.maybe_installer_file_path || ret.ifw,
+                           "--ifw-installer-file-path is only valid with --ifw");
+        return ret;
+    }
 
-        ifw_options.maybe_installer_file_path = maybe_lookup(options.settings, OPTION_IFW_INSTALLER_FILE_PATH);
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !ifw_options.maybe_installer_file_path || ifw, "--ifw-installer-file-path is only valid with --ifw");
+    static void print_next_step_info(const fs::path& prefix)
+    {
+        const fs::path cmake_toolchain = prefix / "scripts" / "buildsystems" / "vcpkg.cmake";
+        const CMakeVariable cmake_variable = CMakeVariable(L"CMAKE_TOOLCHAIN_FILE", cmake_toolchain.generic_string());
+        System::println("\n"
+                        "To use the exported libraries in CMake projects use:"
+                        "\n"
+                        "    %s"
+                        "\n",
+                        Strings::to_utf8(cmake_variable.s));
+    };
+
+    static void handle_raw_based_export(Span<const ExportPlanAction> export_plan,
+                                        const ExportArguments& opts,
+                                        const std::string& export_id,
+                                        const VcpkgPaths& paths)
+    {
+        Files::Filesystem& fs = paths.get_filesystem();
+        const fs::path export_to_path = paths.root;
+        const fs::path raw_exported_dir_path = export_to_path / export_id;
+        std::error_code ec;
+        fs.remove_all(raw_exported_dir_path, ec);
+        fs.create_directory(raw_exported_dir_path, ec);
+
+        // execute the plan
+        for (const ExportPlanAction& action : export_plan)
+        {
+            if (action.plan_type != ExportPlanType::ALREADY_BUILT)
+            {
+                Checks::unreachable(VCPKG_LINE_INFO);
+            }
+
+            const std::string display_name = action.spec.to_string();
+            System::println("Exporting package %s... ", display_name);
+
+            const BinaryParagraph& binary_paragraph =
+                action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
+
+            const InstallDir dirs = InstallDir::from_destination_root(
+                raw_exported_dir_path / "installed",
+                action.spec.triplet().to_string(),
+                raw_exported_dir_path / "installed" / "vcpkg" / "info" / (binary_paragraph.fullstem() + ".list"));
+
+            Install::install_files_and_write_listfile(paths.get_filesystem(), paths.package_dir(action.spec), dirs);
+            System::println(System::Color::success, "Exporting package %s... done", display_name);
+        }
+
+        // Copy files needed for integration
+        export_integration_files(raw_exported_dir_path, paths);
+
+        if (opts.raw)
+        {
+            System::println(
+                System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string());
+            print_next_step_info(export_to_path);
+        }
+
+        if (opts.nuget)
+        {
+            System::println("Creating nuget package... ");
+
+            const std::string nuget_id = opts.maybe_nuget_id.value_or(raw_exported_dir_path.filename().string());
+            const std::string nuget_version = opts.maybe_nuget_version.value_or("1.0.0");
+            const fs::path output_path =
+                do_nuget_export(paths, nuget_id, nuget_version, raw_exported_dir_path, export_to_path);
+            System::println(System::Color::success, "Creating nuget package... done");
+            System::println(System::Color::success, "NuGet package exported at: %s", output_path.generic_string());
+
+            System::println(R"(
+With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste:
+    Install-Package %s -Source "%s"
+)"
+                            "\n",
+                            nuget_id,
+                            output_path.parent_path().u8string());
+        }
+
+        if (opts.zip)
+        {
+            System::println("Creating zip archive... ");
+            const fs::path output_path =
+                do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::ZIP);
+            System::println(System::Color::success, "Creating zip archive... done");
+            System::println(System::Color::success, "Zip archive exported at: %s", output_path.generic_string());
+            print_next_step_info("[...]");
+        }
+
+        if (opts.seven_zip)
+        {
+            System::println("Creating 7zip archive... ");
+            const fs::path output_path =
+                do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::SEVEN_ZIP);
+            System::println(System::Color::success, "Creating 7zip archive... done");
+            System::println(System::Color::success, "7zip archive exported at: %s", output_path.generic_string());
+            print_next_step_info("[...]");
+        }
+
+        if (!opts.raw)
+        {
+            fs.remove_all(raw_exported_dir_path, ec);
+        }
+    }
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    {
+        const auto opts = handle_export_command_arguments(args, default_triplet);
+        for (auto&& spec : opts.specs)
+            Input::check_triplet(spec.triplet(), paths);
 
         // create the plan
         const StatusParagraphs status_db = database_load_check(paths);
-        std::vector<ExportPlanAction> export_plan = Dependencies::create_export_plan(paths, specs, status_db);
+        std::vector<ExportPlanAction> export_plan = Dependencies::create_export_plan(paths, opts.specs, status_db);
         Checks::check_exit(VCPKG_LINE_INFO, !export_plan.empty(), "Export plan cannot be empty");
 
         std::map<ExportPlanType, std::vector<const ExportPlanAction*>> group_by_plan_type;
@@ -363,118 +494,21 @@ namespace vcpkg::Commands::Export
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
 
-        if (dry_run)
+        if (opts.dry_run)
         {
             Checks::exit_success(VCPKG_LINE_INFO);
         }
 
         std::string export_id = create_export_id();
 
-        const auto print_next_step_info = [](const fs::path& prefix) {
-            const fs::path cmake_toolchain = prefix / "scripts" / "buildsystems" / "vcpkg.cmake";
-            const CMakeVariable cmake_variable =
-                CMakeVariable(L"CMAKE_TOOLCHAIN_FILE", cmake_toolchain.generic_string());
-            System::println("\n"
-                "To use the exported libraries in CMake projects use:"
-                "\n"
-                "    %s"
-                "\n",
-                Strings::to_utf8(cmake_variable.s));
-        };
-
-        // Main loop
-        if (raw || nuget || zip || seven_zip)
+        if (opts.raw || opts.nuget || opts.zip || opts.seven_zip)
         {
-            Files::Filesystem& fs = paths.get_filesystem();
-            const fs::path export_to_path = paths.root;
-            const fs::path raw_exported_dir_path = export_to_path / export_id;
-            std::error_code ec;
-            fs.remove_all(raw_exported_dir_path, ec);
-            fs.create_directory(raw_exported_dir_path, ec);
-
-            // execute the plan
-            for (const ExportPlanAction& action : export_plan)
-            {
-                if (action.plan_type != ExportPlanType::ALREADY_BUILT)
-                {
-                    Checks::unreachable(VCPKG_LINE_INFO);
-                }
-
-                const std::string display_name = action.spec.to_string();
-                System::println("Exporting package %s... ", display_name);
-
-                const BinaryParagraph& binary_paragraph =
-                    action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
-
-                const InstallDir dirs = InstallDir::from_destination_root(
-                    raw_exported_dir_path / "installed",
-                    action.spec.triplet().to_string(),
-                    raw_exported_dir_path / "installed" / "vcpkg" / "info" / (binary_paragraph.fullstem() + ".list"));
-
-                Install::install_files_and_write_listfile(paths.get_filesystem(), paths.package_dir(action.spec), dirs);
-                System::println(System::Color::success, "Exporting package %s... done", display_name);
-            }
-
-            // Copy files needed for integration
-            export_integration_files(raw_exported_dir_path, paths);
-
-            if (raw)
-            {
-                System::println(
-                    System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string());
-                print_next_step_info(export_to_path);
-            }
-
-            if (nuget)
-            {
-                System::println("Creating nuget package... ");
-
-                const std::string nuget_id = maybe_nuget_id.value_or(raw_exported_dir_path.filename().string());
-                const std::string nuget_version = maybe_nuget_version.value_or("1.0.0");
-                const fs::path output_path =
-                    do_nuget_export(paths, nuget_id, nuget_version, raw_exported_dir_path, export_to_path);
-                System::println(System::Color::success, "Creating nuget package... done");
-                System::println(System::Color::success, "NuGet package exported at: %s", output_path.generic_string());
-
-                System::println(R"(
-With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste:
-    Install-Package %s -Source "%s"
-)"
-                    "\n",
-                    nuget_id,
-                    output_path.parent_path().u8string());
-            }
-
-            if (zip)
-            {
-                System::println("Creating zip archive... ");
-                const fs::path output_path =
-                    do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::ZIP);
-                System::println(System::Color::success, "Creating zip archive... done");
-                System::println(System::Color::success, "Zip archive exported at: %s", output_path.generic_string());
-                print_next_step_info("[...]");
-            }
-
-            if (seven_zip)
-            {
-                System::println("Creating 7zip archive... ");
-                const fs::path output_path =
-                    do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::SEVEN_ZIP);
-                System::println(System::Color::success, "Creating 7zip archive... done");
-                System::println(System::Color::success, "7zip archive exported at: %s", output_path.generic_string());
-                print_next_step_info("[...]");
-            }
-
-            if (!raw)
-            {
-                fs.remove_all(raw_exported_dir_path, ec);
-            }
+            handle_raw_based_export(export_plan, opts, export_id, paths);
         }
 
-        // IFW loop
-        if (ifw)
+        if (opts.ifw)
         {
-            IFW::do_export(export_plan, export_id, ifw_options, paths);
+            IFW::do_export(export_plan, export_id, opts.ifw_options, paths);
 
             print_next_step_info("@RootDir@/src/vcpkg");
         }
diff --git a/toolsrc/src/commands_export_ifw.cpp b/toolsrc/src/commands_export_ifw.cpp
index a0692c11e..0dc8a7d31 100644
--- a/toolsrc/src/commands_export_ifw.cpp
+++ b/toolsrc/src/commands_export_ifw.cpp
@@ -19,39 +19,39 @@ namespace vcpkg::Commands::Export::IFW
         char mbstr[11];
         const size_t bytes_written = std::strftime(mbstr, sizeof(mbstr), "%Y-%m-%d", &date_time);
         Checks::check_exit(VCPKG_LINE_INFO,
-            bytes_written == 10,
-            "Expected 10 bytes to be written, but %u were written",
-            bytes_written);
+                           bytes_written == 10,
+                           "Expected 10 bytes to be written, but %u were written",
+                           bytes_written);
         const std::string date_time_as_string(mbstr);
         return date_time_as_string;
     }
 
-    fs::path get_packages_dir_path(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    fs::path get_packages_dir_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
-        return ifw_options.maybe_packages_dir_path.has_value() ?
-            fs::path(ifw_options.maybe_packages_dir_path.value_or_exit(VCPKG_LINE_INFO))
-            : paths.root / (export_id + "-ifw-packages");
+        return ifw_options.maybe_packages_dir_path.has_value()
+                   ? fs::path(ifw_options.maybe_packages_dir_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-packages");
     }
 
-    fs::path get_repository_dir_path(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    fs::path get_repository_dir_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
-        return ifw_options.maybe_repository_dir_path.has_value() ?
-            fs::path(ifw_options.maybe_repository_dir_path.value_or_exit(VCPKG_LINE_INFO))
-            : paths.root / (export_id + "-ifw-repository");
+        return ifw_options.maybe_repository_dir_path.has_value()
+                   ? fs::path(ifw_options.maybe_repository_dir_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-repository");
     }
 
-    fs::path get_config_file_path(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    fs::path get_config_file_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
-        return ifw_options.maybe_config_file_path.has_value() ?
-            fs::path(ifw_options.maybe_config_file_path.value_or_exit(VCPKG_LINE_INFO))
-            : paths.root / (export_id + "-ifw-configuration.xml");
+        return ifw_options.maybe_config_file_path.has_value()
+                   ? fs::path(ifw_options.maybe_config_file_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-configuration.xml");
     }
 
-    fs::path get_installer_file_path(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    fs::path get_installer_file_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
-        return ifw_options.maybe_installer_file_path.has_value() ?
-            fs::path(ifw_options.maybe_installer_file_path.value_or_exit(VCPKG_LINE_INFO))
-            : paths.root / (export_id + "-ifw-installer.exe");
+        return ifw_options.maybe_installer_file_path.has_value()
+                   ? fs::path(ifw_options.maybe_installer_file_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-installer.exe");
     }
 
     fs::path export_real_package(const fs::path& ifw_packages_dir_path,
@@ -82,7 +82,7 @@ namespace vcpkg::Commands::Export::IFW
 
         fs.write_contents(package_xml_file_path,
                           Strings::format(
-R"###(<?xml version="1.0"?>
+                              R"###(<?xml version="1.0"?>
 <Package>
     <DisplayName>%s</DisplayName>
     <Version>%s</Version>
@@ -91,12 +91,12 @@ R"###(<?xml version="1.0"?>
     <Virtual>true</Virtual>
 </Package>
 )###",
-                                          action.spec.to_string(),
-                                          binary_paragraph.version,
-                                          create_release_date(),
-                                          action.spec.name(),
-                                          action.spec.triplet().canonical_name(),
-                                          deps));
+                              action.spec.to_string(),
+                              binary_paragraph.version,
+                              create_release_date(),
+                              action.spec.name(),
+                              action.spec.triplet().canonical_name(),
+                              deps));
 
         // Return dir path for export package data
         return ifw_packages_dir_path /
@@ -119,15 +119,16 @@ R"###(<?xml version="1.0"?>
                            !ec,
                            "Could not create directory for package file %s",
                            package_xml_file_path.generic_string());
-        fs.write_contents(package_xml_file_path, Strings::format(
-R"###(<?xml version="1.0"?>
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
 <Package>
     <DisplayName>Packages</DisplayName>
     <Version>1.0.0</Version>
     <ReleaseDate>%s</ReleaseDate>
 </Package>
 )###",
-            create_release_date()));
+                              create_release_date()));
 
         for (auto package = unique_packages.begin(); package != unique_packages.end(); ++package)
         {
@@ -146,7 +147,7 @@ R"###(<?xml version="1.0"?>
 
             fs.write_contents(package_xml_file_path,
                               Strings::format(
-R"###(<?xml version="1.0"?>
+                                  R"###(<?xml version="1.0"?>
 <Package>
     <DisplayName>%s</DisplayName>
     <Description>%s</Description>
@@ -154,10 +155,10 @@ R"###(<?xml version="1.0"?>
     <ReleaseDate>%s</ReleaseDate>
 </Package>
 )###",
-                                              action.spec.name(),
-                                              binary_paragraph.description,
-                                              binary_paragraph.version,
-                                              create_release_date()));
+                                  action.spec.name(),
+                                  binary_paragraph.description,
+                                  binary_paragraph.version,
+                                  create_release_date()));
         }
     }
 
@@ -176,15 +177,16 @@ R"###(<?xml version="1.0"?>
                            !ec,
                            "Could not create directory for package file %s",
                            package_xml_file_path.generic_string());
-        fs.write_contents(package_xml_file_path, Strings::format(
-R"###(<?xml version="1.0"?>
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
 <Package>
     <DisplayName>Triplets</DisplayName>
     <Version>1.0.0</Version>
     <ReleaseDate>%s</ReleaseDate>
 </Package>
 )###",
-            create_release_date()));
+                              create_release_date()));
 
         for (const std::string& triplet : unique_triplets)
         {
@@ -196,16 +198,17 @@ R"###(<?xml version="1.0"?>
                                !ec,
                                "Could not create directory for package file %s",
                                package_xml_file_path.generic_string());
-            fs.write_contents(package_xml_file_path, Strings::format(
-R"###(<?xml version="1.0"?>
+            fs.write_contents(package_xml_file_path,
+                              Strings::format(
+                                  R"###(<?xml version="1.0"?>
 <Package>
     <DisplayName>%s</DisplayName>
     <Version>1.0.0</Version>
     <ReleaseDate>%s</ReleaseDate>
 </Package>
 )###",
-                triplet,
-                create_release_date()));
+                                  triplet,
+                                  create_release_date()));
         }
     }
 
@@ -222,18 +225,19 @@ R"###(<?xml version="1.0"?>
                            "Could not create directory for package file %s",
                            package_xml_file_path.generic_string());
 
-        fs.write_contents(package_xml_file_path, Strings::format(
-R"###(<?xml version="1.0"?>
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
 <Package>
     <DisplayName>Integration</DisplayName>
     <Version>1.0.0</Version>
     <ReleaseDate>%s</ReleaseDate>
 </Package>
 )###",
-            create_release_date()));
+                              create_release_date()));
     }
 
-    void export_config(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    void export_config(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
         std::error_code ec;
         Files::Filesystem& fs = paths.get_filesystem();
@@ -257,21 +261,22 @@ R"###(<?xml version="1.0"?>
             <Url>%s</Url>
         </Repository>
     </RemoteRepositories>)###",
-                ifw_repo_url);
+                                                 ifw_repo_url);
         }
 
-        fs.write_contents(config_xml_file_path, Strings::format(
-R"###(<?xml version="1.0"?>
+        fs.write_contents(config_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
 <Installer>
     <Name>vcpkg</Name>
     <Version>1.0.0</Version>
     <TargetDir>@RootDir@/src/vcpkg</TargetDir>%s
 </Installer>
 )###",
-            formatted_repo_url));
+                              formatted_repo_url));
     }
 
-    void do_repository(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    void do_repository(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
         const fs::path& repogen_exe = paths.get_ifw_repogen_exe();
         const fs::path packages_dir = get_packages_dir_path(export_id, ifw_options, paths);
@@ -283,16 +288,13 @@ R"###(<?xml version="1.0"?>
         Files::Filesystem& fs = paths.get_filesystem();
 
         fs.remove_all(repository_dir, ec);
-        Checks::check_exit(VCPKG_LINE_INFO,
-            !ec,
-            "Could not remove outdated repository directory %s",
-            repository_dir.generic_string());
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !ec, "Could not remove outdated repository directory %s", repository_dir.generic_string());
 
-        const std::wstring cmd_line =
-            Strings::wformat(LR"("%s" --packages "%s" "%s" > nul)",
-                repogen_exe.native(),
-                packages_dir.native(),
-                repository_dir.native());
+        const std::wstring cmd_line = Strings::wformat(LR"("%s" --packages "%s" "%s" > nul)",
+                                                       repogen_exe.native(),
+                                                       packages_dir.native(),
+                                                       repository_dir.native());
 
         const int exit_code = System::cmd_execute_clean(cmd_line);
         Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Error: IFW repository generating failed");
@@ -300,7 +302,7 @@ R"###(<?xml version="1.0"?>
         System::println(System::Color::success, "Generating repository %s... done.", repository_dir.generic_string());
     }
 
-    void do_installer(const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    void do_installer(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
     {
         const fs::path& binarycreator_exe = paths.get_ifw_binarycreator_exe();
         const fs::path config_file = get_config_file_path(export_id, ifw_options, paths);
@@ -315,21 +317,19 @@ R"###(<?xml version="1.0"?>
         std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or("");
         if (!ifw_repo_url.empty())
         {
-            cmd_line =
-                Strings::wformat(LR"("%s" --online-only --config "%s" --repository "%s" "%s" > nul)",
-                    binarycreator_exe.native(),
-                    config_file.native(),
-                    repository_dir.native(),
-                    installer_file.native());
+            cmd_line = Strings::wformat(LR"("%s" --online-only --config "%s" --repository "%s" "%s" > nul)",
+                                        binarycreator_exe.native(),
+                                        config_file.native(),
+                                        repository_dir.native(),
+                                        installer_file.native());
         }
         else
         {
-            cmd_line =
-                Strings::wformat(LR"("%s" --config "%s" --packages "%s" "%s" > nul)",
-                    binarycreator_exe.native(),
-                    config_file.native(),
-                    packages_dir.native(),
-                    installer_file.native());
+            cmd_line = Strings::wformat(LR"("%s" --config "%s" --packages "%s" "%s" > nul)",
+                                        binarycreator_exe.native(),
+                                        config_file.native(),
+                                        packages_dir.native(),
+                                        installer_file.native());
         }
 
         const int exit_code = System::cmd_execute_clean(cmd_line);
@@ -338,7 +338,10 @@ R"###(<?xml version="1.0"?>
         System::println(System::Color::success, "Generating installer %s... done.", installer_file.generic_string());
     }
 
-    void do_export(const std::vector<ExportPlanAction> &export_plan, const std::string &export_id, const Options &ifw_options, const VcpkgPaths& paths)
+    void do_export(const std::vector<ExportPlanAction>& export_plan,
+                   const std::string& export_id,
+                   const Options& ifw_options,
+                   const VcpkgPaths& paths)
     {
         const fs::path ifw_packages_dir_path = get_packages_dir_path(export_id, ifw_options, paths);
         const fs::path config_file = get_config_file_path(export_id, ifw_options, paths);
@@ -350,15 +353,13 @@ R"###(<?xml version="1.0"?>
 
         fs.remove_all(ifw_packages_dir_path, ec);
         Checks::check_exit(VCPKG_LINE_INFO,
-            !ec,
-            "Could not remove outdated packages directory %s",
-            ifw_packages_dir_path.generic_string());
+                           !ec,
+                           "Could not remove outdated packages directory %s",
+                           ifw_packages_dir_path.generic_string());
 
         fs.create_directory(ifw_packages_dir_path, ec);
-        Checks::check_exit(VCPKG_LINE_INFO,
-            !ec,
-            "Could not create packages directory %s",
-            ifw_packages_dir_path.generic_string());
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !ec, "Could not create packages directory %s", ifw_packages_dir_path.generic_string());
 
         // execute the plan
         std::map<std::string, const ExportPlanAction*> unique_packages;
@@ -384,9 +385,9 @@ R"###(<?xml version="1.0"?>
 
             // Copy package data
             const InstallDir dirs = InstallDir::from_destination_root(ifw_package_dir_path,
-                action.spec.triplet().to_string(),
-                ifw_package_dir_path / "vcpkg" / "info" /
-                (binary_paragraph.fullstem() + ".list"));
+                                                                      action.spec.triplet().to_string(),
+                                                                      ifw_package_dir_path / "vcpkg" / "info" /
+                                                                          (binary_paragraph.fullstem() + ".list"));
 
             Install::install_files_and_write_listfile(paths.get_filesystem(), paths.package_dir(action.spec), dirs);
             System::println("Exporting package %s... done", display_name);