Phase 6 COMPLETE: Refactoring & CMake

- Migrated build system to CMakeLists.txt.
- Added Thread Safety (std::mutex) to GuiController.
- Fixed potential Division-By-Zero in Pipeline progress logic.
- Replaced magic parsing numbers with constexpr constants.
- Added Unit Tests for edge cases (empty line, corrupt format).
- Removed legacy Makefile.

Author: parvenuprompting

.github/workflows/ci.yml

@@ -2,30 +2,27 @@ name: C++ CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: install dependencies
-      run: |
-        brew install glfw
-        brew install grep
+      - name: install dependencies
+        run: |
+          brew install glfw
+          brew install cmake
 
-    - name: Build CLI
-      run: make log_analyzer
+      - name: Configure CMake
+        run: cmake -B build -S .
 
-    - name: Build Tests
-      run: make build-tests
+      - name: Build
+        run: cmake --build build --config Release
 
-    - name: Run Tests
-      run: make test
-
-    - name: Build GUI
-      run: make build-gui
+      - name: Test
+        run: cd build && ctest --output-on-failure

CMakeLists.txt

@@ -0,0 +1,81 @@
+cmake_minimum_required(VERSION 3.14)
+project(LogAnalyzer VERSION 1.0.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Build settings
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
+
+# --- Dependencies ---
+find_package(OpenGL REQUIRED)
+find_library(GLFW_LIB glfw REQUIRED)
+find_library(COCOA_LIB Cocoa)
+find_library(IOKIT_LIB IOKit)
+find_library(COREVIDEO_LIB CoreVideo)
+
+# --- ImGui Library ---
+set(IMGUI_DIR "external/imgui")
+set(IMGUI_SOURCES
+    ${IMGUI_DIR}/imgui.cpp
+    ${IMGUI_DIR}/imgui_demo.cpp
+    ${IMGUI_DIR}/imgui_draw.cpp
+    ${IMGUI_DIR}/imgui_tables.cpp
+    ${IMGUI_DIR}/imgui_widgets.cpp
+    ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp
+    ${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp
+)
+
+add_library(imgui STATIC ${IMGUI_SOURCES})
+target_include_directories(imgui PUBLIC 
+    ${IMGUI_DIR} 
+    ${IMGUI_DIR}/backends
+)
+
+# --- Core Sources ---
+set(CORE_SOURCES
+    core/LogParser.cpp
+    core/Timestamp.cpp
+    io/FileReader.cpp
+    io/FileWriter.cpp
+    analysis/LevelCountAnalyzer.cpp
+    analysis/KeywordHitAnalyzer.cpp
+    analysis/TopErrorAnalyzer.cpp
+    analysis/TimeRangeFilter.cpp
+    analysis/Pipeline.cpp
+    app/Application.cpp
+)
+
+# --- CLI Executable ---
+add_executable(log_analyzer
+    ${CORE_SOURCES}
+    report/TextReportRenderer.cpp
+    main.cpp
+)
+
+# --- GUI Executable ---
+add_executable(log_analyzer_gui
+    ${CORE_SOURCES}
+    gui/GuiController.cpp
+    gui/main_gui.cpp
+)
+target_link_libraries(log_analyzer_gui PRIVATE imgui ${GLFW_LIB} ${COCOA_LIB} ${IOKIT_LIB} ${COREVIDEO_LIB} OpenGL::GL)
+
+# --- Tests ---
+enable_testing()
+
+add_executable(unit_tests
+    ${CORE_SOURCES}
+    tests/test_parser_catch2.cpp
+    tests/test_analyzers_catch2.cpp
+    tests/test_main_catch2.cpp
+    external/catch2/catch_amalgamated.cpp
+)
+target_include_directories(unit_tests PRIVATE external/catch2)
+
+add_test(NAME AllTests COMMAND unit_tests)

analysis/Pipeline.cpp

@@ -52,7 +52,12 @@ AnalysisResult Pipeline::run(const std::string &inputPath,
   size_t lineNumber;
   uint64_t bytesProcessed = 0;
   uint64_t lastReportedProgress = 0;
-  const uint64_t progressInterval = fileSize / 100; // Report every 1%
+  // Report every 1% or 1MB, whichever is larger, to avoid too frequent
+  // callbacks on small files and ensure we don't divide by zero logic if
+  // fileSize is small (though here we use subtraction) std::max ensures it's
+  // never 0 if we pick a minimum like 1024.
+  const uint64_t progressInterval =
+      std::max<uint64_t>(fileSize / 100, 1024 * 1024);
 
   while (reader.nextLine(line, lineNumber)) {
     result.totalLines++;

core/LogParser.cpp

@@ -2,12 +2,19 @@
 
 namespace loganalyzer {
 
+// Constants for robust parsing
+namespace {
+constexpr size_t MIN_LINE_LENGTH = 27;   // [YYYY-MM-DD HH:MM:SS] [L] m
+constexpr size_t TIMESTAMP_LENGTH = 19;  // YYYY-MM-DD HH:MM:SS
+constexpr size_t TIMESTAMP_MIN_END = 20; // Length of [ + TIMESTAMP + ]
+} // namespace
+
 ParseResult LogParser::parse(const std::string &line, size_t lineNumber) {
   // Expected format: [YYYY-MM-DD HH:MM:SS] [LEVEL] message
   std::string_view sv(line);
 
   // Minimum length check
-  if (sv.length() < 27) {
+  if (sv.length() < MIN_LINE_LENGTH) {
     return ParseError{ParseErrorCode::BadFormat, line, lineNumber};
   }
 
@@ -18,13 +25,13 @@ ParseResult LogParser::parse(const std::string &line, size_t lineNumber) {
 
   // Find closing bracket for timestamp (more robust than fixed position)
   size_t tsEnd = sv.find(']', 1);
-  if (tsEnd == std::string_view::npos || tsEnd < 20) {
+  if (tsEnd == std::string_view::npos || tsEnd < TIMESTAMP_MIN_END) {
     return ParseError{ParseErrorCode::BadFormat, line, lineNumber};
   }
 
   // Extract timestamp (zero-copy with string_view)
   std::string_view tsView = sv.substr(1, tsEnd - 1);
-  if (tsView.length() != 19) {
+  if (tsView.length() != TIMESTAMP_LENGTH) {
     return ParseError{ParseErrorCode::BadFormat, line, lineNumber};
   }
 

gui/GuiController.cpp

@@ -237,7 +237,14 @@ void GuiController::startAnalysis() {
       return !cancelRequested_.load();
     };
 
-    lastResult_ = app_.run(currentRequest_, callback);
+    AppResult result = app_.run(currentRequest_, callback);
+
+    {
+      // Assuming resultMutex_ is a member of GuiController
+      std::lock_guard<std::mutex> lock(resultMutex_);
+      lastResult_ = result;
+    }
+
     analysisComplete_ = true;
   });
 }
@@ -249,6 +256,7 @@ void GuiController::checkAnalysisComplete() {
     }
     isAnalyzing_ = false;
 
+    std::lock_guard<std::mutex> lock(resultMutex_);
     if (lastResult_.wasCancelled) {
       hasResults_ = false;
       showError_ = false;

gui/GuiController.h

@@ -6,6 +6,7 @@
 #include "../core/Timestamp.h"
 #include <atomic>
 #include <filesystem>
+#include <mutex>
 #include <optional>
 #include <string>
 #include <thread>
@@ -52,6 +53,7 @@ class GuiController {
 
   bool hasResults_;
   AppResult lastResult_;
+  mutable std::mutex resultMutex_; // Protects shared result data
 
   bool showError_;
   std::string errorMessage_;

tests/test_parser_catch2.cpp

@@ -95,3 +95,27 @@ TEST_CASE("Timestamp validation rejects invalid dates", "[timestamp]") {
     CHECK_FALSE(Timestamp::parse("2026-04-31 10:30:15", ts));
   }
 }
+
+TEST_CASE("LogParser handles edge cases", "[parser][edge]") {
+  SECTION("Empty line is rejected") {
+    ParseResult res = LogParser::parse("", 1);
+    REQUIRE(std::holds_alternative<ParseError>(res));
+    CHECK(std::get<ParseError>(res).code == ParseErrorCode::BadFormat);
+  }
+
+  SECTION("Line too short is rejected") {
+    ParseResult res = LogParser::parse("[2026]", 2);
+    REQUIRE(std::holds_alternative<ParseError>(res));
+    CHECK(std::get<ParseError>(res).code == ParseErrorCode::BadFormat);
+  }
+
+  SECTION("Missing closing brackets") {
+    // Missing timestamp bracket
+    ParseResult res1 = LogParser::parse("[2026-01-01 10:00:00 [INFO] Msg", 3);
+    REQUIRE(std::holds_alternative<ParseError>(res1));
+
+    // Missing level bracket
+    ParseResult res2 = LogParser::parse("[2026-01-01 10:00:00] [INFO Msg", 4);
+    REQUIRE(std::holds_alternative<ParseError>(res2));
+  }
+}