cufetchpm: move state.toml to the config directory

plugins: only load plugins that have a supported OS library extension

Author: Toni500github

cufetchpm/include/manifest.hpp

@@ -77,8 +77,8 @@ class CManifest
     { return m_repo.plugins; }
 
 private:
-    toml::table  m_tbl;
-    manifest_t   m_repo;
+    toml::table m_tbl;
+    manifest_t  m_repo;
 
     void parse_manifest();
 

cufetchpm/include/pluginManager.hpp

@@ -42,9 +42,9 @@ class PluginManager
     bool has_deps();
 
 private:
-    StateManager          m_state;
-    fs::path m_config_path{ getConfigDir() / "plugins" };
-    fs::path m_cache_path{ getHomeCacheDir() / "cufetchpm" / "plugins" };
+    StateManager m_state;
+    fs::path     m_config_path{ getConfigDir() / "plugins" };
+    fs::path     m_cache_path{ getHomeCacheDir() / "cufetchpm" / "plugins" };
 };
 
 #endif

cufetchpm/include/stateManager.hpp

@@ -22,8 +22,8 @@ class StateManager
     toml::table get_state() { return m_state; }
 
 private:
-    const fs::path m_path{ getHomeCacheDir() / "cufetchpm" / "state.toml" };
-    toml::table                 m_state;
+    const fs::path m_path{ getConfigDir() / "plugins" / "state.toml" };
+    toml::table    m_state;
 };
 
 #endif

cufetchpm/src/main.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
+
 #include "libcufetch/common.hh"
-#include "libs/switch_fnv1a.hpp"
 #include "pluginManager.hpp"
 #include "stateManager.hpp"
 
@@ -12,17 +12,18 @@
 
 #include "getopt_port/getopt.h"
 
-enum {
+static int op = 0;
+enum
+{
     INSTALL,
     REMOVE,
     LIST
 };
 
-static struct operations_t
+static struct operations_install_t
 {
-    int name;
     std::vector<std::string> args;
-} op;
+} install_op;
 
 static void version()
 {
@@ -44,7 +45,7 @@ Manage plugins for customfetch.
 NOTE: the operations must be the first argument to pass
 
 OPERATIONS:
-    install - Install a new plugin repository. Takes as an argument the git url to be cloned.
+    install  - Install a new plugin repository. Takes as an argument the git url to be cloned.
 
 GENERAL OPTIONS
     -h, --help          Print this help menu.
@@ -76,19 +77,19 @@ static bool parseargs(int argc, char* argv[])
     {
         if (strncmp(argv[i], "install", 7) == 0 || strncmp(argv[i], "i", 1) == 0)
         {
-            op.name = INSTALL;
+            op = INSTALL;
             optind++;
             break;
         }
-        if (strncmp(argv[i], "list", 4) == 0|| strncmp(argv[i], "l", 1) == 0)
+        if (strncmp(argv[i], "list", 4) == 0 || strncmp(argv[i], "l", 1) == 0)
         {
-            op.name = LIST;
+            op = LIST;
             optind++;
             break;
         }
         if (strncmp(argv[i], "remove", 6) == 0 || strncmp(argv[i], "r", 1) == 0)
         {
-            op.name = REMOVE;
+            op = REMOVE;
             optind++;
             break;
         }
@@ -107,8 +108,12 @@ static bool parseargs(int argc, char* argv[])
         }
     }
 
-    for (int i = optind; i < argc; ++i)
-        op.args.push_back(argv[i]);
+    switch (op)
+    {
+        case INSTALL:
+            for (int i = optind; i < argc; ++i)
+                install_op.args.push_back(argv[i]);
+    }
 
     return true;
 }
@@ -119,18 +124,18 @@ int main(int argc, char* argv[])
         return -1;
 
     fs::create_directories({ getHomeCacheDir() / "cufetchpm" / "plugins" });
