hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-01-10 22:49:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

hyprpm: add an option to force reload all plugins (#8883)

Browse source
This commit is contained in:
Tuur Vanhoutte 2024-12-30 00:09:17 +01:00 committed by GitHub
parent deb077c346
commit 5b37d53992
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hyprpm/hyprpm.usage
View file

@ -14,7 +14,7 @@ hyprpm [<FLAGS>]... <ARGUMENT>
| (list) "List all installed plugins" | (list) "List all installed plugins"
| (enable <PLUGINS>) "Load a plugin" | (enable <PLUGINS>) "Load a plugin"
| (disable <PLUGINS>) "Unload a plugin" | (disable <PLUGINS>) "Unload a plugin"
| (reload) "Reload all plugins" | (reload) "Reload plugins to match the enabled/disabled state. Use -f to force reload."
; ;
<PLUGINS> ::= {{{ hyprpm list | awk '/Plugin/{print $4}' }}}; <PLUGINS> ::= {{{ hyprpm list | awk '/Plugin/{print $4}' }}};

8
hyprpm/src/core/PluginManager.cpp
View file

@ -780,7 +780,7 @@ bool CPluginManager::disablePlugin(const std::string& name) {
return ret; return ret;
} }
ePluginLoadStateReturn CPluginManager::ensurePluginsLoadState() { ePluginLoadStateReturn CPluginManager::ensurePluginsLoadState(bool forceReload) {
if (headersValid() != HEADERS_OK) { if (headersValid() != HEADERS_OK) {
std::println(stderr, "\n{}", failureString("headers are not up-to-date, please run hyprpm update.")); std::println(stderr, "\n{}", failureString("headers are not up-to-date, please run hyprpm update."));
return LOADSTATE_HEADERS_OUTDATED; return LOADSTATE_HEADERS_OUTDATED;
@ -841,9 +841,9 @@ ePluginLoadStateReturn CPluginManager::ensurePluginsLoadState() {
// (and Hyprland needs to restart) // (and Hyprland needs to restart)
bool hyprlandVersionMismatch = false; bool hyprlandVersionMismatch = false;
// unload disabled plugins // unload disabled plugins (or all if forceReload is true)
for (auto const& p : loadedPlugins) { for (auto const& p : loadedPlugins) {
if (!enabled(p)) { if (forceReload || !enabled(p)) {
// unload // unload
if (!loadUnloadPlugin(HYPRPMPATH / repoForName(p) / (p + ".so"), false)) { if (!loadUnloadPlugin(HYPRPMPATH / repoForName(p) / (p + ".so"), false)) {
std::println("{}", infoString("{} will be unloaded after restarting Hyprland", p)); std::println("{}", infoString("{} will be unloaded after restarting Hyprland", p));
@ -859,7 +859,7 @@ ePluginLoadStateReturn CPluginManager::ensurePluginsLoadState() {
if (!p.enabled) if (!p.enabled)
continue; continue;
if (std::find_if(loadedPlugins.begin(), loadedPlugins.end(), [&](const auto& other) { return other == p.name; }) != loadedPlugins.end()) if (!forceReload && std::find_if(loadedPlugins.begin(), loadedPlugins.end(), [&](const auto& other) { return other == p.name; }) != loadedPlugins.end())
continue; continue;
if (!loadUnloadPlugin(HYPRPMPATH / repoForName(p.name) / p.filename, true)) { if (!loadUnloadPlugin(HYPRPMPATH / repoForName(p.name) / p.filename, true)) {

2
hyprpm/src/core/PluginManager.hpp
View file

@ -51,7 +51,7 @@ class CPluginManager {
bool enablePlugin(const std::string& name); bool enablePlugin(const std::string& name);
bool disablePlugin(const std::string& name); bool disablePlugin(const std::string& name);
ePluginLoadStateReturn ensurePluginsLoadState(); ePluginLoadStateReturn ensurePluginsLoadState(bool forceReload = false);
bool loadUnloadPlugin(const std::string& path, bool load); bool loadUnloadPlugin(const std::string& path, bool load);
SHyprlandVersion getHyprlandVersion(bool running = true); SHyprlandVersion getHyprlandVersion(bool running = true);

2
hyprpm/src/main.cpp
View file

@ -154,7 +154,7 @@ int main(int argc, char** argv, char** envp) {
if (ret != LOADSTATE_OK) if (ret != LOADSTATE_OK)
return 1; return 1;
} else if (command[0] == "reload") { } else if (command[0] == "reload") {
auto ret = g_pPluginManager->ensurePluginsLoadState(); auto ret = g_pPluginManager->ensurePluginsLoadState(force);
if (ret != LOADSTATE_OK && notify) { if (ret != LOADSTATE_OK && notify) {
switch (ret) { switch (ret) {