diff --git a/CMakeLists.txt b/CMakeLists.txt index ae92603..b0cd922 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) +target_link_libraries(clippy_terminal PRIVATE cppshell tmuxub rang jsoncons yaml-cpp) install(TARGETS clippy_terminal DESTINATION bin) @@ -20,9 +20,31 @@ 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 GIT_TAG origin/master ) 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 +) +FetchContent_MakeAvailable(jsoncons) + +FetchContent_Declare( + yaml-cpp + GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git + GIT_TAG origin/master +) +FetchContent_MakeAvailable(yaml-cpp) diff --git a/src/clippy/clippy.cpp b/src/clippy/clippy.cpp index 1b9d064..b1c8b94 100644 --- a/src/clippy/clippy.cpp +++ b/src/clippy/clippy.cpp @@ -25,15 +25,13 @@ void Clippy::Run(const std::vector& args) { for (size_t i = 1; i < args.size(); ++i) { std::cout << args[i] << (i + 1 == args.size() ? "" : ",") << " "; } - std::cout << "}" << std::endl << rang::bg::reset << rang::style::reset; + std::cout << "}" << rang::bg::reset << rang::style::reset << std::endl; } -Clippy::TargetPtr Clippy::TryExecuteClippyCommand( - const std::vector& args) { +Clippy::TargetPtr Clippy::TryExecuteClippyCommand(const std::vector& args) { using namespace utils::parametres; using namespace clippy::targets; - if (CheckPatternParametres(args, Parameter::Skip, "help", - Parameter::Anything)) { + if (CheckPatternParametres(args, Parameter::Skip, "help", Parameter::Anything)) { std::cout << "Hello I'm clippy" << std::endl; std::cout << "Parametres: { "; for (size_t i = 0; i < args.size(); ++i) { @@ -41,11 +39,12 @@ Clippy::TargetPtr Clippy::TryExecuteClippyCommand( } 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(); } - if (CheckPatternParametres(args, Parameter::Skip, "cfg", - Parameter::Anything)) { + if (CheckPatternParametres(args, Parameter::Skip, "cfg", Parameter::Anything)) { LoadProjects(); auto p = projects_->GetCurrentProject(); @@ -56,17 +55,44 @@ Clippy::TargetPtr Clippy::TryExecuteClippyCommand( } } - if (CheckPatternParametres(args, Parameter::Skip, "crt", - Parameter::Anything)) { + if (CheckPatternParametres(args, Parameter::Skip, "crt", Parameter::Anything)) { LoadProjects(); return std::make_unique(projects_.value()); } + if (CheckPatternParametres(args, Parameter::Skip, "prj", Parameter::Anything)) { + // TODO description current project or project by name + return nullptr; + } + + if (CheckPatternParametres(args, Parameter::Skip, "list", Parameter::Nothing)) { + LoadProjects(); + + return std::make_unique(projects_.value()); + } + + if (CheckPatternParametres(args, Parameter::Skip, "setname", Parameter::Anything)) { + LoadProjects(); + + 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; } -Clippy::TargetPtr Clippy::GetScriptTarget( - const std::vector& args) { +Clippy::TargetPtr Clippy::GetScriptTarget(const std::vector& args) { LoadProjects(); auto p = projects_->GetCurrentProject(); diff --git a/src/clippy/config.cpp b/src/clippy/config.cpp index 1940174..e7499e8 100644 --- a/src/clippy/config.cpp +++ b/src/clippy/config.cpp @@ -25,11 +25,13 @@ std::unique_ptr Config::GetTarget( std::vector target_commands; target_commands.emplace_back("cd " + initial_directory_); - bool target_begin = false; + bool target_exists = false; + bool in_target = false; while (std::getline(in, current)) { if (current == target + ":") { - target_begin = true; + target_exists = true; + in_target = true; continue; } @@ -37,18 +39,18 @@ std::unique_ptr Config::GetTarget( continue; } - if (!std::isspace(current[0]) && target_begin) { - target_begin = false; + if (!std::isspace(current[0])) { + in_target = false; } - if (target_begin) { + if (in_target) { target_commands.emplace_back(Strip(std::move(current))); } else if (current[0] == '!') { target_commands.emplace_back(current.substr(1, current.size() - 1)); } } - if (!target_begin) { + if (!target_exists) { return nullptr; } diff --git a/src/clippy/project_list.cpp b/src/clippy/project_list.cpp index e2ad9f3..cf4aa2e 100644 --- a/src/clippy/project_list.cpp +++ b/src/clippy/project_list.cpp @@ -1,75 +1,45 @@ #include #include +#include +#include #include +#include #include #include #include #include -Config ProjectList::GetNewConfig( - const std::filesystem::path& config_directory) { +#include + +#include +#include +#include "yaml-cpp/node/parse.h" + +#include + +Config ProjectList::GetNewConfig(const std::filesystem::path& config_directory) { std::lock_guard guard(lock_file_); - LoadWithouLock(); + LoadWithoutLock(); - std::mt19937 rnd(std::chrono::system_clock::now().time_since_epoch().count()); - - 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; - - std::ofstream out(path_, std::ios::app); - out << std::filesystem::current_path() << " " << path_to_config << std::endl; - out.close(); + auto path_to_config = utils::filesystem::GenerateFile(config_directory); projects_.emplace_back(std::filesystem::current_path(), path_to_config); + SaveConfig(); + return {path_to_config, std::filesystem::current_path()}; } void ProjectList::Load() { std::lock_guard guard(lock_file_); - LoadWithouLock(); + LoadWithoutLock(); } -void ProjectList::LoadWithouLock() { - std::ifstream in(path_); +void ProjectList::OldLoadConfig(const std::string& data) { + std::stringstream in(data); Project current; @@ -78,15 +48,147 @@ void ProjectList::LoadWithouLock() { } } -std::optional ProjectList::GetCurrentProject() { +template +void UpdateField(jsoncons::json& data, const std::string& field, std::optional member) { + if (member) { + data[field] = static_cast(member.value()); + } +} + +template +void UpdateField(YAML::Node& data, const std::string& field, std::optional member) { + if (member) { + data[field] = static_cast(member.value()); + } +} + +void ProjectList::SaveConfig(tag_json) { + jsoncons::json result; + + result["version"] = "0.1"; + result["projects"] = std::vector(); + + for (auto& project : projects_) { + jsoncons::json current; + current["path_to_config"] = std::string(project.configuration_file); + current["path_root_project"] = std::string(project.root_project); + + UpdateField(current, "name", project.name); + UpdateField(current, "open_script", project.open_script); + + result["projects"].emplace_back(current); + } + + std::ofstream out(path_); + out << result.to_string(); +} + +void ProjectList::SaveConfig() { + YAML::Node result; + result["version"] = "0.2"; + + for (auto& project : projects_) { + YAML::Node current; + + UpdateField(current, "name", project.name); + current["path_root_project"] = std::string(project.root_project); + current["path_to_config"] = std::string(project.configuration_file); + UpdateField(current, "open_script", project.open_script); + + result["projects"].push_back(current); + } + + std::ofstream out(path_); + out << result; +} + +template +std::optional GetOptionalField(const jsoncons::json& data, std::string field) { + return data.contains(field) ? std::make_optional(data[field].as()) : std::nullopt; +} + +template +std::optional GetOptionalField(const YAML::Node& data, std::string field) { + return data[field].IsDefined() ? std::make_optional(data[field].as()) : std::nullopt; +} + +void ProjectList::LoadConfig(const YAML::Node& data) { + if (data["version"].as() != "0.2") { + throw std::logic_error("unsupport version"); + } + + Project current; + for (const auto& project : data["projects"]) { + current.configuration_file = project["path_to_config"].as(); + current.root_project = project["path_root_project"].as(); + + current.name = GetOptionalField(project, "name"); + current.open_script = GetOptionalField(project, "open_script"); + + projects_.emplace_back(current); + } +} + +void ProjectList::LoadConfig(const jsoncons::json& data) { + if (data["version"] != "0.1") { + throw std::logic_error("unsupported version config"); + } + + Project current; + for (auto& project : data["projects"].array_range()) { + current.configuration_file = project["path_to_config"].as(); + current.root_project = project["path_root_project"].as(); + + current.name = GetOptionalField(project, "name"); + current.open_script = GetOptionalField(project, "open_script"); + + projects_.emplace_back(current); + } +} + +void ProjectList::LoadWithoutLock() { + projects_.clear(); + + try { + LoadConfig(YAML::LoadFile(path_)); + } catch (...) { + auto data = utils::filesystem::LoadFile(path_); + + std::cout << "I can't parse yaml. Try read json?" << std::endl; + + std::string result; + std::getline(std::cin, result); + + if (result == "y") { + try { + LoadConfig(jsoncons::json::parse(data)); + } catch (...) { + std::cout << "I can't read project lists. Try fix it?" << std::endl; + + std::string result; + std::getline(std::cin, result); + + if (result == "y") { + OldLoadConfig(data); + SaveConfig(); + } + } + SaveConfig(); + } + } +} + +Project* ProjectList::GetCurrentProject_() { auto current_path = std::filesystem::current_path(); - std::optional result; - auto UpdateResult = [&result](Project p) { - if (!result.has_value()) { - result = p; + Project* result = nullptr; + auto UpdateResult = [&result](Project& p) { + if (!result) { + result = &p; } else { - result = std::max(p, result.value()); + if (*result < p) { + result = &p; + } } }; @@ -108,3 +210,16 @@ std::optional 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 5cefefe..fe1ba71 100644 --- a/src/clippy/project_list.hpp +++ b/src/clippy/project_list.hpp @@ -1,12 +1,20 @@ #pragma once #include +#include +#include #include #include #include #include +#include +#include +#include "utils/config_path.hpp" +#include "utils/editor.hpp" +#include "utils/filesystem.hpp" + struct Project { Project() {} @@ -15,10 +23,14 @@ struct Project { std::strong_ordering operator<=>(const Project&) const = default; - Config GetConfig() { return Config{configuration_file, root_project}; } + Config GetConfig() { + return Config{configuration_file, root_project}; + } std::filesystem::path root_project; std::filesystem::path configuration_file; + std::optional name; + std::optional open_script; }; class ProjectList { @@ -29,13 +41,72 @@ class ProjectList { Config GetNewConfig(const std::filesystem::path& config_directory); - const std::vector& GetProjects() const { return projects_; } + const std::vector& GetProjects() const { + return projects_; + } - std::optional GetCurrentProject(); + std::optional GetCurrentProject() { + auto* p = GetCurrentProject_(); + if (p) { + return *p; + } else { + return std::nullopt; + } + } + + void SetNameCurrentProject(const std::string& name) { + auto* p = GetCurrentProject_(); + if (p) { + p->name = name; + SaveConfig(); + } else { + throw std::logic_error("Not exists current project"); + } + } + + 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&); + + struct tag_json {}; + void SaveConfig(tag_json); + + void SaveConfig(); + void Load(); - void LoadWithouLock(); + void LoadConfig(const jsoncons::json&); + void LoadConfig(const YAML::Node&); + void LoadWithoutLock(); private: std::filesystem::path path_; diff --git a/src/clippy/target.hpp b/src/clippy/target.hpp index 48fab11..d2f9b7e 100644 --- a/src/clippy/target.hpp +++ b/src/clippy/target.hpp @@ -11,8 +11,12 @@ #include #include +#include #include #include +#include "utils/filesystem.hpp" + +#include namespace clippy::targets { class Target { @@ -31,7 +35,9 @@ class OpenProjectConfig : public Target { public: OpenProjectConfig(Config config) : config_(config) {} - void Execute() override { config_.Edit(); } + void Execute() override { + config_.Edit(); + } ~OpenProjectConfig() override {} private: @@ -58,7 +64,8 @@ class CreateProjectConfig : public Target { class RunShellScript : public Target { public: template