Update README.md

.gitea/workflows/build_test.yaml

@@ -6,7 +6,7 @@ jobs:
     runs-on: arch
     steps:
       - name: get dependencies
-        run: pacman -Sy nodejs make gcc libcups --needed --noconfirm
+        run: pacman -Sy nodejs make gcc libcups nlohmann-json --needed --noconfirm
 
       - name: Checkout code
         uses: actions/checkout@v4

README.md

@@ -1,14 +1,14 @@
 <img src="https://git.pupes.org/PoliEcho/ParaDocs/raw/branch/master/assets/logo.png" alt="logo of ParaDocs" width="196"></img>
 [![build_test](https://git.pupes.org/PoliEcho/ParaDocs/actions/workflows/build_test.yaml/badge.svg)](https://git.pupes.org/PoliEcho/ParaDocs/actions?workflow=build_test.yaml)
-## Název:
+# ParaDocs  
-ParaDocs
+### joke criminal complaint generator with vi-motions  
-## Popis:
+
-TUI text editor
+
-## Prvky:
+## dependencies  
-ANSI escape codes, Datové struktury a algoritmy
+> ncurses  
-## Typ aplikace:
+> nlohnnan-json  
-Konzolová aplikace
+> g++  
-## Programovací jazyk:
+
-C/C++
+## compiletion  
-## Rozhraní:
+```make -j$(nproc)```  
-text buffer, statusbar, commandline, vi-motions
+ 

src/const.h

@@ -3,7 +3,7 @@
 #ifndef NAME
 
 #define NAME "ParaDocs"
-#define VERSION "0.0.1"
+#define VERSION "1.0.0"
 
 inline constexpr auto hash_djb2a(const std::string_view sv) {
   unsigned long hash{5381};
@@ -13,7 +13,7 @@ inline constexpr auto hash_djb2a(const std::string_view sv) {
   return hash;
 }
 
-inline constexpr auto operator""_sh(const char* str, size_t len) {
+inline constexpr auto operator""_sh(const char *str, size_t len) {
   return hash_djb2a(std::string_view{str, len});
 }
 

src/editor_easy.cpp

@@ -1,13 +1,13 @@
-#include <form.h>
-#include <ncurses.h>
-#include <cstring>
-#include <ctime>
-#include <format>
-#include <string>
-#include <vector>
 #include "gameske_funkce.h"
 #include "memory.h"
 #include "strings.h"
+#include <cstring>
+#include <ctime>
+#include <form.h>
+#include <format>
+#include <ncurses.h>
+#include <string>
+#include <vector>
 
 #define HEADER_COLOR_PAIR COLOR_RED
 #define FIELD_NAME_COLOR_PAIR 10
@@ -17,7 +17,7 @@ std::vector<allocation> editor_easy_allocated;
 
 [[nodiscard]] std::string vytvorTrestniOznameni() {
   current_allocated = &editor_easy_allocated;
-  auto trim = [](const char* str) -> std::string {
+  auto trim = [](const char *str) -> std::string {
     std::string s(str);
     if (s.empty())
       return s;
@@ -44,22 +44,22 @@ std::vector<allocation> editor_easy_allocated;
   init_pair(INPUT_COLOR_PAIR, COLOR_WHITE, COLOR_BLACK);     // Vstupní pole
 
   // Hlavní okno s rámečkem
-  WINDOW* main_win = newwin(LINES - 4, COLS - 4, 2, 2);
+  WINDOW *main_win = newwin(LINES - 4, COLS - 4, 2, 2);
   box(main_win, 0, 0);
   wrefresh(main_win);
 
   // Okno pro popisky
-  WINDOW* label_win = derwin(main_win, LINES - 8, 30, 1, 1);
+  WINDOW *label_win = derwin(main_win, LINES - 8, 30, 1, 1);
   wbkgd(label_win, COLOR_PAIR(FIELD_NAME_COLOR_PAIR));
 
   // Okno pro vstupní pole
-  WINDOW* field_win = derwin(main_win, LINES - 8, COLS - 38, 1, 32);
+  WINDOW *field_win = derwin(main_win, LINES - 8, COLS - 38, 1, 32);
   wbkgd(field_win, COLOR_PAIR(INPUT_COLOR_PAIR));
   keypad(field_win, TRUE);
 
   // Definice polí
   struct FieldConfig {
-    const char* label;
+    const char *label;
     int height;
     int width;
     bool multiline;
@@ -84,18 +84,18 @@ std::vector<allocation> editor_easy_allocated;
 
   // Vykreslení popisků
   int label_row = 0;
-  for (const FieldConfig& cfg : field_configs) {
+  for (const FieldConfig &cfg : field_configs) {
     mvwprintw(label_win, label_row, 0, "%s", cfg.label);
     label_row += cfg.height + 1;
   }
   wrefresh(label_win);
 
   // Vytvoření formuláře
-  std::vector<FIELD*> fields;
+  std::vector<FIELD *> fields;
   int field_row = 0;
 
-  for (const FieldConfig& cfg : field_configs) {
+  for (const FieldConfig &cfg : field_configs) {
-    FIELD* field = new_field(cfg.height, cfg.width, field_row, 0, 0, 0);
+    FIELD *field = new_field(cfg.height, cfg.width, field_row, 0, 0, 0);
     set_field_back(field, A_UNDERLINE | COLOR_PAIR(INPUT_COLOR_PAIR));
     field_opts_off(field, O_AUTOSKIP | O_STATIC);
 
@@ -109,9 +109,9 @@ std::vector<allocation> editor_easy_allocated;
   }
   fields.push_back(nullptr);
 
-  FORM* form = new_form(&fields[0]);
+  FORM *form = new_form(&fields[0]);
   set_form_win(form, field_win);
-  set_form_sub(form, derwin(field_win, LINES - 10, COLS - 40, 1, 1));
+  set_form_sub(form, derwin(field_win, LINES - 10, COLS - 40, 0, 1));
 
   post_form(form);
   form_driver(form, REQ_FIRST_FIELD);
@@ -197,7 +197,7 @@ std::vector<allocation> editor_easy_allocated;
   // Úklid
   unpost_form(form);
   free_form(form);
-  for (fieldnode*& f : fields)
+  for (fieldnode *&f : fields)
     if (f)
       free_field(f);
   delwin(label_win);
@@ -208,7 +208,7 @@ std::vector<allocation> editor_easy_allocated;
 
   // Aktuální datum
   std::time_t t = std::time(nullptr);
-  std::tm* now = std::localtime(&t);
+  std::tm *now = std::localtime(&t);
   char date_str[100];
   std::strftime(date_str, sizeof(date_str), "%d.%m.%Y", now);
 

src/editor_hard.cpp

@@ -1,23 +1,23 @@
-#include <ncurses.h>
+#include "strings.h"
 #include <cstddef>
 #include <cstdint>
+#include <ncurses.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 #include <sstream>
 #include <string>
 #include <vector>
-#include "strings.h"
 using nlohmann::json;
 
-void save_document(std::string& text, std::vector<std::string>& lines) {
+void save_document(std::string &text, std::vector<std::string> &lines) {
   text = "";
-  for (const std::string& line : lines) {
+  for (const std::string &line : lines) {
     text.append(line);
     text.append("\n");
   }
 }
 
-void editor_hard(std::string& text) {
+void editor_hard(std::string &text) {
   uint16_t cursor_x = 0;
   uint16_t cursor_y = 0;
   std::vector<std::string> lines;
@@ -48,7 +48,8 @@ void editor_hard(std::string& text) {
   while (true) {
     clear();
     // Draw text lines
-    for (size_t i = 0; i < window_height - 1 && i < lines.size(); i++) {
+    for (size_t i = 0;
+         i < static_cast<size_t>(window_height) - 1 && i < lines.size(); i++) {
       mvprintw(i, 0, "%s", lines[i].c_str());
     }
 

src/main.cpp

@@ -27,7 +27,7 @@ void PrintHelp() {
 }
 
 void PrintVersion() {
-  std::cout << NAME << loc_strings->version << ": " << VERSION << "\n";
+  std::cout << NAME << " " << loc_strings->version << ": " << VERSION << "\n";
   exit(0);
 }
 

src/menu.cpp

@@ -1,19 +1,3 @@
-#include <curses.h>
-#include <menu.h>
-#include <ncurses.h>
-#include <array>
-#include <cerrno>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <filesystem>
-#include <fstream>
-#include <iostream>
-#include <nlohmann/json.hpp>
-#include <sstream>
-#include <string>
-#include <vector>
 #include "color.h"
 #include "const.h"
 #include "cups.h"
@@ -24,13 +8,30 @@
 #include "signal.h"
 #include "strings.h"
 #include "types.h"
+#include <array>
+#include <cerrno>
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <curses.h>
+#include <filesystem>
+#include <fstream>
+#include <iostream>
+#include <menu.h>
+#include <ncurses.h>
+#include <nlohmann/json.hpp>
+#include <sstream>
+#include <string>
+#include <vector>
 
 using nlohmann::json;
 
 std::vector<allocation> main_menu_allocated;
 #define COMPLAINTS_DIR "complaints"
 
-std::array<std::string, 2> get_name_date_from_item(ITEM* item) {
+std::array<std::string, 2> get_name_date_from_item(ITEM *item) {
   std::stringstream ss(item_description(item));
   std::array<std::string, 2> name_date;
   name_date[0] = item_name(item);
@@ -38,7 +39,7 @@ std::array<std::string, 2> get_name_date_from_item(ITEM* item) {
   return name_date;
 }
 
-void reload_menu_from_directory(complete_menu& main_menu) {
+void reload_menu_from_directory(complete_menu &main_menu) {
   // Clean up existing menu items and allocated memory
   if (main_menu.menu != nullptr) {
     unpost_menu(main_menu.menu);
@@ -61,7 +62,7 @@ void reload_menu_from_directory(complete_menu& main_menu) {
   for (auto it = main_menu_allocated.begin();
        it != main_menu_allocated.end();) {
     if (it->type == GENERIC_TYPE) {
-      delete[] static_cast<char*>(it->ptr);
+      delete[] static_cast<char *>(it->ptr);
       it = main_menu_allocated.erase(it);
     } else {
       ++it;
@@ -69,10 +70,10 @@ void reload_menu_from_directory(complete_menu& main_menu) {
   }
 
   // Recreate items from directory (same logic as initialization)
-  std::vector<ITEM*> items;
+  std::vector<ITEM *> items;
 
   if (std::filesystem::exists(COMPLAINTS_DIR)) {
-    for (const std::filesystem::directory_entry& directroy_entry :
+    for (const std::filesystem::directory_entry &directroy_entry :
          std::filesystem::directory_iterator(COMPLAINTS_DIR)) {
       if (directroy_entry.is_regular_file()) {
         std::ifstream file(directroy_entry.path());
@@ -82,12 +83,14 @@ void reload_menu_from_directory(complete_menu& main_menu) {
         for (uint8_t i = 0; i < ARRAY_SIZE(name_date); i++) {
           std::getline(ssfn, name_date[i], '_');
         }
-
+        try {
           json complaint_json = json::parse(file);
+
           if (complaint_json["status"].is_null() ||
               complaint_json["status"].get<uint8_t>() >= STATUS_COUNT) {
             std::cerr << "Invalid status in file: "
-                    << directroy_entry.path().filename().string() << std::endl;
+                      << directroy_entry.path().filename().string()
+                      << std::endl;
             safe_exit(EINVAL);
           }
 
@@ -95,10 +98,13 @@ void reload_menu_from_directory(complete_menu& main_menu) {
           name_date[1].append(
               loc_strings
                   ->status_strings[complaint_json["status"].get<uint8_t>()]);
+        } catch (...) {
+          continue;
+        }
 
-        char* name = new char[name_date[0].length() + 1];
+        char *name = new char[name_date[0].length() + 1];
         main_menu_allocated.push_back({GENERIC_TYPE, name, 1});
-        char* date = new char[name_date[1].length() + 1];
+        char *date = new char[name_date[1].length() + 1];
         main_menu_allocated.push_back({GENERIC_TYPE, date, 1});
 
         strcpy(name, name_date[0].c_str());
@@ -112,9 +118,9 @@ void reload_menu_from_directory(complete_menu& main_menu) {
   items.push_back(nullptr);
 
   // Create new menu items array
-  main_menu.items = new ITEM*[items.size()];
+  main_menu.items = new ITEM *[items.size()];
   main_menu.items_size = items.size() - 1;
-  memcpy(main_menu.items, items.data(), (items.size() * sizeof(ITEM*)));
+  memcpy(main_menu.items, items.data(), (items.size() * sizeof(ITEM *)));
 
   // Create new menu
   main_menu.menu = new_menu(main_menu.items);
@@ -149,9 +155,9 @@ void menu() {
   complete_menu main_menu = {nullptr, nullptr, 0, nullptr};
   main_menu_allocated.push_back({COMPLETE_MENU_TYPE, &main_menu, 1});
   {
-    std::vector<ITEM*> items;
+    std::vector<ITEM *> items;
     if (std::filesystem::exists(COMPLAINTS_DIR)) {
-      for (const std::filesystem::directory_entry& directroy_entry :
+      for (const std::filesystem::directory_entry &directroy_entry :
            std::filesystem::directory_iterator(COMPLAINTS_DIR)) {
         if (directroy_entry.is_regular_file()) {
           std::ifstream file(directroy_entry.path());
@@ -160,6 +166,7 @@ void menu() {
           for (uint8_t i = 0; i < ARRAY_SIZE(name_date); i++) {
             std::getline(ssfn, name_date[i], '_');
           }
+          try {
             json complaint_json = json::parse(file);
             if (complaint_json["status"].is_null() ||
                 complaint_json["status"].get<size_t>() >= STATUS_COUNT) {
@@ -172,10 +179,13 @@ void menu() {
             name_date[1].append(
                 loc_strings
                     ->status_strings[complaint_json["status"].get<uint8_t>()]);
+          } catch (...) {
+            continue;
+          }
 
-          char* name = new char[name_date[0].length() + 1];
+          char *name = new char[name_date[0].length() + 1];
           main_menu_allocated.push_back({GENERIC_TYPE, name, 1});
-          char* date = new char[name_date[1].length() + 1];
+          char *date = new char[name_date[1].length() + 1];
           main_menu_allocated.push_back({GENERIC_TYPE, date, 1});
           strcpy(name, name_date[0].c_str());
           strcpy(date, name_date[1].c_str());
@@ -186,9 +196,9 @@ void menu() {
       std::filesystem::create_directory(COMPLAINTS_DIR);
     }
     items.push_back(nullptr);
-    main_menu.items = new ITEM*[items.size()];
+    main_menu.items = new ITEM *[items.size()];
     main_menu.items_size = items.size() - 1;
-    memcpy(main_menu.items, items.data(), (items.size() * sizeof(ITEM*)));
+    memcpy(main_menu.items, items.data(), (items.size() * sizeof(ITEM *)));
   }
 
   /* Crate menu */
@@ -239,36 +249,38 @@ void menu() {
         // DONT FORGET TO PRINT ACTUAL DOCUMENT
         std::array<std::string, 2> name_date =
             get_name_date_from_item(current_item(main_menu.menu));
-            std::ifstream selected_file(COMPLAINTS_DIR "/" + name_date[0] +
+        std::ifstream selected_file(COMPLAINTS_DIR "/" + name_date[0] + '_' +
-                                        '_' + name_date[1]);
+                                    name_date[1]);
         if (!selected_file.is_open()) {
           std::clog << selected_file.rdstate() << "\n";
           std::cerr << RED "[ERROR] " RESET << loc_strings->invalid_input
                     << "\n"
                     << "File: "
-                        << COMPLAINTS_DIR "/" + name_date[0] + '_' +
+                    << COMPLAINTS_DIR "/" + name_date[0] + '_' + name_date[1]
-                               name_date[1]
                     << "\n";
           exit(EINVAL);
         }
-
+        try {
           json selected_file_json = json::parse(selected_file);
 
           printDocument(
               selected_file_json["complaint_text"].get<std::string>());
           current_allocated = &main_menu_allocated;
+        } catch (...) {
+          safe_exit(EINVAL);
+        }
         break;
       }
       case "easy_edit"_sh:
       case "ee"_sh: {
         const std::string name = spawncmd(loc_strings->reference_name);
         if (name == "") {
-              print_in_middle(main_menu.win, 10, 0, 40,
+          print_in_middle(main_menu.win, 10, 0, 40, loc_strings->invalid_input,
-                              loc_strings->invalid_input, COLOR_PAIR(1));
+                          COLOR_PAIR(1));
         }
 
         const time_t current_time = time(nullptr);
-            const tm* local_time = localtime(&current_time);
+        const tm *local_time = localtime(&current_time);
 
         char formatted_date[11];
         strftime(formatted_date, sizeof(formatted_date), "%d-%m-%Y",
@@ -292,15 +304,14 @@ void menu() {
       case "eh"_sh: {
         std::array<std::string, 2> name_date =
             get_name_date_from_item(current_item(main_menu.menu));
-            std::ifstream selected_file(COMPLAINTS_DIR "/" + name_date[0] +
+        std::ifstream selected_file(COMPLAINTS_DIR "/" + name_date[0] + '_' +
-                                        '_' + name_date[1]);
+                                    name_date[1]);
         if (!selected_file.is_open()) {
           std::clog << selected_file.rdstate() << "\n";
           std::cerr << RED "[ERROR] " RESET << loc_strings->invalid_input
                     << "\n"
                     << "File: "
-                        << COMPLAINTS_DIR "/" + name_date[0] + '_' +
+                    << COMPLAINTS_DIR "/" + name_date[0] + '_' + name_date[1]
-                               name_date[1]
                     << "\n";
           exit(EINVAL);
         }
@@ -321,8 +332,8 @@ void menu() {
         break;
       }
       default:
-            print_in_middle(main_menu.win, 10, 0, 40,
+        print_in_middle(main_menu.win, 10, 0, 40, loc_strings->unknown_command,
-                            loc_strings->unknown_command, COLOR_PAIR(1));
+                        COLOR_PAIR(1));
         break;
       }
       break;
@@ -333,16 +344,16 @@ void menu() {
 
       {
         uint8_t n = 0;
-          size_t indexes[2];
+        size_t indexes[2] = {ULONG_MAX, ULONG_MAX}; // fix compiler warning
         for (size_t i = 0; (i < main_menu_allocated.size()); i++) {
           if (main_menu_allocated[i].ptr ==
               item_name(current_item(main_menu.menu))) {
-              delete[] static_cast<char*>(main_menu_allocated[i].ptr);
+            delete[] static_cast<char *>(main_menu_allocated[i].ptr);
             indexes[0] = i;
             n++;
           } else if (main_menu_allocated[i].ptr ==
                      item_description(current_item(main_menu.menu))) {
-              delete[] static_cast<char*>(main_menu_allocated[i].ptr);
+            delete[] static_cast<char *>(main_menu_allocated[i].ptr);
             indexes[1] = i;
             n++;
           }
@@ -350,6 +361,10 @@ void menu() {
             break;
           }
         }
+        if (indexes[0] == ULONG_MAX || indexes[1] == ULONG_MAX) {
+          std::cerr << RED "[ERROR]" << RESET " HOW DID THIS EVEN HAPPEN\n";
+          safe_exit(84);
+        }
         if (indexes[0] > indexes[1]) {
           std::swap(indexes[0], indexes[1]);
         }
@@ -378,8 +393,8 @@ void menu() {
               : selected_file_json["status"] =
                     selected_file_json["status"].get<uint8_t>() + 1;
 
-            std::ofstream selected_file(COMPLAINTS_DIR "/" + name_date[0] +
+          std::ofstream selected_file(COMPLAINTS_DIR "/" + name_date[0] + '_' +
-                                        '_' + name_date[1]);
+                                      name_date[1]);
           selected_file << selected_file_json;
           selected_file.close();
         } else {
@@ -390,13 +405,13 @@ void menu() {
 
         name_date[1].append(" ");
         name_date[1].append(
-              loc_strings->status_strings[selected_file_json["status"]
+            loc_strings
-                                              .get<uint8_t>()]);
+                ->status_strings[selected_file_json["status"].get<uint8_t>()]);
-          char* date_status = new char[name_date[1].length() + 1];
+        char *date_status = new char[name_date[1].length() + 1];
         main_menu_allocated.push_back({GENERIC_TYPE, date_status, 1});
         strlcpy(date_status, name_date[1].c_str(), name_date[1].length() + 1);
 
-          char* name = new char[name_date[0].length() + 1];
+        char *name = new char[name_date[0].length() + 1];
         main_menu_allocated.push_back({GENERIC_TYPE, name, 1});
         strlcpy(name, name_date[0].c_str(), name_date[0].length() + 1);
 
@@ -408,7 +423,7 @@ void menu() {
           }
         }
       }
-        WINDOW* old_win_sub = menu_sub(main_menu.menu);
+      WINDOW *old_win_sub = menu_sub(main_menu.menu);
       unpost_menu(main_menu.menu);
       free_menu(main_menu.menu);
       main_menu.menu = new_menu(main_menu.items);

src/strings.cpp

@@ -8,7 +8,7 @@ constexpr strings english_strings{
     .print_this_help = "Print this help",
     .print_version = "Print version",
     .version = "version",
-    .main_menu = "Main menu",
+    .main_menu = "List of complaints",
     .f1_to_exit = "F1 to exit",
     .unknown_command = "Unknown command:",
     .min_terminal_size = "Minimum terminal size: 90x28",
@@ -88,7 +88,7 @@ constexpr strings czech_strings{
     .print_this_help = "Zobrazit tuto nápovědu",
     .print_version = "Zobrazit verzi",
     .version = "verze",
-    .main_menu = "Hlavní nabídka",
+    .main_menu = "Seznam Oznámení",
     .f1_to_exit = "F1 pro ukončení",
     .unknown_command = "Neznámý příkaz: ",
     .min_terminal_size = "Minimální velikost terminálu: 90x28",
@@ -158,4 +158,4 @@ Podpis oznamovatele: {0}
     .reference_name = "Referenční Název",
     .status_strings = {"Nebylo odesláno", "Odesláno", "Zamítnuto", "Přijato"}};
 
-const strings* loc_strings;
+const strings *loc_strings;