feat: edit/view configurations

CHANGELOG.md

@@ -15,6 +15,10 @@ along with Onur. If not, see <https://www.gnu.org/licenses/>.
 
 # CHANGELOG
 
+## 0.3.0
+
+- feat: edit/view configurations
+
 ## 0.2.0
 
 - feat: refactor, more tests and improve cli ui

README.md

@@ -22,12 +22,24 @@ Easily manage multiple FLOSS repositories.
 | [ruby](https://gitlab.com/easbarba/onur-ruby)
 
 
-
 ## Usage
 
 ```shell
-onur grab
-onur backup nuxt awesomewm gitignore
+# grab all projects
+onur grab 
+
+# back up these projects as tar.gz
+onur backup nuxt awesomewm gitignore 
+
+# list the c configuration file
+onur config c 
+
+# list only the projects on misc topic of c
+onur config c.misc 
+
+# add a new configuration with theses entries in the topic misc of c
+onur config c.misc cli11 https://github.com/cliutils/cli11 main 
+
 onur --help
 ```
 
@@ -90,7 +102,7 @@ depth = 1
 
 ## Installation
 
-`onur` requires a c++ 20 compiler and `meson` to install, locally at `$HOME/.local/bin`, easily with : `make all install`. 
+`onur` requires a c++ 23 compiler and `meson` to install, locally at `$HOME/.local/bin`, easily with : `make all install`. 
 
 ## Development
 

TODO.md

@@ -17,12 +17,15 @@ along with Onur. If not, see <https://www.gnu.org/licenses/>.
 
 ### High
 
-- verbose
+- flag: --verbose
 - validation of repository links 
-- actions: --filter rust
+- actions: --filter rust:misc
 - actions: --only rust,haskel,commonlisp
 - actions: --exclude rust,haskel,commonlisp
 
+### Mid
+- actions:  onur config c.misc foo https://git@gmasd main
+
 ### Low
 
 - config: move on these to a syntax check class

meson.build

@@ -16,7 +16,7 @@ project(
     'cpp',
     license: 'GNU GPL version 3',
     version: '0.2.0',
-    default_options: [ 'cpp_std=c++20', 'warning_level=3' ],
+    default_options: [ 'cpp_std=c++23', 'warning_level=3' ],
     meson_version: '>=1.4.0',
 )
 

src/database/parse.cpp

@@ -17,11 +17,12 @@
 #include <filesystem>
 #include <fstream>
 #include <list>
-#include <string>
-
 #include <nlohmann/json.hpp>
+#include <print>
+#include <string>
 
 #include "../include/konfig.hpp"
+#include "../include/misc.hpp"
 #include "../include/parse.hpp"
 #include "../include/project.hpp"
 
@@ -52,29 +53,29 @@ auto
 Parse::single (path filepath) -> Konfig
 {
   Konfig result;
-  map<string, list<Project> > subtopiks;
+  map<string, list<Project>> _topics;
 
   auto configParsed = parse_file (contents_of (filepath));
-  result.topic = { filepath.stem () };
+  result.name = { filepath.stem () };
 
-  for (auto &[subtopic, subtopics] : configParsed.items ())
+  for (auto &[topic, topics] : configParsed.items ())
     {
       list<Project> projects;
-      for (auto projekt : subtopics)
+      for (auto project : topics)
         {
           string branch{ "master" };
-          if (!projekt["branch"].is_null ())
-            branch = projekt["branch"];
+          if (!project["branch"].is_null ())
+            branch = project["branch"];
 
-          auto pkt{ Project (projekt["name"], projekt["url"], branch) };
+          auto pkt{ Project (project["name"], project["url"], branch) };
 
           projects.push_back (pkt);
         }
 
-      subtopiks[subtopic] = { projects };
+      _topics[topic] = { projects };
     }
 
-  result.subtopics = { subtopiks };
+  result.topics = { _topics };
   return result;
 }
 
@@ -90,3 +91,48 @@ Parse::contents_of (string path_to_file) -> string
   ifstream file (path_to_file);
   return { istreambuf_iterator<char> (file), istreambuf_iterator<char>{} };
 }