-    StateManager  state;
-    PluginManager plugin_manager(std::move(state));
-    switch (op.name)
+    switch (op)
     {
-        case INSTALL: 
-            {
-                if (op.args.size() != 1)
-                    die("Please provide a singular git url repository");
-                plugin_manager.add_repo_plugins(op.args[0]); break;
-            }
-        default:
-            warn("Not yet implemented");
+        case INSTALL:
+        {
+            if (install_op.args.size() != 1)
+                die("Please provide a singular git url repository");
+            StateManager  state;
+            PluginManager plugin_manager(std::move(state));
+            plugin_manager.add_repo_plugins(install_op.args[0]);
+            break;
+        }
+        default: warn("Not yet implemented");
     }
 
     return 0;

cufetchpm/src/stateManager.cpp

@@ -35,7 +35,7 @@ static toml::table& ensure_table(toml::table& parent, std::string_view key)
     return *it->second.as_table();
 }
 
-static toml::array vector_to_array(const std::vector<std::string> vec)
+static toml::array vector_to_array(const std::vector<std::string>& vec)
 {
     toml::array ret;
     for (const std::string& str : vec)
@@ -48,7 +48,7 @@ StateManager::StateManager()
     if (!fs::exists(m_path))
     {
         auto f = fmt::output_file(m_path.string(), fmt::file::WRONLY | fmt::file::TRUNC | fmt::file::CREATE);
-        f.print(R"(# AUTOGENERATED FILE. DO NOT EDIT THIS FILE.
+        f.print(R"(# AUTO-GENERATED FILE. DO NOT EDIT THIS FILE.
 # YOU GONNA MESS SHIT UP. unless you know what you doing ofc
                 )");
         f.close();
@@ -77,19 +77,22 @@ void StateManager::add_new_repo(const CManifest& manifest)
     toml::array plugins_arr;
     for (const plugin_t& plugin : manifest.get_all_plugins())
     {
-        toml::table entry{ { "name", plugin.name },
+        // will be inserted in alphabetical order
+        toml::table entry{ { "name",        plugin.name },
                            { "description", plugin.description },
-                           { "authors", vector_to_array(plugin.authors) },
-                           { "licenses", vector_to_array(plugin.licenses) },
-                           { "output-dir", plugin.output_dir },
-                           { "conflicts", vector_to_array(plugin.conflicts) },
-                           { "prefixes", vector_to_array(plugin.prefixes) } };
+                           { "output-dir",  plugin.output_dir },
+                           { "authors",     vector_to_array(plugin.authors) },
+                           { "licenses",    vector_to_array(plugin.licenses) },
+                           { "conflicts",   vector_to_array(plugin.conflicts) },
+                           { "prefixes",    vector_to_array(plugin.prefixes) } };
 
         plugins_arr.push_back(std::move(entry));
     }
 
     repo.insert_or_assign("plugins", std::move(plugins_arr));
     std::stringstream ss;
+    ss << R"(# AUTO-GENERATED FILE. DO NOT EDIT THIS FILE.
+             # YOU GONNA MESS SHIT UP. unless you know what you doing ofc")";
     ss << m_state;
 
     if (!writeState(ss.str(), m_path))

include/util.hpp

@@ -78,6 +78,14 @@ struct byte_units_t
 
 #define UNLOAD_LIBRARY(handle) dlclose(handle);
 
+#if CF_WINDOWS
+    constexpr char LIBRARY_EXTENSION[] = ".dll";
+#elif CF_MACOS
+    constexpr char LIBRARY_EXTENSION[] = ".dylib";
+#else
+    constexpr char LIBRARY_EXTENSION[] = ".so";
+#endif
+
 inline bool is_live_mode = false;
 
 /* https://stackoverflow.com/questions/874134/find-out-if-string-ends-with-another-string-in-c#874160

src/main.cpp

@@ -638,6 +638,9 @@ int main(int argc, char* argv[])
     std::filesystem::create_directories(pluginDir);
     for (const auto& entry : std::filesystem::recursive_directory_iterator{ pluginDir })
     {
+        if (entry.is_regular_file() && entry.path().has_extension() && entry.path().extension() == LIBRARY_EXTENSION){}
+        else {continue;}
+
         debug("loading plugin at {}!", entry.path().string());
 
         void* handle = LOAD_LIBRARY(std::filesystem::absolute(entry.path()).c_str());