improve project structure

.gitignore

@@ -30,3 +30,6 @@
 *.exe
 *.out
 *.app
+
+# Build artifacts
+Hyprdoctor

Makefile

@@ -1,21 +1,19 @@
-# compiler settings
 CXX = g++
 CXXFLAGS = -Wall -std=c++11
+TARGET = Hyprdoctor
+SRCS = main.cpp src/utils/environment.cpp src/utils/file_parser.cpp
+OBJS = $(SRCS:.cpp=.o)
 
-# general variables
+all: $(TARGET);
-TARGET = main
-SRC = main.cpp
-OBJ = $(SRC:.cpp=.o)
 
-# Default target
+$(TARGET): $(OBJS)
-all: $(TARGET)
+	$(CXX) $(CXXFLAGS) -o $@ $^
 
-# compile
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+run:
+	./$(TARGET)
 
-# cleanup
 .PHONY: clean
 clean:
-	rm -f $(OBJ) $(TARGET)
+	rm -f $(OBJS) $(TARGET)
-

main.cpp

@@ -1,57 +1,16 @@
-#include <cstdlib>
+#include "src/utils/environment.h"
-#include <fstream>
+#include "src/utils/file_parser.h"
 #include <iostream>
-#include <string>
-#include <vector>
-
-// value of an environment variable
-const char *getEnvVar(const char *name) {
-  const char *value = std::getenv(name);
-  if (value == nullptr) {
-    throw std::runtime_error(std::string("Environment variable ") + name +
-                             " is not set.");
-  }
-
-  return value;
-}
-
-// print the value of an environment variable
-void printEnvVar(const char *name) {
-  const char *value = getEnvVar(name);
-  std::cout << name << "=" << value << std::endl;
-}
-
-// read the logs and return the lines that start with [ERR]
-// which are standard errors
-std::vector<std::string> readErrLines(const std::string &filePath) {
-  std::ifstream file(filePath);
-  if (!file.is_open()) {
-    throw std::runtime_error("Unable to open file at " + filePath);
-  }
-
-  std::string line;
-  std::vector<std::string> errLines;
-
-  while (std::getline(file, line)) {
-    if (line.substr(0, 5) == "[ERR]") {
-      errLines.push_back(line);
-    }
-  }
-
-  file.close();
-  return errLines;
-}
 
 int main() {
-  const char *envVar = getEnvVar("HYPRLAND_INSTANCE_SIGNATURE");
+  const char *envVar = getEnvVar("PATH");
-  std::cout << "Variable HYPRLAND_INSTANCE_SIGNATURE is set to " << envVar
-            << std::endl;
 
+  // try opening the log file
   try {
     std::string filePath = "/tmp/hypr/" + std::string(envVar);
     std::vector<std::string> errLines = readErrLines(filePath);
 
-    // print error lines
+    // print [ERR] lines, which are caught errors that we prioritize
     for (const auto &line : errLines) {
       std::cout << line << std::endl;
     }

src/utils/environment.cpp

@@ -0,0 +1,16 @@
+#include "environment.h"
+#include <cstdlib>
+#include <iostream>
+
+const char* getEnvVar(const char* name) {
+    const char* value = std::getenv(name);
+    if (value == nullptr) {
+        throw std::runtime_error(std::string("Environment variable ") + name + " is not set.");
+    }
+    return value;
+}
+
+void printEnvVar(const char* name) {
+    const char* value = getEnvVar(name);
+    std::cout << name << "=" << value << std::endl;
+}

src/utils/environment.h

@@ -0,0 +1,7 @@
+#ifndef UTILS_ENVIRONMENT_H
+#define UTILS_ENVIRONMENT_H
+
+const char* getEnvVar(const char* name);
+void printEnvVar(const char* name);
+
+#endif

src/utils/file_parser.cpp

@@ -0,0 +1,22 @@
+#include "file_parser.h"
+#include <fstream>
+#include <stdexcept>
+
+std::vector<std::string> readErrLines(const std::string &filePath) {
+  std::ifstream file(filePath);
+  if (!file.is_open()) {
+    throw std::runtime_error("Unable to open file at " + filePath);
+  }
+
+  std::string line;
+  std::vector<std::string> errLines;
+
+  while (std::getline(file, line)) {
+    if (line.substr(0, 5) == "[ERR]") {
+      errLines.push_back(line);
+    }
+  }
+
+  file.close();
+  return errLines;
+}

src/utils/file_parser.h

@@ -0,0 +1,9 @@
+#ifndef UTILS_FILE_PARSER_H
+#define UTILS_FILE_PARSER_H
+
+#include <string>
+#include <vector>
+
+std::vector<std::string> readErrLines(const std::string &filePath);
+
+#endif