Compare commits
6
Commits
dded22125c
...
v1.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6961d6d6d | ||
|
|
00f261696f | ||
|
|
d330878f8a | ||
|
|
30c8ad2ca7 | ||
|
|
edd21acaa5 | ||
|
|
bf02560cdd |
@@ -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
|
||||
|
||||
+1
-1
@@ -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};
|
||||
|
||||
+9
-8
@@ -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
|
||||
@@ -111,7 +111,7 @@ std::vector<allocation> editor_easy_allocated;
|
||||
|
||||
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);
|
||||
@@ -236,5 +236,6 @@ std::vector<allocation> editor_easy_allocated;
|
||||
std::string complaint =
|
||||
std::vformat(loc_strings->criminal_complaint_template, comp_args);
|
||||
|
||||
delete_all(&editor_easy_allocated);
|
||||
return complaint;
|
||||
}
|
||||
|
||||
+4
-3
@@ -1,12 +1,12 @@
|
||||
#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) {
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
+161
-31
@@ -1,18 +1,3 @@
|
||||
#include <curses.h>
|
||||
#include <menu.h>
|
||||
#include <ncurses.h>
|
||||
#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"
|
||||
@@ -23,6 +8,23 @@
|
||||
#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;
|
||||
|
||||
@@ -37,6 +39,102 @@ std::array<std::string, 2> get_name_date_from_item(ITEM* item) {
|
||||
return name_date;
|
||||
}
|
||||
|
||||
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);
|
||||
free_menu(main_menu.menu);
|
||||
main_menu.menu = nullptr;
|
||||
}
|
||||
|
||||
// Free existing menu items
|
||||
if (main_menu.items != nullptr) {
|
||||
for (size_t i = 0; i < main_menu.items_size; i++) {
|
||||
if (main_menu.items[i] != nullptr) {
|
||||
free_item(main_menu.items[i]);
|
||||
}
|
||||
}
|
||||
delete[] main_menu.items;
|
||||
main_menu.items = nullptr;
|
||||
}
|
||||
|
||||
// Clean up allocated memory (excluding the complete_menu itself)
|
||||
for (auto it = main_menu_allocated.begin();
|
||||
it != main_menu_allocated.end();) {
|
||||
if (it->type == GENERIC_TYPE) {
|
||||
delete[] static_cast<char *>(it->ptr);
|
||||
it = main_menu_allocated.erase(it);
|
||||
} else {
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
// Recreate items from directory (same logic as initialization)
|
||||
std::vector<ITEM *> items;
|
||||
|
||||
if (std::filesystem::exists(COMPLAINTS_DIR)) {
|
||||
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());
|
||||
std::string name_date[2];
|
||||
std::stringstream ssfn(directroy_entry.path().filename().string());
|
||||
|
||||
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;
|
||||
safe_exit(EINVAL);
|
||||
}
|
||||
|
||||
name_date[1].append(" ");
|
||||
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];
|
||||
main_menu_allocated.push_back({GENERIC_TYPE, name, 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());
|
||||
items.push_back(new_item(name, date));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Add null terminator
|
||||
items.push_back(nullptr);
|
||||
|
||||
// Create new menu items array
|
||||
main_menu.items = new ITEM *[items.size()];
|
||||
main_menu.items_size = items.size() - 1;
|
||||
memcpy(main_menu.items, items.data(), (items.size() * sizeof(ITEM *)));
|
||||
|
||||
// Create new menu
|
||||
main_menu.menu = new_menu(main_menu.items);
|
||||
|
||||
// Restore menu settings
|
||||
set_menu_win(main_menu.menu, main_menu.win);
|
||||
set_menu_sub(main_menu.menu, derwin(main_menu.win, 6, 38, 3, 1));
|
||||
set_menu_mark(main_menu.menu, " * ");
|
||||
|
||||
// Post the menu
|
||||
post_menu(main_menu.menu);
|
||||
wrefresh(main_menu.win);
|
||||
}
|
||||
|
||||
void menu() {
|
||||
current_allocated = &main_menu_allocated;
|
||||
/* Initialize curses */
|
||||
@@ -68,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) {
|
||||
@@ -80,6 +179,9 @@ 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];
|
||||
main_menu_allocated.push_back({GENERIC_TYPE, name, 1});
|
||||
@@ -143,17 +245,38 @@ void menu() {
|
||||
case ':':
|
||||
switch (hash_djb2a(spawncmd())) {
|
||||
case "print"_sh:
|
||||
case "p"_sh:
|
||||
case "p"_sh: {
|
||||
// DONT FORGET TO PRINT ACTUAL DOCUMENT
|
||||
printDocument("test");
|
||||
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] + '_' +
|
||||
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] + '_' + 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,
|
||||
loc_strings->invalid_input, COLOR_PAIR(1));
|
||||
print_in_middle(main_menu.win, 10, 0, 40, loc_strings->invalid_input,
|
||||
COLOR_PAIR(1));
|
||||
}
|
||||
|
||||
const time_t current_time = time(nullptr);
|
||||
@@ -173,21 +296,22 @@ void menu() {
|
||||
{"complaint_text", complaint_text}};
|
||||
|
||||
complaint_file << complaint_json;
|
||||
|
||||
complaint_file.close();
|
||||
current_allocated = &main_menu_allocated;
|
||||
reload_menu_from_directory(main_menu);
|
||||
break;
|
||||
}
|
||||
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] +
|
||||
'_' + name_date[1]);
|
||||
std::ifstream selected_file(COMPLAINTS_DIR "/" + name_date[0] + '_' +
|
||||
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] + '_' +
|
||||
name_date[1]
|
||||
<< COMPLAINTS_DIR "/" + name_date[0] + '_' + name_date[1]
|
||||
<< "\n";
|
||||
exit(EINVAL);
|
||||
}
|
||||
@@ -208,18 +332,19 @@ void menu() {
|
||||
break;
|
||||
}
|
||||
default:
|
||||
print_in_middle(main_menu.win, 10, 0, 40,
|
||||
loc_strings->unknown_command, COLOR_PAIR(1));
|
||||
print_in_middle(main_menu.win, 10, 0, 40, loc_strings->unknown_command,
|
||||
COLOR_PAIR(1));
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'm': {
|
||||
int current_item_index = item_index(current_item(main_menu.menu));
|
||||
std::array<std::string, 2> name_date =
|
||||
get_name_date_from_item(current_item(main_menu.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))) {
|
||||
@@ -236,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]);
|
||||
}
|
||||
@@ -264,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] +
|
||||
'_' + name_date[1]);
|
||||
std::ofstream selected_file(COMPLAINTS_DIR "/" + name_date[0] + '_' +
|
||||
name_date[1]);
|
||||
selected_file << selected_file_json;
|
||||
selected_file.close();
|
||||
} else {
|
||||
@@ -276,8 +405,8 @@ void menu() {
|
||||
|
||||
name_date[1].append(" ");
|
||||
name_date[1].append(
|
||||
loc_strings->status_strings[selected_file_json["status"]
|
||||
.get<uint8_t>()]);
|
||||
loc_strings
|
||||
->status_strings[selected_file_json["status"].get<uint8_t>()]);
|
||||
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);
|
||||
@@ -302,6 +431,7 @@ void menu() {
|
||||
set_menu_sub(main_menu.menu, old_win_sub);
|
||||
set_menu_format(main_menu.menu, 7, 1);
|
||||
set_menu_mark(main_menu.menu, " * ");
|
||||
set_current_item(main_menu.menu, main_menu.items[current_item_index]);
|
||||
post_menu(main_menu.menu);
|
||||
break;
|
||||
}
|
||||
|
||||
+2
-2
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user