+
+auto
+Parse::exist (std::string name) -> bool
+{
+  for (auto config : multi ())
+    if (config.name == name)
+      return true;
+
+  // std::for_each (multi ().begin (), multi ().end (),
+  //                [name, &result] (Konfig config) {
+  //                  std::println ("MEH");
+  //                  result = { config.name == name };
+  //                  std::println ("FOOL");
+  //                });
+
+  return false;
+}
+
+// Overload the to_json function for automatic conversion
+void
+to_json (nlohmann::json &j, const Konfig &k)
+{
+  j = k.to_json ();
+}
+
+auto
+Parse::save (std::string name, std::string topic,
+             ConfigEntries entries) -> void
+{
+  // if (entries.name || entries.url.has_value () || !entries.branch.empty ())
+  //   {
+  //     std::println ("Either name or url of project are missing. Exiting!");
+  //     return;
+  //   }
+
+  Project project{ entries };
+
+  std::map<std::string, std::list<Project>> topics;
+  topics[topic] = { entries };
+
+  Konfig konfig{ name, topics };
+  nlohmann::json j = konfig;
+
+  std::println ("Saving config with name {} as \n{}", konfig.name, j.dump ());
+}

src/database/repository.cpp

@@ -32,8 +32,6 @@ Repository::allConfigs (void) -> list<path>
   list<path> result;
   Globals globals;
 
-  printf (" Configurations: [");
-
   for (auto config : directory_iterator (globals.onurDir))
     {
       if (config.path ().extension () != ".json")
@@ -46,10 +44,8 @@ Repository::allConfigs (void) -> list<path>
       if (file.peek () == std::ifstream::traits_type::eof ())
         continue;
 
-      printf (" %s ", config.path ().stem ().c_str ());
       result.push_back (config);
     }
 
-  printf (" ]\n");
   return result;
 }

src/handlers/actions.cpp

@@ -30,7 +30,7 @@ auto
 Actions::klone (Project project, path dirpath) -> void
 {
   auto finalCommand{ format (
-      "git clone --single-branch --depth=1 --quiet {} {}", project.url,
+      "git clone --single-branch --depth=1 --quiet {} {}", project.Url (),
       dirpath.string ()) };
   system (finalCommand.c_str ());
 }

src/handlers/commands.cpp

@@ -14,15 +14,14 @@
  */
 
 #include <filesystem>
-#include <iostream>
-#include <ostream>
+#include <format>
+#include <print>
+#include <string>
 
 #include "../include/commands.hpp"
 #include "../include/globals.hpp"
-#include "helpers.hpp"
+#include "../include/helpers.hpp"
 
-using std::cout;
-using std::endl;
 using std::filesystem::exists;
 using std::filesystem::path;
 
