Remove debugs, add enable / disable, refactor

Author: pajawojciech

plugins/logcleaner/logcleaner.cpp

@@ -1,4 +1,3 @@
-#include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
 #include "PluginLua.h"
@@ -32,33 +31,26 @@ static bool clear_combat = false;
 static bool clear_sparring = true;
 static bool clear_hunting = false;
 
-namespace DFHack {
-    DBG_DECLARE(logcleaner, control, DebugCategory::LINFO);
-    DBG_DECLARE(logcleaner, cleanup, DebugCategory::LINFO);
-}
-
 static void cleanupLogs(color_ostream& out);
 static command_result do_command(color_ostream& out, std::vector<std::string>& params);
-static void do_enable();
-static void do_disable();
 
 // Getter functions for Lua
 static bool logcleaner_getCombat() { return clear_combat; }
 static bool logcleaner_getSparring() { return clear_sparring; }
 static bool logcleaner_getHunting() { return clear_hunting; }
 
 // Setter functions for Lua (also persist to config)
-static void logcleaner_setCombat(color_ostream& out, bool val) {
+static void logcleaner_setCombat(bool val) {
     clear_combat = val;
     config.set_bool(CONFIG_CLEAR_COMBAT, clear_combat);
 }
 
-static void logcleaner_setSparring(color_ostream& out, bool val) {
+static void logcleaner_setSparring(bool val) {
     clear_sparring = val;
     config.set_bool(CONFIG_CLEAR_SPARING, clear_sparring);
 }
 
-static void logcleaner_setHunting(color_ostream& out, bool val) {
+static void logcleaner_setHunting(bool val) {
     clear_hunting = val;
     config.set_bool(CONFIG_CLEAR_HUNTING, clear_hunting);
 }
@@ -89,12 +81,6 @@ static command_result do_command(color_ostream& out, std::vector<std::string>& p
     return show_help ? CR_WRONG_USAGE : CR_OK;
 }
 
-static void do_enable() {
-}
-
-static void do_disable() {
-}
-
 DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
     if (!Core::getInstance().isMapLoaded() || !World::isFortressMode()) {
         out.printerr("Cannot enable {} without a loaded fort.\n", plugin_name);
@@ -103,31 +89,19 @@ DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
 
     if (enable != is_enabled) {
         is_enabled = enable;
-        DEBUG(control, out).print("{} from the API; persisting\n",
-                                  is_enabled ? "enabled" : "disabled");
         config.set_bool(CONFIG_IS_ENABLED, is_enabled);
-        if (enable)
-            do_enable();
-        else
-            do_disable();
-    } else {
-        DEBUG(control, out).print("{} from the API, but already {}; no action\n",
-                                  is_enabled ? "enabled" : "disabled",
-                                  is_enabled ? "enabled" : "disabled");
     }
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_shutdown(color_ostream& out) {
-    DEBUG(control, out).print("shutting down {}\n", plugin_name);
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_load_site_data(color_ostream& out) {
     config = World::GetPersistentSiteData(CONFIG_KEY);
 
     if (!config.isValid()) {
-        DEBUG(control, out).print("no config found in this save; initializing\n");
         config = World::AddPersistentSiteData(CONFIG_KEY);
         config.set_bool(CONFIG_IS_ENABLED, is_enabled);
         config.set_bool(CONFIG_CLEAR_COMBAT, clear_combat);
@@ -140,19 +114,12 @@ DFhackCExport command_result plugin_load_site_data(color_ostream& out) {
     clear_sparring = config.get_bool(CONFIG_CLEAR_SPARING);
     clear_hunting = config.get_bool(CONFIG_CLEAR_HUNTING);
 
-    DEBUG(control, out).print("loading persisted enabled state: {}\n",
-                              is_enabled ? "true" : "false");
-    if (is_enabled)
-        do_enable();
-
     return CR_OK;
 }
 
 DFhackCExport command_result plugin_onstatechange(color_ostream& out, state_change_event event) {
     if (event == DFHack::SC_WORLD_UNLOADED && is_enabled) {
-        DEBUG(control, out).print("world unloaded; disabling {}\n", plugin_name);
         is_enabled = false;
-        do_disable();
     }
     return CR_OK;
 }
@@ -163,31 +130,17 @@ static void cleanupLogs(color_ostream& out) {
 
     // Collect all report IDs from unit combat/sparring/hunting logs
     std::unordered_set<int32_t> report_ids_to_remove;
+    bool log_types[] = {clear_combat, clear_sparring, clear_hunting};
 
     for (auto unit : world->units.all) {
-        // Combat logs (index 0)
-        if (clear_combat) {
-            auto& log = unit->reports.log[0];
-            for (auto report_id : log) {
-                report_ids_to_remove.insert(report_id);
-            }
-            log.clear();
-        }
-        // Sparring logs (index 1)
-        if (clear_sparring) {
-            auto& log = unit->reports.log[1];
-            for (auto report_id : log) {
-                report_ids_to_remove.insert(report_id);
+        for (int log_idx = 0; log_idx < 3; log_idx++) {
+            if (log_types[log_idx]) {
+                auto& log = unit->reports.log[log_idx];
+                for (auto report_id : log) {
+                    report_ids_to_remove.insert(report_id);
+                }
+                log.clear();
             }
-            log.clear();
-        }
-        // Hunting logs (index 2)
-        if (clear_hunting) {
-            auto& log = unit->reports.log[2];
-            for (auto report_id : log) {
-                report_ids_to_remove.insert(report_id);
-            }
-            log.clear();
         }
     }
 
@@ -197,8 +150,6 @@ static void cleanupLogs(color_ostream& out) {
     // Remove collected reports from global buffers
     auto& reports = world->status.reports;
 
-    int reports_erased = 0;
-
     for (auto report_id : report_ids_to_remove) {
         df::report* report = df::report::find(report_id);
         if (!report)
@@ -208,7 +159,6 @@ static void cleanupLogs(color_ostream& out) {
         if (it != reports.end()) {
             delete report;
             reports.erase(it);
-            reports_erased++;
         }
     }
 }

plugins/lua/logcleaner.lua

@@ -17,32 +17,51 @@ function parse_commandline(...)
         return true
     end
 
+    -- Handle enable/disable commands
+    if command == 'enable' then
+        if isEnabled() then
+            print('logcleaner is already enabled')
+        else
+            dfhack.run_command('enable', 'logcleaner')
+            print('logcleaner enabled')
+        end
+        return true
+    end
+
+    if command == 'disable' then
+        if not isEnabled() then
+            print('logcleaner is already disabled')
+        else
+            dfhack.run_command('disable', 'logcleaner')
+            print('logcleaner disabled')
+        end
+        return true
+    end
+
     -- Start with all disabled, enable only what's specified
     local new_combat, new_sparring, new_hunting = false, false, false
     local has_filter = false
 
-    for _, param in ipairs(args) do
-        if param == 'all' then
-            new_combat, new_sparring, new_hunting = true, true, true
-            has_filter = true
-        elseif param == 'none' then
-            new_combat, new_sparring, new_hunting = false, false, false
-        else
-            -- Split by comma for multiple options in one parameter
-            for token in param:gmatch('([^,]+)') do
-                if token == 'combat' then
-                    new_combat = true
-                    has_filter = true
-                elseif token == 'sparring' then
-                    new_sparring = true
-                    has_filter = true
-                elseif token == 'hunting' then
-                    new_hunting = true
-                    has_filter = true
-                else
-                    dfhack.printerr('Unknown option: ' .. token)
-                    return false
-                end
+    if command == 'all' then
+        new_combat, new_sparring, new_hunting = true, true, true
+        has_filter = true
+    elseif command == 'none' then
+        new_combat, new_sparring, new_hunting = false, false, false
+    else
+        -- Split by comma for multiple options in one parameter
+        for token in command:gmatch('([^,]+)') do
+            if token == 'combat' then
+                new_combat = true
+                has_filter = true
+            elseif token == 'sparring' then
+                new_sparring = true
+                has_filter = true
+            elseif token == 'hunting' then
+                new_hunting = true
+                has_filter = true
+            else
+                dfhack.printerr('Unknown option: ' .. token)
+                return false
             end
         end
     end