add case sensitivity support for searching

Author: Tiaansu

include/omp-logger.hpp

@@ -69,7 +69,7 @@ struct IOmpLog
 
     virtual uint32_t getColor() const = 0;
 
-    virtual PaginatedResult fetchLogs(int linesPerPage, int pageStart, const std::string& searchTerm) const = 0;
+    virtual PaginatedResult fetchLogs(int linesPerPage, int pageStart, const std::string& searchTerm, bool caseSensitive) const = 0;
 
     virtual bool log(AMX* amx, OmpLogger::ELogLevel level, StringView message) const = 0;
 

omp-logger.inc

@@ -33,6 +33,15 @@ native bool:Logger_Error(Logger:id, const format[], OPEN_MP_TAGS:...);
 native bool:Logger_Fatal(Logger:id, const format[], OPEN_MP_TAGS:...);
 
 // Logs result
-native Logger_FetchLogs(playerid, Logger:logger, amount, pageStart, const callback[], const search[] = "");
+native Logger_FetchLogs(playerid, Logger:logger, amount, pageStart, const callback[], const search[] = "", bool:caseSensitive = true);
 native Logger_GetResult(LogsResult:result, row, logs[], size = sizeof logs);
-native Logger_FreeResult(LogsResult:result);
+native Logger_FreeResult(LogsResult:result);
+
+// Cleanup results once they go out of scope
+stock operator~(const LogsResult:result[], len)
+{
+    for (new i = 0; i < len; ++ i)
+    {
+        Logger_FreeResult(result[i]);
+    }
+}

src/natives.cpp

@@ -61,16 +61,16 @@ SCRIPT_API(Logger_Fatal, bool(IOmpLog& logger, cell const* format))
     return logger.log(amx, OmpLogger::ELogLevel::Fatal, AmxStringFormatter(format, amx, GetParams(), 2));
 }
 
-SCRIPT_API(Logger_FetchLogs, bool(IPlayer& player, IOmpLog& logger, int linesPerPage, int pageStart, std::string const& callback, std::string const& searchTerm))
+SCRIPT_API(Logger_FetchLogs, bool(IPlayer& player, IOmpLog& logger, int linesPerPage, int pageStart, std::string const& callback, std::string const& searchTerm, bool caseSensitive))
 {
     AMX* amx = GetAMX();
 
-    auto func = [&player, &logger, amx, callback, searchTerm, linesPerPage, pageStart]() {
+    auto func = [&player, &logger, amx, callback, searchTerm, linesPerPage, pageStart, caseSensitive]() {
 
         int funcIDX = 0;
         if (!amx_FindPublic(amx, callback.c_str(), &funcIDX))
         {
-            PaginatedResult result = logger.fetchLogs(linesPerPage, pageStart, searchTerm);
+            PaginatedResult result = logger.fetchLogs(linesPerPage, pageStart, searchTerm, caseSensitive);
             ILogsResult* logsResult = OmpLoggerComponent::Get()->initLogsResult(result.lines);
             amx_Push(amx, result.totalPages);
             amx_Push(amx, result.currentPage);

src/omp-log.cpp

@@ -34,6 +34,15 @@ std::FILE* OmpLog::getFile() const
     return file_;
 }
 
+bool caseInsensitiveCompare(const std::string& str1, const std::string& str2)
+{
+    std::string lowerStr1 = str1;
+    std::string lowerStr2 = str2;
+    std::transform(lowerStr1.begin(), lowerStr1.end(), lowerStr1.begin(), ::tolower);
+    std::transform(lowerStr2.begin(), lowerStr2.end(), lowerStr2.begin(), ::tolower);
+    return lowerStr1.find(lowerStr2) != std::string::npos;
+}
+
 long long countTotalLines(std::FILE* file)
 {
     if (file == nullptr)
@@ -55,7 +64,7 @@ long long countTotalLines(std::FILE* file)
     return lineCount;
 }
 
-long long countMatchingLines(std::FILE* file, const std::string& searchTerm)
+long long countMatchingLines(std::FILE* file, const std::string& searchTerm, bool caseSensitive)
 {
     if (file == nullptr)
     {
@@ -69,17 +78,27 @@ long long countMatchingLines(std::FILE* file, const std::string& searchTerm)
     while (std::fgets(buffer, sizeof(buffer), file) != nullptr)
     {
         std::string line(buffer);
-        if (line.find(searchTerm) != std::string::npos)
+        if (caseSensitive)
+        {
+            if (line.find(searchTerm) != std::string::npos)
+            {
+                lineCount ++;
+            }
+        }
+        else
         {
-            lineCount ++;
+            if (caseInsensitiveCompare(line, searchTerm))
+            {
+                lineCount ++;
+            }
         }
     }
 
     std::fseek(file, 0, SEEK_SET);
     return lineCount;
 }
 
-PaginatedResult OmpLog::fetchLogs(int linesPerPage, int pageStart, const std::string& searchTerm) const
+PaginatedResult OmpLog::fetchLogs(int linesPerPage, int pageStart, const std::string& searchTerm, bool caseSensitive) const
 {
     PaginatedResult result;
 
@@ -90,7 +109,7 @@ PaginatedResult OmpLog::fetchLogs(int linesPerPage, int pageStart, const std::st
 
     if (!searchTerm.empty())
     {
-        result.totalPages = (countMatchingLines(file_, searchTerm) + linesPerPage - 1) / linesPerPage;
+        result.totalPages = (countMatchingLines(file_, searchTerm, caseSensitive) + linesPerPage - 1) / linesPerPage;
     }
     else
     {
@@ -114,9 +133,20 @@ PaginatedResult OmpLog::fetchLogs(int linesPerPage, int pageStart, const std::st
         while (currentLine < startLine && ::fgets(buffer, sizeof(buffer), file_) != nullptr)
         {
             std::string line(buffer);
-            if (line.find(searchTerm) != std::string::npos)
+
+            if (caseSensitive)
+            {
+                if (line.find(searchTerm) != std::string::npos)
+                {
+                    currentLine ++;
+                }
+            }
+            else
             {
-                currentLine ++;
+                if (caseInsensitiveCompare(line, searchTerm))
+                {
+                    currentLine ++;
+                }
             }
         }
     }
@@ -140,7 +170,8 @@ PaginatedResult OmpLog::fetchLogs(int linesPerPage, int pageStart, const std::st
             return !std::isspace(ch);
         }).base(), line.end());
 
-        if (searchTerm.empty() || line.find(searchTerm) != std::string::npos)
+        bool caseSensitiveResult = caseSensitive ? line.find(searchTerm) != std::string::npos : caseInsensitiveCompare(line, searchTerm);
+        if (searchTerm.empty() || caseSensitiveResult)
         {
             result.lines.push_back(line);
             linesRead ++;

src/omp-log.hpp

@@ -38,7 +38,7 @@ class OmpLog final
 
     bool log(OmpLogger::ELogLevel level, StringView message) const override;
 
-    PaginatedResult fetchLogs(int linesPerPage, int pageStart, const std::string& searchTerm) const override;
+    PaginatedResult fetchLogs(int linesPerPage, int pageStart, const std::string& searchTerm, bool caseSensitive) const override;
 
     OmpLog(StringView name, uint32_t color, OmpLogger::ELogLevel level, std::FILE* file);