From 75eb05bd1ae241f270781d6b801133dd9244ad65 Mon Sep 17 00:00:00 2001 From: Timofey Khoruzhii Date: Mon, 9 Jan 2023 11:42:28 +0300 Subject: [PATCH] upd --- CMakeLists.txt | 11 ++++- src/clippy/clippy.cpp | 28 +++++++------ src/clippy/project_list.cpp | 83 ++++++++++++++++--------------------- src/clippy/project_list.hpp | 34 +++++++++++++++ src/clippy/target.hpp | 62 +++++++++++++++++++++++---- src/utils/filesystem.hpp | 49 +++++++++++++++++++++- src/utils/random.hpp | 12 ++++++ 7 files changed, 206 insertions(+), 73 deletions(-) create mode 100644 src/utils/random.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 25f0169..60e2ec1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ file(GLOB_RECURSE SOURCES_FILES src/*) add_executable(clippy_terminal ${SOURCES_FILES}) target_include_directories(clippy_terminal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -target_link_libraries(clippy_terminal cppshell rang jsoncons) +target_link_libraries(clippy_terminal cppshell tmuxub rang jsoncons) install(TARGETS clippy_terminal DESTINATION bin) @@ -20,6 +20,13 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(cppshell) +FetchContent_Declare( + tmuxub + GIT_REPOSITORY https://gitlab.com/Onyad/tmuxub + GIT_TAG origin/main +) +FetchContent_MakeAvailable(tmuxub) + FetchContent_Declare( rang GIT_REPOSITORY https://github.com/agauniyal/rang.git @@ -27,10 +34,10 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(rang) +set(JSONCONS_BUILD_TESTS OFF CACHE INTERNAL "Turn off tests") FetchContent_Declare( jsoncons GIT_REPOSITORY https://github.com/danielaparker/jsoncons GIT_TAG origin/master ) -set(JSONCONS_BUILD_TESTS OFF) FetchContent_MakeAvailable(jsoncons) diff --git a/src/clippy/clippy.cpp b/src/clippy/clippy.cpp index d67f08b..b1c8b94 100644 --- a/src/clippy/clippy.cpp +++ b/src/clippy/clippy.cpp @@ -39,6 +39,8 @@ Clippy::TargetPtr Clippy::TryExecuteClippyCommand(const std::vector } std::cout << "}" << std::endl; + std::cout << "You can use:\n cfg\n crt\n prj\n list\n setname\n loadcfg\n op" << std::endl; + return std::make_unique(); } @@ -59,18 +61,8 @@ Clippy::TargetPtr Clippy::TryExecuteClippyCommand(const std::vector } if (CheckPatternParametres(args, Parameter::Skip, "prj", Parameter::Anything)) { - if (args.size() != 3) { - return nullptr; - } - std::string name_project = args[2]; - - LoadProjects(); - - for (auto& project : projects_->GetProjects()) { - if (project.name == name_project) { - std::cout << "Find: " << project.root_project << " " << project.configuration_file << std::endl; - } - } + // TODO description current project or project by name + return nullptr; } if (CheckPatternParametres(args, Parameter::Skip, "list", Parameter::Nothing)) { @@ -85,6 +77,18 @@ Clippy::TargetPtr Clippy::TryExecuteClippyCommand(const std::vector return std::make_unique(projects_.value(), args[2]); } + if (CheckPatternParametres(args, Parameter::Skip, "loadcfg", Parameter::Nothing)) { + LoadProjects(); + + return std::make_unique(projects_.value()); + } + + if (CheckPatternParametres(args, Parameter::Skip, "op", Parameter::Anything)) { + LoadProjects(); + + return std::make_unique(projects_.value(), args[2]); + } + return nullptr; } diff --git a/src/clippy/project_list.cpp b/src/clippy/project_list.cpp index f8f6c3a..31f628c 100644 --- a/src/clippy/project_list.cpp +++ b/src/clippy/project_list.cpp @@ -10,6 +10,8 @@ #include #include +#include + #include #include @@ -18,45 +20,8 @@ Config ProjectList::GetNewConfig(const std::filesystem::path& config_directory) LoadWithoutLock(); - std::mt19937 rnd(std::chrono::system_clock::now().time_since_epoch().count()); + auto path_to_config = utils::filesystem::GenerateFile(config_directory); - auto RandomSymbol = [&rnd]() { - int n = rnd() % (26 + 26 + 10); - if (n < 26) { - return 'a' + n; - } else if (n < 26 + 26) { - return 'A' + n - 26; - } else { - return '0' + n - 26 - 26; - } - }; - - auto GenerateFilename = [&rnd, &RandomSymbol]() { - std::string filename; - for (size_t i = 0; i < 6; ++i) { - filename += RandomSymbol(); - } - - return filename; - }; - - auto filename = GenerateFilename(); - while (true) { - bool exist_config = false; - for (auto& project : projects_) { - if (filename == project.configuration_file.filename()) { - exist_config = true; - break; - } - } - if (!exist_config) { - break; - } - - filename = GenerateFilename(); - } - - auto path_to_config = config_directory / filename; projects_.emplace_back(std::filesystem::current_path(), path_to_config); SaveConfig(); @@ -80,6 +45,13 @@ void ProjectList::OldLoadConfig(const std::string& data) { } } +template +void UpdateField(jsoncons::json& data, const std::string& field, std::optional member) { + if (member) { + data[field] = static_cast(member.value()); + } +} + void ProjectList::SaveConfig() { jsoncons::json result; @@ -91,10 +63,8 @@ void ProjectList::SaveConfig() { current["path_to_config"] = std::string(project.configuration_file); current["path_root_project"] = std::string(project.root_project); - std::cout << (bool)project.name << std::endl; - if (project.name && !project.name.value().empty()) { - current["name"] = project.name.value(); - } + UpdateField(current, "name", project.name); + UpdateField(current, "open_script", project.open_script); result["projects"].emplace_back(current); } @@ -103,6 +73,11 @@ void ProjectList::SaveConfig() { out << result.to_string(); } +template +std::optional GetOptionalField(const jsoncons::json& data, std::string field) { + return data.contains(field) ? std::make_optional(data[field].as()) : std::nullopt; +} + void ProjectList::LoadConfig(const jsoncons::json& data) { if (data["version"] != "0.1") { throw std::logic_error("unsupported version config"); @@ -112,18 +87,17 @@ void ProjectList::LoadConfig(const jsoncons::json& data) { for (auto& project : data["projects"].array_range()) { current.configuration_file = project["path_to_config"].as(); current.root_project = project["path_root_project"].as(); - if (project.contains("name")) { - current.name = project["name"].as(); - } else { - current.name = std::nullopt; - } + + current.name = GetOptionalField(project, "name"); + current.open_script = GetOptionalField(project, "open_script"); projects_.emplace_back(current); } } void ProjectList::LoadWithoutLock() { - auto data = utils::LoadFile(path_); + projects_.clear(); + auto data = utils::filesystem::LoadFile(path_); try { LoadConfig(jsoncons::json::parse(data)); @@ -172,3 +146,16 @@ Project* ProjectList::GetCurrentProject_() { return result; } + +Project* ProjectList::GetProjectByName_(const std::string& name) { + Project* result = nullptr; + for (auto& project : projects_) { + if (!project.name) { + continue; + } + if (project.name == name) { + result = &project; + } + } + return result; +} diff --git a/src/clippy/project_list.hpp b/src/clippy/project_list.hpp index bf6094f..b65d4db 100644 --- a/src/clippy/project_list.hpp +++ b/src/clippy/project_list.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include @@ -9,6 +10,9 @@ #include #include +#include "utils/config_path.hpp" +#include "utils/editor.hpp" +#include "utils/filesystem.hpp" struct Project { Project() {} @@ -25,6 +29,7 @@ struct Project { std::filesystem::path root_project; std::filesystem::path configuration_file; std::optional name; + std::optional open_script; }; class ProjectList { @@ -58,8 +63,37 @@ class ProjectList { } } + std::filesystem::path GetCurrentLoadConfig() { + auto* p = GetCurrentProject_(); + if (p) { + if (p->open_script) { + return p->open_script.value(); + } else { + auto scripts_path = utils::GetProjectDirectory() / "scripts"; + { + std::lock_guard lock(lock_file_); + p->open_script = utils::filesystem::GenerateFile(scripts_path); + SaveConfig(); + } + return p->open_script.value(); + } + } else { + throw std::logic_error("Not exists current project"); + } + } + + std::optional GetProjectByName(const std::string& name) { + auto* p = GetProjectByName_(name); + if (p) { + return *p; + } else { + return std::nullopt; + } + } + private: Project* GetCurrentProject_(); + Project* GetProjectByName_(const std::string&); void OldLoadConfig(const std::string&); void SaveConfig(); diff --git a/src/clippy/target.hpp b/src/clippy/target.hpp index a8a46fa..d2f9b7e 100644 --- a/src/clippy/target.hpp +++ b/src/clippy/target.hpp @@ -14,6 +14,9 @@ #include #include #include +#include "utils/filesystem.hpp" + +#include namespace clippy::targets { class Target { @@ -61,7 +64,8 @@ class CreateProjectConfig : public Target { class RunShellScript : public Target { public: template