Merge pull request #1 from siddhp1/v2

Version 2.0.0

Author: siddhp1

Diff for: .gitignore

@@ -1,6 +1,7 @@
 # Generated directories
 /bin/
 /build/
+/logs/
 
 # CMake
 CMakeLists.txt.user

Diff for: CMakeLists.txt

@@ -15,22 +15,25 @@ set(CMAKE_C_STANDARD_REQUIRED True)
 include_directories(include)
 
 # Source files
-set(SOURCES src/main.c src/data.c src/config.c src/art.c)
+set(SOURCES src/main.c src/sysgrab_art.c src/sysgrab_config.c src/sysgrab_data.c src/sysgrab_log.c src/sysgrab_number.c src/sysgrab_path.c src/sysgrab_print.c src/sysgrab_string.c src/sysgrab_time.c)
 
 # Specify the output directory for binaries
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 
 # Add the executable
 add_executable(sysgrab ${SOURCES})
 
+# Link the yaml library
+target_link_libraries(sysgrab yaml)
+
 # Copy resource files to the bin directory
 add_custom_command(TARGET sysgrab POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_SOURCE_DIR}/resources/art.txt
-        ${CMAKE_SOURCE_DIR}/resources/config.txt
+        ${CMAKE_SOURCE_DIR}/resources/config.yaml
         $<TARGET_FILE_DIR:sysgrab>
 )
 
 # Install the executable and resource files
 install(TARGETS sysgrab DESTINATION ${CMAKE_SOURCE_DIR}/bin)
-install(FILES resources/art.txt resources/config.txt DESTINATION ${CMAKE_SOURCE_DIR}/bin)
+install(FILES resources/art.txt resources/config.yaml DESTINATION ${CMAKE_SOURCE_DIR}/bin)

Diff for: README.md

@@ -4,7 +4,7 @@ Sysgrab is a lightweight and customizable system information tool for fetching a
 
 <p align="center"><a><img width="800" alt="Thumbnail Image of Sysgrab" src="https://www.siddhp.me/_next/image?url=%2Fsysgrab.png&w=3840&q=75"></a></p>
 
-Users can configure Sysgrab's base and accent colors, and add ASCII art of their choice through the CLI or by directly editing the configuration files.
+Users can configure Sysgrab's colors, the ordering of datpoints and add ASCII art of their choice by editing the configuration files.
 
 Sysgrab is compatible with all Linux distributions.
 
@@ -20,13 +20,11 @@ To install Sysgrab, follow these steps:
 
     Add the extracted directory to your system PATH to make `sysgrab` accessible from anywhere in the terminal.
 
-    Add this line to `.bashrc` or `.zshrc` to make the change persistent.
+    Add this line to your shell configuration to make the change persistent
 
     ```bash
     export PATH=$PATH:/path/to/sysgrab-directory
-    ```
-
-    
+    ```    
 
 ## Usage
 
@@ -41,25 +39,19 @@ sysgrab [OPTIONS]
   (no option)                   Display system information
   -h, --help                    Show a help message and exit
   -v, --version                 Display version information and exit
-  -b, --base-color [r,g,b]      Set base color in the format r,g,b
-  -a, --accent-color [r,g,b]    Set accent color in the format r,g,b
 ```
 
 ## Configuration
 
 To configure Sysgrab, follow these steps:
 
-1. **Configure colors**:
-
-    To configure the colors, edit the `config.txt` file, or run the following command with rgb values of choice:
+1. **Configure colors, logging, and data ordering**:
 
-    ```bash
-    sysgrab --base-color r,g,b --accent-color r,g,b
-    ```
+    To configure the colors, edit the `config.yaml` file.
 
 2. **Add art**:
 
-    To configure the art, paste any ASCII art in the `art.txt` file.
+    To configure the art, create a text file with ASCII art, and put the file name in the `config.yaml` file.
 
 ## License
 

Diff for: include/art.h