@@ -31,34 +30,120 @@ Commands::Commands () {}
 auto
 Commands::grab (void) -> void
 {
-  for (auto single : parse.multi ())
+  for (auto singleConfig : parse.multi ())
     {
-      cout << "\n " << single.topic << ":" << endl;
+      std::println ("{}: ", singleConfig.name);
 
-      for (auto subtopic : single.subtopics)
+      for (auto topic : singleConfig.topics)
         {
-          cout << "  + " << subtopic.first << endl;
-          for (auto project : subtopic.second)
+          std::println ("  + {}", topic.first);
+          for (auto project : topic.second)
             {
-              auto placeholder{ path (globals.projectsDir / single.topic
-                                      / subtopic.first / project.name) };
-              auto dirpath{ placeholder };
+              auto finalpath{ path (globals.projectsDir / singleConfig.name
+                                    / topic.first / project.Name ()) };
 
               printProjectInfo (project);
 
-              if (exists (dirpath / ".git" / "config"))
-                actions.pull (dirpath);
+              if (exists (finalpath / ".git" / "config"))
+                actions.pull (finalpath);
               else
-                actions.klone (project, dirpath);
+                actions.klone (project, finalpath);
             }
 
-          cout << endl;
+          std::println ();
         }
     }
 }
 
 auto
 Commands::backup (void) -> void
 {
-  cout << "Backing up" << endl;
+  std::println ("Backing up");
+}
+
+auto
+Commands::config (std::string name, ConfigEntries entries) -> void
+{
+  std::string _name{ name };
+  std::optional<std::string> _topic;
+
+  if (name.contains ("."))
+    {
+      std::size_t dot_positon{ name.find (".") };
+      _name = { name.substr (0, dot_positon) };
+      _topic = { name.substr (dot_positon + 1) };
+    }
+
+  if (!parse.exist (_name))
+    {
+      std::println ("No configuration by {} found!", _name);
+      return;
+    }
+
+  if (name.ends_with ("."))
+    {
+      printSingleConfig (_name, _topic, true);
+      return;
+    }
+
+  if (!_topic.has_value ())
+    {
+      printSingleConfig (_name, _topic);
+      return;
+    }
+  else
+    {
+      printSingleConfig (_name, _topic, true);
+      return;
+    }
+
+  // std::println (
+  //     "Please provide a topic and entries to save a new one. Exiting!",
+  //     _name);
+
+  if (!entries.name.has_value () || !entries.url.has_value ())
+    {
+      std::println ("Enter name and url entries at least. Exiting!");
+      return;
+    }
+
+  parse.save (_name, _topic.value (), entries);
+}
+
+auto
+foo () -> void
+{
+  std::print ("Configurations: [");
+  // printf (" %s ", config.path ().stem ().c_str ());
+  std::println (" ]\n");
+}
+
+void
+Commands::printSingleConfig (std::string name,
+                             std::optional<std::string> &_topic,
+                             bool onlytopics)
+{
+  for (auto singleConfig : parse.multi ())
+    {
+      if (name != singleConfig.name)
+        continue;
+
+      std::println ("{}:", singleConfig.name);
+      for (auto topic : singleConfig.topics)
+        {
+          if (onlytopics)
+            {
+              std::print ("  {} ", topic.first);
+              continue;
+            }
+
+          if (_topic.has_value () && _topic.value () != topic.first)
+            continue;
+
+          std::println (" + {}", topic.first);
+
+          for (auto project : topic.second)
+            printProjectInfo (project);
+        }
+    }
 }

src/handlers/helpers.cpp

@@ -14,27 +14,25 @@
  */
 
 #include <format>
-#include <iostream>
+#include <print>
 
 #include "../include/helpers.hpp"
 
-using std::format;
-
 using namespace std;
 
 auto
 printProjectInfo (Project project) -> void
 {
   std::string::size_type nameLength = 27;
   auto nameTruncated
-      = project.name.length () <= nameLength
-            ? project.name
-            : project.name.substr (0, nameLength).append ("...");
+      = project.Name ().length () <= nameLength
+            ? project.Name ()
+            : project.Name ().substr (0, nameLength).append ("...");
   std::string::size_type urlLength = 60;
-  auto urlTruncated = project.url.length () <= urlLength
-                          ? project.url
-                          : project.url.substr (0, urlLength).append ("...");
-  auto message{ format ("{:5}- {:35} {:75} {}", "", nameTruncated,
-                        urlTruncated, project.branch) };
-  cout << message << endl;
+  auto urlTruncated
+      = project.Url ().length () <= urlLength
+            ? project.Url ()
+            : project.Url ().substr (0, urlLength).append ("...");
+  std::println ("{:3}- {:35} {:75} {}", "", nameTruncated, urlTruncated,
+                project.Branch ());
 }