@@ -0,0 +1,15 @@
+#ifndef SYSGRAB_ART_H
+#define SYSGRAB_ART_H
+
+#include <stddef.h>
+
+typedef struct Art {
+  size_t lines;
+  size_t maximum_line_length;
+  char **art_array;
+} Art;
+
+void free_art(Art *art);
+Art *get_art(const char *file_path);
+
+#endif

Diff for: include/config.h

@@ -0,0 +1,22 @@
+#ifndef SYSGRAB_CONFIG_H
+#define SYSGRAB_CONFIG_H
+
+#include "sysgrab_data.h"
+
+typedef struct Color {
+  unsigned char red;
+  unsigned char green;
+  unsigned char blue;
+} Color;
+
+typedef struct Config {
+  bool log_errors;
+  Color base_color;
+  Color accent_color;
+  char *art_file_name;
+  Data *data;
+} Config;
+
+Config *get_config(const char *file_path);
+
+#endif

Diff for: include/data.h

@@ -0,0 +1,24 @@
+#ifndef SYSGRAB_DATA_H
+#define SYSGRAB_DATA_H
+
+#include <stdbool.h>
+#include <stddef.h>
+
+typedef struct DataPoint {
+  char *key;
+  char *value;
+} DataPoint;
+
+typedef struct Data {
+  size_t length;
+  DataPoint **datapoints;
+} Data;
+
+DataPoint *get_datapoint(const char *data_point);
+
+Data *create_data(void);
+bool add_datapoint(Data *data, DataPoint *datapoint);
+void free_datapoint(DataPoint *datapoint);
+void free_data(Data *data);
+
+#endif

Diff for: include/sysgrab_art.h

@@ -0,0 +1,6 @@
+#ifndef SYSGRAB_LOGS_H
+#define SYSGRAB_LOGS_H
+
+char *get_log_file_path(void);
+
+#endif

Diff for: include/sysgrab_config.h

@@ -0,0 +1,8 @@
+#ifndef SYSGRAB_NUMBER_H
+#define SYSGRAB_NUMBER_H
+
+double get_double_from_string(const char *string);
+long int get_long_from_string(const char *string);
+unsigned char get_unsigned_char_from_ascii(const char *ascii);
+
+#endif

Diff for: include/sysgrab_data.h

@@ -0,0 +1,6 @@
+#ifndef SYSGRAB_PATH_H
+#define SYSGRAB_PATH_H
+
+char *get_file_path(const char *file_name);
+
+#endif

Diff for: include/sysgrab_log.h

@@ -0,0 +1,6 @@
+#ifndef SYSGRAB_PRINT_H
+#define SYSGRAB_PRINT_H
+
+void print_sysgrab(const Art *art, const Config *config);
+
+#endif

Diff for: include/sysgrab_number.h

@@ -0,0 +1,12 @@
+#ifndef SYSGRAB_STRING_H
+#define SYSGRAB_STRING_H
+
+char *clean_string(const char *original_string, const char *prefix,
+                   const char *suffix);
+char *get_string_from_command(const char *command, const char *look_up);
+char *get_string_from_double(const double value,
+                             const char *conversion_specifier);
+char *get_string_from_file(const char *file_path, const char *look_up);
+char *get_string_from_long(const long value);
+
+#endif

Diff for: include/sysgrab_path.h

@@ -0,0 +1,6 @@
+#ifndef SYSGRAB_TIME_H
+#define SYSGRAB_TIME_H
+
+char *get_datetime(void);
+
+#endif

Diff for: include/sysgrab_print.h

@@ -13,4 +13,4 @@
  |    `.       | `' \Zq
 _)      \.___.,|     .'
 \____   )MMMMMP|   .'
-     `-'       `--' hjm
+     `-'       `--' hj

Diff for: include/sysgrab_string.h

@@ -0,0 +1,13 @@
+log_errors: True
+art_file_name: art.txt
+base_color: [255, 255, 255]
+accent_color: [20, 200, 255]
+ordering:
+  - os
+  - architecture
+  - kernel
+  - computer
+  - shell
+  - uptime
+  - cpu
+  - memory