Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
15b0344dc8 | |||
73fed3df0e | |||
6b3d47ceed | |||
89c67035ca | |||
0486d9fb22 | |||
e51088eb26 | |||
ad6f748899 | |||
1d0d4e2362 | |||
a35242b420 | |||
e78c8d7efa | |||
f01422eaf5 | |||
9b8bdbf850 | |||
c9aef90130 | |||
d9f545ed09 | |||
d533b526bf | |||
ea083e31fc | |||
05c406ed6a | |||
a78f4536b2 | |||
1992b0e166 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,7 +1,7 @@
|
||||
.cache
|
||||
.vscode
|
||||
compile_commands.json
|
||||
core*
|
||||
*core*
|
||||
build
|
||||
test-data
|
||||
log
|
6
Makefile
6
Makefile
@ -2,6 +2,7 @@
|
||||
CPPC = g++
|
||||
CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
|
||||
DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
|
||||
DEBUG_ASANITIZE = -fsanitize=address -ggdb -fno-omit-frame-pointer -std=c++23 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
|
||||
|
||||
|
||||
SRC_PATH := src
|
||||
@ -19,6 +20,9 @@ all: make-build-dir $(BIN_PATH)/bakatui
|
||||
debug: CPPC_FLAGS = $(DEBUG_FLAGS)
|
||||
debug: make-build-dir $(BIN_PATH)/bakatui
|
||||
|
||||
asan: CPPC_FLAGS = $(DEBUG_ASANITIZE)
|
||||
asan: make-build-dir $(BIN_PATH)/bakatui
|
||||
|
||||
|
||||
make-build-dir:
|
||||
mkdir -p $(OBJ_PATH)
|
||||
@ -39,4 +43,4 @@ install:
|
||||
clean:
|
||||
rm -fr build
|
||||
|
||||
.PHONY: all clean install debug
|
||||
.PHONY: all clean install debug asan
|
||||
|
@ -10,5 +10,6 @@
|
||||
> - [x] Login
|
||||
> - [x] Marks
|
||||
> - [x] Timetable
|
||||
> - [ ] Komens
|
||||
> - [x] Komens
|
||||
> - [ ] Absence
|
||||
> - [ ] Homework
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <string_view>
|
||||
#ifndef VERSION
|
||||
|
||||
#define VERSION "0.8"
|
||||
#define VERSION "0.8.2"
|
||||
#define NAME "bakatui"
|
||||
|
||||
inline constexpr auto hash_djb2a(const std::string_view sv) {
|
||||
@ -12,7 +12,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});
|
||||
}
|
||||
|
||||
|
@ -6,6 +6,7 @@
|
||||
#include <algorithm>
|
||||
#include <codecvt>
|
||||
#include <csignal>
|
||||
#include <cstring>
|
||||
#include <curses.h>
|
||||
#include <dirent.h>
|
||||
#include <filesystem>
|
||||
@ -207,6 +208,11 @@ char *wchar_to_char(const wchar_t *src) {
|
||||
|
||||
size_t len = wcslen(src) + 1; // +1 for null terminator
|
||||
char *dest = new char[len * MB_CUR_MAX];
|
||||
current_allocated->push_back(allocation{
|
||||
GENERIC_ARRAY,
|
||||
dest,
|
||||
len * MB_CUR_MAX,
|
||||
});
|
||||
|
||||
std::wcstombs(dest, src, len * MB_CUR_MAX);
|
||||
return dest;
|
||||
|
285
src/komens.cpp
285
src/komens.cpp
@ -2,39 +2,54 @@
|
||||
#include "helper_funcs.h"
|
||||
#include "memory.h"
|
||||
#include "net.h"
|
||||
#include "types.h"
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <curses.h>
|
||||
#include <cwchar>
|
||||
#include <future>
|
||||
#include <menu.h>
|
||||
#include <ncurses.h>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#define WIN_HIGHT 40
|
||||
#define MAIN_WIN_PROPORTION 0.714f
|
||||
|
||||
#define MAIN_WIN_HIGHT (roundf(LINES * MAIN_WIN_PROPORTION))
|
||||
|
||||
#define DEFAULT_OFSET 4
|
||||
|
||||
using nlohmann::json;
|
||||
|
||||
std::vector<allocation> komens_allocated;
|
||||
|
||||
void insert_content(WINDOW *content_window, size_t i, json &resp_from_api);
|
||||
void insert_content(WINDOW *content_win, WINDOW *attachment_win,
|
||||
const json &resp_from_api);
|
||||
|
||||
void komens_print_usage_message() {
|
||||
attron(COLOR_PAIR(COLOR_BLUE));
|
||||
mvprintw(LINES - 2, 0,
|
||||
"Use PageUp and PageDown to scoll down or up a page of items");
|
||||
mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
|
||||
attroff(COLOR_PAIR(COLOR_BLUE));
|
||||
refresh();
|
||||
}
|
||||
|
||||
void komens_page(koment_type type) {
|
||||
current_allocated = &komens_allocated;
|
||||
json resp_from_api;
|
||||
{
|
||||
/*std::ifstream f("test-data/komens.json");
|
||||
resp_from_api = json::parse(f);
|
||||
f.close();*/
|
||||
|
||||
const json resp_from_api = [&]() -> json {
|
||||
const char *types[] = {"/api/3/komens/messages/received",
|
||||
"/api/3/komens/messages/sent",
|
||||
"/api/3/komens/messages/noticeboard"};
|
||||
|
||||
const std::string endpoint = types[type];
|
||||
resp_from_api = bakaapi::get_data_from_endpoint(endpoint, POST);
|
||||
}
|
||||
return bakaapi::get_data_from_endpoint(endpoint, POST);
|
||||
}();
|
||||
|
||||
/* Initialize curses */
|
||||
setlocale(LC_ALL, "");
|
||||
@ -48,12 +63,18 @@ void komens_page(koment_type type) {
|
||||
for (uint8_t i = 0; i < 8; i++) {
|
||||
init_pair(i, i, COLOR_BLACK);
|
||||
}
|
||||
|
||||
complete_menu komens_choise_menu;
|
||||
komens_allocated.push_back({COMPLETE_MENU_TYPE, &komens_choise_menu, 1});
|
||||
|
||||
size_t num_of_komens = resp_from_api["Messages"].size();
|
||||
ITEM **komens_items = new ITEM *[num_of_komens + 1];
|
||||
komens_allocated.push_back({ITEM_ARRAY, komens_items, num_of_komens});
|
||||
komens_choise_menu.items = new ITEM *[num_of_komens + 1];
|
||||
komens_choise_menu.items_size = num_of_komens + 1;
|
||||
|
||||
char **title_bufs = new char *[num_of_komens];
|
||||
komens_allocated.push_back({CHAR_PTR_ARRAY, title_bufs, num_of_komens});
|
||||
char **name_bufs = new char *[num_of_komens];
|
||||
komens_allocated.push_back({CHAR_PTR_ARRAY, name_bufs, num_of_komens});
|
||||
size_t max_item_lenght;
|
||||
{
|
||||
size_t max_title_lenght = 0;
|
||||
@ -61,11 +82,9 @@ void komens_page(koment_type type) {
|
||||
size_t tmp_lenght;
|
||||
char tmp_buf[1500];
|
||||
for (size_t i = 0; i < num_of_komens; i++) {
|
||||
wcstombs(tmp_buf,
|
||||
string_to_wstring(
|
||||
resp_from_api["Messages"][i]["Title"].get<std::string>())
|
||||
.c_str(),
|
||||
sizeof(tmp_buf));
|
||||
strlcpy(tmp_buf,
|
||||
resp_from_api["Messages"][i]["Title"].get<std::string>().c_str(),
|
||||
sizeof(tmp_buf));
|
||||
|
||||
tmp_lenght =
|
||||
resp_from_api["Messages"][i]["Title"].get<std::string>().length();
|
||||
@ -76,12 +95,12 @@ void komens_page(koment_type type) {
|
||||
|
||||
title_bufs[i] = new char[strlen(tmp_buf) + 1];
|
||||
strlcpy(title_bufs[i], tmp_buf, strlen(tmp_buf) + 1);
|
||||
wcstombs(
|
||||
tmp_buf,
|
||||
string_to_wstring(
|
||||
resp_from_api["Messages"][i]["Sender"]["Name"].get<std::string>())
|
||||
.c_str(),
|
||||
sizeof(tmp_buf));
|
||||
|
||||
strlcpy(tmp_buf,
|
||||
resp_from_api["Messages"][i]["Sender"]["Name"]
|
||||
.get<std::string>()
|
||||
.c_str(),
|
||||
sizeof(tmp_buf));
|
||||
|
||||
tmp_lenght = resp_from_api["Messages"][i]["Sender"]["Name"]
|
||||
.get<std::string>()
|
||||
@ -94,53 +113,50 @@ void komens_page(koment_type type) {
|
||||
name_bufs[i] = new char[strlen(tmp_buf) + 1];
|
||||
strlcpy(name_bufs[i], tmp_buf, strlen(tmp_buf) + 1);
|
||||
|
||||
komens_items[i] = new_item(title_bufs[i], name_bufs[i]);
|
||||
komens_choise_menu.items[i] = new_item(title_bufs[i], name_bufs[i]);
|
||||
}
|
||||
max_item_lenght = 3 + max_title_lenght + 1 + max_name_lenght;
|
||||
}
|
||||
komens_items[num_of_komens] = nullptr;
|
||||
komens_choise_menu.items[num_of_komens] = nullptr;
|
||||
|
||||
MENU *komens_choise_menu = new_menu(komens_items);
|
||||
komens_allocated.push_back({MENU_TYPE, komens_choise_menu, 1});
|
||||
komens_choise_menu.menu = new_menu(komens_choise_menu.items);
|
||||
|
||||
WINDOW *komens_choise_menu_win =
|
||||
newwin(WIN_HIGHT, max_item_lenght + 1, DEFAULT_OFSET, DEFAULT_OFSET);
|
||||
komens_allocated.push_back({WINDOW_TYPE, komens_choise_menu_win, 1});
|
||||
komens_choise_menu.win =
|
||||
newwin(MAIN_WIN_HIGHT, max_item_lenght + 1, DEFAULT_OFSET, DEFAULT_OFSET);
|
||||
komens_allocated.push_back({WINDOW_TYPE, komens_choise_menu.win, 1});
|
||||
|
||||
set_menu_win(komens_choise_menu, komens_choise_menu_win);
|
||||
set_menu_sub(komens_choise_menu,
|
||||
derwin(komens_choise_menu_win, WIN_HIGHT - 10, max_item_lenght,
|
||||
DEFAULT_OFSET - 1, DEFAULT_OFSET - 3));
|
||||
set_menu_format(komens_choise_menu, WIN_HIGHT - 5, 1);
|
||||
set_menu_win(komens_choise_menu.menu, komens_choise_menu.win);
|
||||
set_menu_sub(komens_choise_menu.menu,
|
||||
derwin(komens_choise_menu.win, MAIN_WIN_HIGHT - 10,
|
||||
max_item_lenght, DEFAULT_OFSET - 1, DEFAULT_OFSET - 3));
|
||||
set_menu_format(komens_choise_menu.menu, MAIN_WIN_HIGHT - 5, 1);
|
||||
|
||||
set_menu_mark(komens_choise_menu, " * ");
|
||||
set_menu_mark(komens_choise_menu.menu, " * ");
|
||||
|
||||
box(komens_choise_menu_win, 0, 0);
|
||||
box(komens_choise_menu.win, 0, 0);
|
||||
|
||||
wprint_in_middle(komens_choise_menu_win, 1, 0, max_item_lenght, L"Komens",
|
||||
wprint_in_middle(komens_choise_menu.win, 1, 0, max_item_lenght, L"Komens",
|
||||
COLOR_PAIR(1));
|
||||
mvwaddch(komens_choise_menu_win, 2, 0, ACS_LTEE);
|
||||
mvwhline(komens_choise_menu_win, 2, 1, ACS_HLINE, max_item_lenght - 1);
|
||||
mvwaddch(komens_choise_menu_win, 2, max_item_lenght, ACS_RTEE);
|
||||
mvwaddch(komens_choise_menu.win, 2, 0, ACS_LTEE);
|
||||
mvwhline(komens_choise_menu.win, 2, 1, ACS_HLINE, max_item_lenght - 1);
|
||||
mvwaddch(komens_choise_menu.win, 2, max_item_lenght, ACS_RTEE);
|
||||
|
||||
post_menu(komens_choise_menu);
|
||||
wrefresh(komens_choise_menu_win);
|
||||
post_menu(komens_choise_menu.menu);
|
||||
wrefresh(komens_choise_menu.win);
|
||||
|
||||
WINDOW *content_window =
|
||||
newwin(WIN_HIGHT, COLS - max_item_lenght - DEFAULT_OFSET - 1,
|
||||
WINDOW *content_win =
|
||||
newwin(MAIN_WIN_HIGHT, COLS - max_item_lenght - DEFAULT_OFSET - 1,
|
||||
DEFAULT_OFSET, DEFAULT_OFSET + max_item_lenght + 1);
|
||||
komens_allocated.push_back({WINDOW_TYPE, content_window, 1});
|
||||
box(content_window, 0, 0);
|
||||
insert_content(content_window, item_index(current_item(komens_choise_menu)),
|
||||
resp_from_api);
|
||||
wrefresh(content_window);
|
||||
komens_allocated.push_back({WINDOW_TYPE, content_win, 1});
|
||||
|
||||
attron(COLOR_PAIR(COLOR_BLUE));
|
||||
mvprintw(LINES - 2, 0,
|
||||
"Use PageUp and PageDown to scoll down or up a page of items");
|
||||
mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
|
||||
attroff(COLOR_PAIR(COLOR_BLUE));
|
||||
refresh();
|
||||
WINDOW *attachment_win = newwin(1, 1, LINES, COLS);
|
||||
komens_allocated.push_back({WINDOW_TYPE, attachment_win, 1});
|
||||
|
||||
insert_content(content_win, attachment_win,
|
||||
resp_from_api["Messages"][item_index(
|
||||
current_item(komens_choise_menu.menu))]);
|
||||
|
||||
komens_print_usage_message();
|
||||
|
||||
int c;
|
||||
while ((c = getch()) != KEY_F(1)) {
|
||||
@ -148,25 +164,162 @@ void komens_page(koment_type type) {
|
||||
case KEY_DOWN:
|
||||
case KEY_NPAGE:
|
||||
case 'j':
|
||||
menu_driver(komens_choise_menu, REQ_DOWN_ITEM);
|
||||
menu_driver(komens_choise_menu.menu, REQ_DOWN_ITEM);
|
||||
break;
|
||||
|
||||
case KEY_UP:
|
||||
case KEY_PPAGE:
|
||||
case 'k':
|
||||
menu_driver(komens_choise_menu, REQ_UP_ITEM);
|
||||
menu_driver(komens_choise_menu.menu, REQ_UP_ITEM);
|
||||
break;
|
||||
default:
|
||||
if (c >= '1' && c <= '9') {
|
||||
size_t index = c - '0' - 1;
|
||||
if (index < resp_from_api["Messages"][item_index(
|
||||
current_item(komens_choise_menu.menu))]["Attachments"]
|
||||
.size()) {
|
||||
|
||||
std::string default_path =
|
||||
"~/Downloads/" +
|
||||
resp_from_api["Messages"][item_index(current_item(
|
||||
komens_choise_menu.menu))]["Attachments"][index]["Name"]
|
||||
.get<std::string>();
|
||||
char path[256];
|
||||
|
||||
// Create input prompt at bottom of screen
|
||||
move(LINES - 1, 0);
|
||||
clrtoeol();
|
||||
printw("Save path [%s]: ", default_path.c_str());
|
||||
echo();
|
||||
curs_set(1);
|
||||
getnstr(path, sizeof(path) - 1);
|
||||
if (strlen(path) == 0)
|
||||
strcpy(path, default_path.c_str());
|
||||
noecho();
|
||||
curs_set(0);
|
||||
move(LINES - 1, 0);
|
||||
clrtoeol();
|
||||
refresh();
|
||||
|
||||
char progress_bar[20];
|
||||
std::fill(progress_bar, progress_bar + 20, '.');
|
||||
LimitedInt progress_index(0, 0, sizeof(progress_bar) - 1);
|
||||
// Download the attachment
|
||||
auto future = std::async(
|
||||
std::launch::async, bakaapi::download_attachment,
|
||||
resp_from_api["Messages"][item_index(current_item(
|
||||
komens_choise_menu.menu))]["Attachments"][index]["Id"]
|
||||
.get<std::string>(),
|
||||
path);
|
||||
while (true) {
|
||||
if (future.wait_for(std::chrono::seconds(1)) ==
|
||||
std::future_status::ready) {
|
||||
// Future has completed
|
||||
int result = future.get();
|
||||
if (result != 0) {
|
||||
attron(COLOR_PAIR(COLOR_RED));
|
||||
mvprintw(LINES - 1, 0, "Download failed with error code: %d",
|
||||
result);
|
||||
attroff(COLOR_PAIR(COLOR_RED));
|
||||
} else {
|
||||
attron(COLOR_PAIR(COLOR_GREEN));
|
||||
mvprintw(LINES - 1, 0, "Download completed successfully");
|
||||
attroff(COLOR_PAIR(COLOR_GREEN));
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
progress_bar[progress_index] = '#';
|
||||
|
||||
// Future is still running
|
||||
mvprintw(LINES - 1, 0, "%s", progress_bar);
|
||||
progress_bar[progress_index] = '.';
|
||||
progress_index++;
|
||||
}
|
||||
}
|
||||
|
||||
komens_print_usage_message();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
insert_content(content_window, item_index(current_item(komens_choise_menu)),
|
||||
resp_from_api);
|
||||
wrefresh(content_window);
|
||||
wrefresh(komens_choise_menu_win);
|
||||
|
||||
insert_content(content_win, attachment_win,
|
||||
resp_from_api["Messages"][item_index(
|
||||
current_item(komens_choise_menu.menu))]);
|
||||
wrefresh(komens_choise_menu.win);
|
||||
}
|
||||
unpost_menu(komens_choise_menu.menu);
|
||||
endwin();
|
||||
delete_all(&komens_allocated);
|
||||
}
|
||||
|
||||
void insert_content(WINDOW *content_window, size_t i, json &resp_from_api) {
|
||||
wclear(content_window);
|
||||
mvwprintw(content_window, 0, 0, "%s",
|
||||
html_to_string(resp_from_api.at("Messages")[i]["Text"]).c_str());
|
||||
}
|
||||
void insert_content(WINDOW *content_win, WINDOW *attachment_win,
|
||||
const json &message) {
|
||||
wclear(content_win);
|
||||
mvwprintw(content_win, 0, 0, "%s",
|
||||
html_to_string(message.at("Text")).c_str());
|
||||
wrefresh(content_win);
|
||||
if (!message.at("Attachments").empty()) {
|
||||
|
||||
size_t max_item_lenght = 0;
|
||||
{
|
||||
size_t max_name_lenght = 0;
|
||||
size_t max_size_lenght = 0;
|
||||
size_t tmp_lenght;
|
||||
|
||||
for (size_t j = 0; j < message.at("Attachments").size(); j++) {
|
||||
tmp_lenght =
|
||||
message.at("Attachments")[j]["Name"].get<std::string>().length();
|
||||
if (tmp_lenght > max_name_lenght) {
|
||||
max_name_lenght = tmp_lenght;
|
||||
}
|
||||
|
||||
tmp_lenght =
|
||||
std::to_string(message.at("Attachments")[j]["Size"].get<size_t>())
|
||||
.length();
|
||||
if (tmp_lenght > max_size_lenght) {
|
||||
max_size_lenght = tmp_lenght;
|
||||
}
|
||||
}
|
||||
|
||||
max_item_lenght = 3 + max_name_lenght + 1 + max_size_lenght;
|
||||
}
|
||||
|
||||
mvwin(attachment_win, MAIN_WIN_HIGHT + DEFAULT_OFSET + 1,
|
||||
COLS - max_item_lenght - 2);
|
||||
wresize(attachment_win, LINES - (MAIN_WIN_HIGHT + DEFAULT_OFSET + 1),
|
||||
max_item_lenght + 2);
|
||||
|
||||
wborder(attachment_win, 0, ' ', 0, 0, 0, ACS_HLINE, 0, ACS_HLINE);
|
||||
print_in_middle(attachment_win, 0, 0, max_item_lenght + 2, "Attachments",
|
||||
COLOR_PAIR(COLOR_RED));
|
||||
for (size_t j = 0; j < message.at("Attachments").size(); j++) {
|
||||
|
||||
mvwprintw(
|
||||
attachment_win, j + 1, 2, "%s %s",
|
||||
message.at("Attachments")[j]["Name"].get<std::string>().c_str(),
|
||||
std::to_string(message.at("Attachments")[j]["Size"].get<size_t>())
|
||||
.c_str());
|
||||
|
||||
wattron(attachment_win, COLOR_PAIR(COLOR_MAGENTA));
|
||||
mvwprintw(attachment_win, j + 1, 0, "%zu>", j + 1);
|
||||
wattroff(attachment_win, COLOR_PAIR(COLOR_MAGENTA));
|
||||
}
|
||||
{ // remove duplicating edges
|
||||
unsigned short attachment_win_top, attachment_win_left,
|
||||
attachment_win_height, attachment_win_width;
|
||||
getbegyx(attachment_win, attachment_win_top, attachment_win_left);
|
||||
getmaxyx(attachment_win, attachment_win_height, attachment_win_width);
|
||||
|
||||
mvvline(attachment_win_top, attachment_win_left - 1, ' ',
|
||||
attachment_win_height);
|
||||
}
|
||||
refresh();
|
||||
|
||||
wrefresh(attachment_win);
|
||||
} else {
|
||||
// remove attachment window if there are no attachments
|
||||
wclear(attachment_win);
|
||||
wrefresh(attachment_win);
|
||||
}
|
||||
}
|
||||
|
@ -1,22 +1,27 @@
|
||||
#include "komens_menu.h"
|
||||
#include "helper_funcs.h"
|
||||
#include "komens.h"
|
||||
#include "memory.h"
|
||||
#include "net.h"
|
||||
#include "types.h"
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <curses.h>
|
||||
#include <menu.h>
|
||||
|
||||
std::vector<allocation> komens_menu_allocated;
|
||||
|
||||
void komens_menu() {
|
||||
current_allocated = &komens_menu_allocated;
|
||||
wchar_t *choices[] = {
|
||||
L"received", L"sent", L"noticeboard", L"Exit", nullptr,
|
||||
};
|
||||
|
||||
ITEM **my_items;
|
||||
complete_menu komens_menu;
|
||||
komens_menu_allocated.push_back({COMPLETE_MENU_TYPE, &komens_menu, 1});
|
||||
|
||||
int c;
|
||||
MENU *my_menu;
|
||||
WINDOW *my_menu_win;
|
||||
int n_choices, i;
|
||||
int n_choices;
|
||||
|
||||
/* Initialize curses */
|
||||
setlocale(LC_ALL, "");
|
||||
@ -30,37 +35,40 @@ void komens_menu() {
|
||||
|
||||
/* Create items */
|
||||
n_choices = ARRAY_SIZE(choices);
|
||||
my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
|
||||
for (i = 0; i < n_choices; ++i)
|
||||
my_items[i] =
|
||||
komens_menu.items = new ITEM *[ARRAY_SIZE(choices)];
|
||||
komens_menu.items_size = ARRAY_SIZE(choices);
|
||||
|
||||
for (int i = 0; i < n_choices; ++i)
|
||||
|
||||
komens_menu.items[i] =
|
||||
new_item(wchar_to_char(choices[i]), wchar_to_char(choices[i]));
|
||||
|
||||
/* Crate menu */
|
||||
my_menu = new_menu((ITEM **)my_items);
|
||||
komens_menu.menu = new_menu(komens_menu.items);
|
||||
|
||||
/* Create the window to be associated with the menu */
|
||||
my_menu_win = newwin(12, 40, 4, 4);
|
||||
keypad(my_menu_win, TRUE);
|
||||
komens_menu.win = newwin(12, 40, 4, 4);
|
||||
keypad(komens_menu.win, TRUE);
|
||||
|
||||
/* Set main window and sub window */
|
||||
set_menu_win(my_menu, my_menu_win);
|
||||
set_menu_sub(my_menu, derwin(my_menu_win, 8, 38, 3, 1));
|
||||
set_menu_format(my_menu, 7, 1);
|
||||
set_menu_win(komens_menu.menu, komens_menu.win);
|
||||
set_menu_sub(komens_menu.menu, derwin(komens_menu.win, 8, 38, 3, 1));
|
||||
set_menu_format(komens_menu.menu, 7, 1);
|
||||
|
||||
/* Set menu mark to the string " * " */
|
||||
set_menu_mark(my_menu, " * ");
|
||||
set_menu_mark(komens_menu.menu, " * ");
|
||||
|
||||
/* Print a border around the main window and print a title */
|
||||
box(my_menu_win, 0, 0);
|
||||
box(komens_menu.win, 0, 0);
|
||||
|
||||
wprint_in_middle(my_menu_win, 1, 0, 40, L"Komens Menu", COLOR_PAIR(1));
|
||||
mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
|
||||
mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
|
||||
mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
|
||||
wprint_in_middle(komens_menu.win, 1, 0, 40, L"Komens Menu", COLOR_PAIR(1));
|
||||
mvwaddch(komens_menu.win, 2, 0, ACS_LTEE);
|
||||
mvwhline(komens_menu.win, 2, 1, ACS_HLINE, 38);
|
||||
mvwaddch(komens_menu.win, 2, 39, ACS_RTEE);
|
||||
|
||||
/* Post the menu */
|
||||
post_menu(my_menu);
|
||||
wrefresh(my_menu_win);
|
||||
post_menu(komens_menu.menu);
|
||||
wrefresh(komens_menu.win);
|
||||
|
||||
attron(COLOR_PAIR(2));
|
||||
mvprintw(LINES - 2, 0,
|
||||
@ -74,33 +82,33 @@ void komens_menu() {
|
||||
case KEY_DOWN:
|
||||
case KEY_NPAGE:
|
||||
case 'j':
|
||||
menu_driver(my_menu, REQ_DOWN_ITEM);
|
||||
menu_driver(komens_menu.menu, REQ_DOWN_ITEM);
|
||||
break;
|
||||
|
||||
case KEY_UP:
|
||||
case KEY_PPAGE:
|
||||
case 'k':
|
||||
menu_driver(my_menu, REQ_UP_ITEM);
|
||||
menu_driver(komens_menu.menu, REQ_UP_ITEM);
|
||||
break;
|
||||
case 10: // ENTER
|
||||
clear();
|
||||
if (item_index(current_item(my_menu)) == n_choices - 1) {
|
||||
if (item_index(current_item(komens_menu.menu)) == n_choices - 1) {
|
||||
goto close_menu;
|
||||
}
|
||||
komens_page(static_cast<koment_type>(item_index(current_item(my_menu))));
|
||||
pos_menu_cursor(my_menu);
|
||||
komens_page(
|
||||
static_cast<koment_type>(item_index(current_item(komens_menu.menu))));
|
||||
current_allocated = &komens_menu_allocated;
|
||||
pos_menu_cursor(komens_menu.menu);
|
||||
refresh();
|
||||
wrefresh(my_menu_win);
|
||||
wrefresh(komens_menu.win);
|
||||
break;
|
||||
}
|
||||
wrefresh(my_menu_win);
|
||||
wrefresh(komens_menu.win);
|
||||
}
|
||||
close_menu:
|
||||
|
||||
/* Unpost and free all the memory taken up */
|
||||
unpost_menu(my_menu);
|
||||
free_menu(my_menu);
|
||||
for (i = 0; i < n_choices; ++i)
|
||||
free_item(my_items[i]);
|
||||
unpost_menu(komens_menu.menu);
|
||||
delete_all(&komens_menu_allocated);
|
||||
endwin();
|
||||
}
|
||||
|
35
src/main.cpp
35
src/main.cpp
@ -1,8 +1,10 @@
|
||||
#include "main.h"
|
||||
#include "color.h"
|
||||
#include "flags.h"
|
||||
#include "helper_funcs.h"
|
||||
#include "main_menu.h"
|
||||
#include "net.h"
|
||||
#include "types.h"
|
||||
#include <csignal>
|
||||
#include <cstdlib>
|
||||
#include <curl/curl.h>
|
||||
@ -12,8 +14,6 @@
|
||||
#include <regex>
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
#include "flags.h"
|
||||
#include "types.h"
|
||||
|
||||
std::string baka_api_url;
|
||||
|
||||
@ -36,14 +36,27 @@ int main(int argc, char **argv) {
|
||||
|
||||
int opt;
|
||||
while ((opt = getopt(argc, argv, "hVvLS:")) != -1) {
|
||||
switch (opt) {
|
||||
case 'h': PrintHelp(); break;
|
||||
case 'V': PrintVersion(); break;
|
||||
case 'v': config.verbose = true; break;
|
||||
case 'L': DeleteLogin(savedir_path); break;
|
||||
case 'S': config.ignoressl = true; break;
|
||||
default: std::cerr << RED"[ERROR]" << RESET" invalid option: " << (char)optopt << "\ntry: -h\n"; safe_exit(EINVAL);
|
||||
}
|
||||
switch (opt) {
|
||||
case 'h':
|
||||
PrintHelp();
|
||||
break;
|
||||
case 'V':
|
||||
PrintVersion();
|
||||
break;
|
||||
case 'v':
|
||||
config.verbose = true;
|
||||
break;
|
||||
case 'L':
|
||||
DeleteLogin(savedir_path);
|
||||
break;
|
||||
case 'S':
|
||||
config.ignoressl = true;
|
||||
break;
|
||||
default:
|
||||
std::cerr << RED "[ERROR]" << RESET " invalid option: " << (char)optopt
|
||||
<< "\ntry: -h\n";
|
||||
safe_exit(EINVAL);
|
||||
}
|
||||
}
|
||||
|
||||
std::string urlfile_path = std::string(savedir_path) + "/url";
|
||||
@ -79,6 +92,6 @@ int main(int argc, char **argv) {
|
||||
get_input_and_login();
|
||||
}
|
||||
main_menu();
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
@ -1,25 +1,29 @@
|
||||
#include "helper_funcs.h"
|
||||
#include "komens_menu.h"
|
||||
#include "marks.h"
|
||||
#include "memory.h"
|
||||
#include "net.h"
|
||||
#include "timetable.h"
|
||||
#include "types.h"
|
||||
#include <cstddef>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <curses.h>
|
||||
#include <menu.h>
|
||||
|
||||
std::vector<allocation> main_menu_allocated;
|
||||
|
||||
void main_menu() {
|
||||
wchar_t *choices[] = {
|
||||
current_allocated = &main_menu_allocated;
|
||||
const wchar_t *choices[] = {
|
||||
L"login", L"Marks", L"timetable", L"Komens",
|
||||
L"Homework", L"Absence", L"Exit", nullptr,
|
||||
};
|
||||
void (*choicesFuncs[])() = {nullptr, marks_page, timetable_page, komens_menu,
|
||||
nullptr, nullptr, nullptr, nullptr};
|
||||
ITEM **my_items;
|
||||
int c;
|
||||
MENU *my_menu;
|
||||
WINDOW *my_menu_win;
|
||||
int n_choices, i;
|
||||
|
||||
complete_menu main_menu;
|
||||
main_menu_allocated.push_back({COMPLETE_MENU_TYPE, &main_menu, 1});
|
||||
|
||||
/* Initialize curses */
|
||||
setlocale(LC_ALL, "");
|
||||
@ -32,38 +36,39 @@ void main_menu() {
|
||||
init_pair(2, COLOR_CYAN, COLOR_BLACK);
|
||||
|
||||
/* Create items */
|
||||
n_choices = ARRAY_SIZE(choices);
|
||||
my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
|
||||
for (i = 0; i < n_choices; ++i)
|
||||
my_items[i] =
|
||||
new_item(wchar_to_char(choices[i]), wchar_to_char(choices[i]));
|
||||
|
||||
main_menu.items = new ITEM *[ARRAY_SIZE(choices)];
|
||||
main_menu.items_size = ARRAY_SIZE(choices);
|
||||
for (size_t i = 0; i < ARRAY_SIZE(choices); ++i) {
|
||||
main_menu.items[i] =
|
||||
new_item(wchar_to_char(choices[i]), wchar_to_char(choices[i]));
|
||||
}
|
||||
/* Crate menu */
|
||||
my_menu = new_menu((ITEM **)my_items);
|
||||
main_menu.menu = new_menu(main_menu.items);
|
||||
|
||||
/* Create the window to be associated with the menu */
|
||||
my_menu_win = newwin(12, 40, 4, 4);
|
||||
keypad(my_menu_win, TRUE);
|
||||
main_menu.win = newwin(12, 40, 4, 4);
|
||||
keypad(main_menu.win, TRUE);
|
||||
|
||||
/* Set main window and sub window */
|
||||
set_menu_win(my_menu, my_menu_win);
|
||||
set_menu_sub(my_menu, derwin(my_menu_win, 8, 38, 3, 1));
|
||||
set_menu_format(my_menu, 7, 1);
|
||||
set_menu_win(main_menu.menu, main_menu.win);
|
||||
set_menu_sub(main_menu.menu, derwin(main_menu.win, 8, 38, 3, 1));
|
||||
set_menu_format(main_menu.menu, 7, 1);
|
||||
|
||||
/* Set menu mark to the string " * " */
|
||||
set_menu_mark(my_menu, " * ");
|
||||
set_menu_mark(main_menu.menu, " * ");
|
||||
|
||||
/* Print a border around the main window and print a title */
|
||||
box(my_menu_win, 0, 0);
|
||||
box(main_menu.win, 0, 0);
|
||||
|
||||
wprint_in_middle(my_menu_win, 1, 0, 40, L"Main Menu", COLOR_PAIR(1));
|
||||
mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
|
||||
mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
|
||||
mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
|
||||
wprint_in_middle(main_menu.win, 1, 0, 40, L"Main Menu", COLOR_PAIR(1));
|
||||
mvwaddch(main_menu.win, 2, 0, ACS_LTEE);
|
||||
mvwhline(main_menu.win, 2, 1, ACS_HLINE, 38);
|
||||
mvwaddch(main_menu.win, 2, 39, ACS_RTEE);
|
||||
|
||||
/* Post the menu */
|
||||
post_menu(my_menu);
|
||||
wrefresh(my_menu_win);
|
||||
post_menu(main_menu.menu);
|
||||
wrefresh(main_menu.win);
|
||||
|
||||
attron(COLOR_PAIR(2));
|
||||
mvprintw(LINES - 2, 0,
|
||||
@ -72,38 +77,39 @@ void main_menu() {
|
||||
attroff(COLOR_PAIR(2));
|
||||
refresh();
|
||||
|
||||
int c;
|
||||
while ((c = getch()) != KEY_F(1)) {
|
||||
switch (c) {
|
||||
case KEY_DOWN:
|
||||
case KEY_NPAGE:
|
||||
case 'j':
|
||||
menu_driver(my_menu, REQ_DOWN_ITEM);
|
||||
menu_driver(main_menu.menu, REQ_DOWN_ITEM);
|
||||
break;
|
||||
|
||||
case KEY_UP:
|
||||
case KEY_PPAGE:
|
||||
case 'k':
|
||||
menu_driver(my_menu, REQ_UP_ITEM);
|
||||
menu_driver(main_menu.menu, REQ_UP_ITEM);
|
||||
break;
|
||||
case 10: // ENTER
|
||||
clear();
|
||||
if (item_index(current_item(my_menu)) == n_choices - 1) {
|
||||
if (item_index(current_item(main_menu.menu)) == ARRAY_SIZE(choices) - 1) {
|
||||
goto close_menu;
|
||||
}
|
||||
choicesFuncs[item_index(current_item(my_menu))]();
|
||||
pos_menu_cursor(my_menu);
|
||||
choicesFuncs[item_index(current_item(main_menu.menu))]();
|
||||
current_allocated = &main_menu_allocated;
|
||||
pos_menu_cursor(main_menu.menu);
|
||||
wrefresh(main_menu.win);
|
||||
refresh();
|
||||
wrefresh(my_menu_win);
|
||||
redrawwin(main_menu.win);
|
||||
break;
|
||||
}
|
||||
wrefresh(my_menu_win);
|
||||
wrefresh(main_menu.win);
|
||||
}
|
||||
close_menu:
|
||||
|
||||
/* Unpost and free all the memory taken up */
|
||||
unpost_menu(my_menu);
|
||||
free_menu(my_menu);
|
||||
for (i = 0; i < n_choices; ++i)
|
||||
free_item(my_items[i]);
|
||||
unpost_menu(main_menu.menu);
|
||||
delete_all(&main_menu_allocated);
|
||||
endwin();
|
||||
}
|
||||
|
@ -31,22 +31,26 @@ using nlohmann::json;
|
||||
|
||||
std::vector<allocation> marks_allocated;
|
||||
|
||||
void init_wins(WINDOW **wins, int n, json marks_json);
|
||||
void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
|
||||
int height, json marks_json, int SubjectIndex);
|
||||
void init_wins(WINDOW **wins, const int n, const json &marks_json);
|
||||
void win_show(WINDOW *win, const wchar_t *label, const int label_color,
|
||||
int width, int height, const json &marks_json,
|
||||
const int SubjectIndex);
|
||||
|
||||
void marks_page() {
|
||||
current_allocated = &marks_allocated;
|
||||
json resp_from_api;
|
||||
{
|
||||
std::string endpoint = "api/3/marks";
|
||||
resp_from_api = bakaapi::get_data_from_endpoint(endpoint, GET);
|
||||
}
|
||||
size_t size_my_wins = resp_from_api["Subjects"].size();
|
||||
curs_set(0);
|
||||
|
||||
// thanks to lambda i can make this const
|
||||
const json resp_from_api = [&]() -> json {
|
||||
const std::string endpoint = "api/3/marks";
|
||||
return bakaapi::get_data_from_endpoint(endpoint, GET);
|
||||
}();
|
||||
|
||||
const size_t size_my_wins = resp_from_api["Subjects"].size();
|
||||
WINDOW **my_wins = new (std::nothrow) WINDOW *[size_my_wins];
|
||||
marks_allocated.push_back({WINDOW_ARRAY, my_wins, size_my_wins});
|
||||
|
||||
size_t size_my_panels = resp_from_api["Subjects"].size();
|
||||
const size_t size_my_panels = size_my_wins;
|
||||
PANEL **my_panels = new (std::nothrow) PANEL *[size_my_panels];
|
||||
marks_allocated.push_back({PANEL_ARRAY, my_panels, size_my_panels});
|
||||
|
||||
@ -129,10 +133,11 @@ void marks_page() {
|
||||
endwin();
|
||||
clear();
|
||||
delete_all(&marks_allocated);
|
||||
curs_set(1);
|
||||
}
|
||||
|
||||
/* Put all the windows */
|
||||
void init_wins(WINDOW **wins, int n, json marks_json) {
|
||||
void init_wins(WINDOW **wins, const int n, const json &marks_json) {
|
||||
int x, y, i;
|
||||
wchar_t label[1500];
|
||||
|
||||
@ -145,12 +150,12 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
|
||||
for (i = 0; i < n; ++i) {
|
||||
|
||||
// Calculate label and max_text_length to determine window width
|
||||
std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
|
||||
std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
|
||||
const std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
|
||||
const std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
|
||||
|
||||
// Convert to wchar_t
|
||||
std::wstring wsub_name = string_to_wstring(sub_name);
|
||||
std::wstring wsub_avg_s = string_to_wstring(sub_avg_s);
|
||||
const std::wstring wsub_name = string_to_wstring(sub_name);
|
||||
const std::wstring wsub_avg_s = string_to_wstring(sub_avg_s);
|
||||
|
||||
// Using swprintf for wide character formatting
|
||||
swprintf(label, sizeof(label) / sizeof(label[0]), L"%ls - avg: %ls",
|
||||
@ -160,17 +165,18 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
|
||||
for (unsigned int j = 0; j < static_cast<unsigned int>(
|
||||
marks_json["Subjects"][i]["Marks"].size());
|
||||
j++) {
|
||||
std::string caption =
|
||||
const std::string caption =
|
||||
rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Caption"]);
|
||||
std::string theme =
|
||||
const std::string theme =
|
||||
rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Theme"]);
|
||||
|
||||
std::wstring wcaption = string_to_wstring(caption);
|
||||
std::wstring wtheme = string_to_wstring(theme);
|
||||
const std::wstring wcaption = string_to_wstring(caption);
|
||||
const std::wstring wtheme = string_to_wstring(theme);
|
||||
|
||||
// Some code that does something and fixes some edge cases
|
||||
std::string testCaption = caption + std::format(" {{{}}} [{}]", "X", 0);
|
||||
std::wstring wTestCaption = string_to_wstring(testCaption);
|
||||
const std::string testCaption =
|
||||
caption + std::format(" {{{}}} [{}]", "X", 0);
|
||||
const std::wstring wTestCaption = string_to_wstring(testCaption);
|
||||
max_text_length =
|
||||
std::max({max_text_length, wTestCaption.length(), wtheme.length()});
|
||||
}
|
||||
@ -203,8 +209,9 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
|
||||
}
|
||||
|
||||
/* Show the window with a border and a label */
|
||||
void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
|
||||
int height, json marks_json, int SubjectIndex) {
|
||||
void win_show(WINDOW *win, const wchar_t *label, const int label_color,
|
||||
int width, int height, const json &marks_json,
|
||||
const int SubjectIndex) {
|
||||
|
||||
// is the compiler smoking weed or something, why is it thinking starty is not
|
||||
// used ??
|
||||
|
@ -1,9 +1,34 @@
|
||||
#include "memory.h"
|
||||
#include "color.h"
|
||||
#include "types.h"
|
||||
#include <curses.h>
|
||||
#include <iostream>
|
||||
#include <menu.h>
|
||||
#include <ncurses.h>
|
||||
#include <panel.h>
|
||||
|
||||
template <typename T> struct NcursesDeleter {
|
||||
static void delete_element(T obj);
|
||||
};
|
||||
|
||||
template <> void NcursesDeleter<WINDOW *>::delete_element(WINDOW *win) {
|
||||
delwin(win);
|
||||
}
|
||||
template <> void NcursesDeleter<PANEL *>::delete_element(PANEL *pan) {
|
||||
del_panel(pan);
|
||||
}
|
||||
template <> void NcursesDeleter<ITEM *>::delete_element(ITEM *item) {
|
||||
free_item(item);
|
||||
}
|
||||
|
||||
template <typename T> void delete_ncurses_arrays(void *ptr, std::size_t size) {
|
||||
T *array = static_cast<T *>(ptr);
|
||||
for (std::size_t j = 0; j < size; ++j) {
|
||||
NcursesDeleter<T>::delete_element(array[j]);
|
||||
}
|
||||
delete[] array;
|
||||
}
|
||||
|
||||
void delete_all(std::vector<allocation> *allocated) {
|
||||
if (allocated == nullptr) {
|
||||
return;
|
||||
@ -11,27 +36,26 @@ void delete_all(std::vector<allocation> *allocated) {
|
||||
for (long long i = allocated->size() - 1; i >= 0; i--) {
|
||||
switch (allocated->at(i).type) {
|
||||
case WINDOW_ARRAY: {
|
||||
WINDOW **windows = static_cast<WINDOW **>(allocated->at(i).ptr);
|
||||
for (std::size_t j = 0; j < allocated->at(i).size; j++) {
|
||||
delwin(windows[j]);
|
||||
}
|
||||
delete[] windows;
|
||||
delete_ncurses_arrays<WINDOW *>(allocated->at(i).ptr,
|
||||
allocated->at(i).size);
|
||||
break;
|
||||
}
|
||||
case PANEL_ARRAY: {
|
||||
PANEL **panels = static_cast<PANEL **>(allocated->at(i).ptr);
|
||||
for (std::size_t j = 0; j < allocated->at(i).size; j++) {
|
||||
del_panel(panels[j]);
|
||||
}
|
||||
delete[] panels;
|
||||
delete_ncurses_arrays<PANEL *>(allocated->at(i).ptr,
|
||||
allocated->at(i).size);
|
||||
break;
|
||||
}
|
||||
case ITEM_ARRAY: {
|
||||
ITEM **items = static_cast<ITEM **>(allocated->at(i).ptr);
|
||||
for (std::size_t j = 0; j < allocated->at(i).size; j++) {
|
||||
free_item(items[j]);
|
||||
delete_ncurses_arrays<ITEM *>(allocated->at(i).ptr,
|
||||
allocated->at(i).size);
|
||||
break;
|
||||
}
|
||||
case CHAR_PTR_ARRAY: {
|
||||
char **array = static_cast<char **>(allocated->at(i).ptr);
|
||||
for (std::size_t j = 0; j < allocated->at(i).size; ++j) {
|
||||
delete[] array[j];
|
||||
}
|
||||
delete[] items;
|
||||
delete[] array;
|
||||
break;
|
||||
}
|
||||
case GENERIC_ARRAY:
|
||||
@ -46,6 +70,15 @@ void delete_all(std::vector<allocation> *allocated) {
|
||||
case MENU_TYPE:
|
||||
free_menu(static_cast<MENU *>(allocated->at(i).ptr));
|
||||
break;
|
||||
case COMPLETE_MENU_TYPE: {
|
||||
free_menu(static_cast<complete_menu *>(allocated->at(i).ptr)->menu);
|
||||
delwin(static_cast<complete_menu *>(allocated->at(i).ptr)->win);
|
||||
delete_ncurses_arrays<ITEM *>(
|
||||
static_cast<complete_menu *>(allocated->at(i).ptr)->items,
|
||||
static_cast<complete_menu *>(allocated->at(i).ptr)->items_size);
|
||||
|
||||
break;
|
||||
}
|
||||
case GENERIC_TYPE:
|
||||
delete static_cast<char *>(allocated->at(i).ptr);
|
||||
break;
|
||||
|
@ -9,10 +9,12 @@ enum AllocationType {
|
||||
WINDOW_ARRAY,
|
||||
PANEL_ARRAY,
|
||||
ITEM_ARRAY,
|
||||
CHAR_PTR_ARRAY,
|
||||
GENERIC_ARRAY,
|
||||
WINDOW_TYPE,
|
||||
PANEL_TYPE,
|
||||
MENU_TYPE,
|
||||
COMPLETE_MENU_TYPE,
|
||||
GENERIC_TYPE
|
||||
};
|
||||
|
||||
|
123
src/net.cpp
123
src/net.cpp
@ -9,14 +9,20 @@
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <curl/curl.h>
|
||||
#include <curl/header.h>
|
||||
#include <curses.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
#include <format>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <nlohmann/json_fwd.hpp>
|
||||
#include <stdlib.h>
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
|
||||
#define ROUND_UP(x, y) ((((x) + (y) - 1)) & ~((y) - 1))
|
||||
|
||||
using nlohmann::json;
|
||||
|
||||
@ -25,15 +31,44 @@ std::string access_token;
|
||||
CURL *curl = curl_easy_init();
|
||||
|
||||
// Callback function to write data into a std::string
|
||||
size_t WriteCallback(void *contents, size_t size, size_t nmemb,
|
||||
std::string *userp) {
|
||||
size_t WriteCallback_to_string(void *contents, size_t size, size_t nmemb,
|
||||
void *userp) {
|
||||
size_t totalSize = size * nmemb;
|
||||
userp->append((char *)contents, totalSize);
|
||||
static_cast<std::string *>(userp)->append((char *)contents, totalSize);
|
||||
return totalSize;
|
||||
}
|
||||
|
||||
std::tuple<std::string, int> send_curl_request(std::string endpoint, metod type,
|
||||
std::string req_data) {
|
||||
size_t WriteCallback_to_file(void *contents, size_t size, size_t nmemb,
|
||||
void *userp) {
|
||||
const size_t sector_size = 4096;
|
||||
size_t total = size * nmemb;
|
||||
void *aligned_buf = aligned_alloc(sector_size, ROUND_UP(total, sector_size));
|
||||
|
||||
// Zero out the buffer before copying
|
||||
memset(aligned_buf, 0, ROUND_UP(total, sector_size));
|
||||
memcpy(aligned_buf, contents, total);
|
||||
|
||||
// Cast userp to fstream*
|
||||
std::fstream *fileStream = static_cast<std::fstream *>(userp);
|
||||
|
||||
// Write to the file using fstream
|
||||
fileStream->write(static_cast<char *>(aligned_buf), total);
|
||||
|
||||
// Check if write was successful
|
||||
if (fileStream->fail()) {
|
||||
free(aligned_buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
free(aligned_buf);
|
||||
return total;
|
||||
}
|
||||
|
||||
std::tuple<std::string, int> send_curl_request(
|
||||
std::string endpoint, metod type, std::string req_data,
|
||||
size_t (*WriteCallback_function)(void *, size_t, size_t,
|
||||
void *) = WriteCallback_to_string,
|
||||
std::fstream *fileStream = nullptr) {
|
||||
std::string response;
|
||||
std::string url = baka_api_url + endpoint;
|
||||
if (type == GET) {
|
||||
@ -42,15 +77,19 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint, metod type,
|
||||
|
||||
if (curl) {
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback_function);
|
||||
if (fileStream) {
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, fileStream);
|
||||
} else {
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||
}
|
||||
if (config.ignoressl) {
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
|
||||
}
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
|
||||
curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "gzip, deflate");
|
||||
|
||||
struct curl_slist *headers = NULL;
|
||||
headers = curl_slist_append(
|
||||
@ -73,16 +112,29 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint, metod type,
|
||||
safe_exit(EINVAL);
|
||||
}
|
||||
|
||||
CURLcode curl_return_code = curl_easy_perform(curl);
|
||||
curl_slist_free_all(headers);
|
||||
if (curl_return_code != CURLE_OK) {
|
||||
std::cerr << RED "[ERROR] " << RESET << "curl_easy_perform() failed: "
|
||||
<< curl_easy_strerror(curl_return_code) << "\n";
|
||||
safe_exit(21);
|
||||
}
|
||||
if (fileStream) {
|
||||
fileStream->close();
|
||||
}
|
||||
|
||||
int http_code = 0;
|
||||
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
|
||||
|
||||
return {response, http_code};
|
||||
|
||||
} else {
|
||||
std::cerr << RED "[ERROR] " << RESET "curl not initialised\n";
|
||||
safe_exit(20);
|
||||
|
||||
// prevent compiler warning
|
||||
return {"", -1};
|
||||
}
|
||||
curl_easy_perform(curl); // Perform the request
|
||||
|
||||
int http_code = 0;
|
||||
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
|
||||
|
||||
return {response, http_code};
|
||||
}
|
||||
namespace bakaapi {
|
||||
|
||||
@ -172,4 +224,47 @@ access_token_refreshed:
|
||||
|
||||
return json::parse(response);
|
||||
}
|
||||
|
||||
int download_attachment(std::string id, std::string path) {
|
||||
if (config.verbose) {
|
||||
std::clog << "downloading attachment please wait...\n";
|
||||
}
|
||||
if (path[0] == '~') {
|
||||
path = std::string(std::getenv("HOME")) + path.substr(1);
|
||||
}
|
||||
|
||||
std::string savedir_path = std::filesystem::path(path).parent_path().string();
|
||||
if (!std::filesystem::exists(savedir_path)) {
|
||||
if (!std::filesystem::create_directories(savedir_path)) {
|
||||
std::cerr << RED "[ERROR] " RESET
|
||||
<< "Failed to create directory: " << savedir_path << "\n";
|
||||
safe_exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
std::fstream fileStream(path, std::ios::out | std::ios::binary);
|
||||
if (!fileStream.is_open()) {
|
||||
std::cerr << RED "[ERROR] " RESET << "Failed to open file for writing\n";
|
||||
safe_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
is_access_token_empty();
|
||||
access_token_refreshed:
|
||||
std::string req_data =
|
||||
std::format("Authorization=Bearer&access_token={}", access_token);
|
||||
|
||||
auto [response, http_code] =
|
||||
send_curl_request(std::format("/api/3/komens/attachment/{}", id), GET,
|
||||
req_data, WriteCallback_to_file, &fileStream);
|
||||
if (http_code != 200) {
|
||||
if (config.verbose) {
|
||||
std::clog << BLUE "[LOG] " RESET << "download failed " << http_code
|
||||
<< " is non 200 response\n";
|
||||
}
|
||||
refresh_access_token();
|
||||
goto access_token_refreshed;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace bakaapi
|
@ -19,5 +19,6 @@ void login(std::string username, std::string password);
|
||||
void refresh_access_token();
|
||||
json get_data_from_endpoint(const std::string &endpoint, metod metod,
|
||||
std::string additional_data = "");
|
||||
int download_attachment(std::string id, std::string path);
|
||||
} // namespace bakaapi
|
||||
#endif
|
@ -6,6 +6,7 @@
|
||||
#include "net.h"
|
||||
#include "types.h"
|
||||
#include <bits/chrono.h>
|
||||
#include <climits>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <ctime>
|
||||
@ -26,22 +27,34 @@ using nlohmann::json;
|
||||
|
||||
#define DEFAULT_OFFSET 3
|
||||
|
||||
#define REMOVED_COLOR_PAIR COLOR_GREEN
|
||||
#define ROOMCHANGED_COLOR_PAIR COLOR_MAGENTA
|
||||
#define SUBSTITUTION_COLOR_PAIR COLOR_YELLOW
|
||||
#define ADDED_COLOR_PAIR COLOR_BLUE
|
||||
|
||||
#define HELP_TEXT \
|
||||
"Arrows/hjkl to select | ENTER to show info | p/n to select weeks |F1 to " \
|
||||
"exit"
|
||||
#define HELP_TEXT_LENGTH sizeof(HELP_TEXT) - 1
|
||||
|
||||
std::vector<allocation> timetable_allocated;
|
||||
|
||||
const wchar_t *day_abriviations[] = {nullptr, L"Mo", L"Tu", L"We",
|
||||
L"Th", L"Fr", L"Sa", L"Su"};
|
||||
|
||||
void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
|
||||
json &resp_from_api);
|
||||
const json &resp_from_api);
|
||||
|
||||
void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
|
||||
uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
|
||||
json &resp_from_api);
|
||||
uint16_t cell_width,
|
||||
const std::vector<uint8_t> &HourIdLookupTable,
|
||||
const json &resp_from_api);
|
||||
|
||||
void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
|
||||
uint16_t cell_width, uint16_t cell_height,
|
||||
std::vector<std::vector<WINDOW *>> &cells,
|
||||
std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api);
|
||||
const std::vector<uint8_t> &HourIdLookupTable,
|
||||
const json &resp_from_api);
|
||||
|
||||
uint8_t hour_id_to_index(const std::vector<uint8_t> &HourIdLookupTable,
|
||||
uint8_t id) {
|
||||
@ -53,8 +66,8 @@ uint8_t hour_id_to_index(const std::vector<uint8_t> &HourIdLookupTable,
|
||||
return 0;
|
||||
}
|
||||
|
||||
json *partial_json_by_id(json &resp_from_api, const std::string &what,
|
||||
const std::string &id) {
|
||||
const json *partial_json_by_id(const json &resp_from_api,
|
||||
const std::string &what, const std::string &id) {
|
||||
for (uint8_t i = 0; i < resp_from_api[what].size(); i++) {
|
||||
if (resp_from_api[what][i]["Id"].get<std::string>() == id) {
|
||||
return &resp_from_api[what][i];
|
||||
@ -63,7 +76,7 @@ json *partial_json_by_id(json &resp_from_api, const std::string &what,
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::wstring get_data_for_atom(json &resp_from_api, json *atom,
|
||||
std::wstring get_data_for_atom(const json &resp_from_api, const json *atom,
|
||||
const std::string &from_where,
|
||||
const std::string &id_key,
|
||||
const std::string &what) {
|
||||
@ -74,9 +87,10 @@ std::wstring get_data_for_atom(json &resp_from_api, json *atom,
|
||||
.get<std::string>());
|
||||
}
|
||||
|
||||
json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
|
||||
uint8_t hour_index,
|
||||
const std::vector<uint8_t> &HourIdLookupTable) {
|
||||
const json *
|
||||
find_atom_by_indexes(const json &resp_from_api, uint8_t day_index,
|
||||
uint8_t hour_index,
|
||||
const std::vector<uint8_t> &HourIdLookupTable) {
|
||||
for (uint8_t k = 0; k < resp_from_api["Days"][day_index]["Atoms"].size();
|
||||
k++) {
|
||||
if (resp_from_api["Days"][day_index]["Atoms"][k]["HourId"].get<uint8_t>() ==
|
||||
@ -91,6 +105,7 @@ void timetable_page() {
|
||||
current_allocated = &timetable_allocated;
|
||||
auto dateSelected = std::chrono::system_clock::now();
|
||||
reload_for_new_week:
|
||||
clear();
|
||||
std::time_t date_time_t = std::chrono::system_clock::to_time_t(dateSelected);
|
||||
std::tm local_time = *std::localtime(&date_time_t);
|
||||
|
||||
@ -100,7 +115,7 @@ reload_for_new_week:
|
||||
std::string date_string = "date=" + date_stringstream.str();
|
||||
std::string endpoint = "api/3/timetable/actual";
|
||||
|
||||
json resp_from_api =
|
||||
const json resp_from_api =
|
||||
bakaapi::get_data_from_endpoint(endpoint, GET, date_string);
|
||||
|
||||
// this may be unnecessary but i dont have enaugh data to test it
|
||||
@ -275,9 +290,32 @@ reload_for_new_week:
|
||||
}
|
||||
}
|
||||
attron(COLOR_PAIR(COLOR_BLUE));
|
||||
mvprintw(LINES - 2, 0,
|
||||
"Arrows/hjkl to select | ENTER to show info | p/n to select weeks "
|
||||
"|F1 to exit");
|
||||
mvprintw(LINES - 2, 0, HELP_TEXT);
|
||||
attroff(COLOR_PAIR(COLOR_BLUE));
|
||||
|
||||
{
|
||||
constexpr char *change_types[] = {"Canceled/Removed", "RoomChanged",
|
||||
"Substitution", "Added"};
|
||||
|
||||
constexpr uint8_t change_types_colors[] = {
|
||||
REMOVED_COLOR_PAIR, ROOMCHANGED_COLOR_PAIR, SUBSTITUTION_COLOR_PAIR,
|
||||
ADDED_COLOR_PAIR};
|
||||
|
||||
for (uint8_t i = 0; i < ARRAY_SIZE(change_types); i++) {
|
||||
init_pair(UCHAR_MAX - i, COLOR_BLACK, change_types_colors[i]);
|
||||
}
|
||||
|
||||
uint8_t text_offset = 1;
|
||||
for (uint8_t i = 0; i < ARRAY_SIZE(change_types); i++) {
|
||||
attron(COLOR_PAIR(UCHAR_MAX - i));
|
||||
mvprintw(LINES - 2, HELP_TEXT_LENGTH + text_offset, "%s",
|
||||
change_types[i]);
|
||||
attroff(COLOR_PAIR(UCHAR_MAX - i));
|
||||
text_offset += strlen(change_types[i]) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
attron(COLOR_PAIR(COLOR_BLUE));
|
||||
{
|
||||
std::tm end_week = local_time;
|
||||
std::tm start_week = local_time;
|
||||
@ -292,13 +330,14 @@ reload_for_new_week:
|
||||
.get<uint8_t>();
|
||||
|
||||
// Calculate days back to start day (handles week wraparound)
|
||||
int days_back = (current_wday >= start_day)
|
||||
? (current_wday - start_day)
|
||||
: (current_wday + 7 - start_day);
|
||||
uint8_t days_back = (current_wday >= start_day)
|
||||
? (current_wday - start_day)
|
||||
: (current_wday + 7 - start_day);
|
||||
|
||||
// Calculate days forward to end day (handles week wraparound)
|
||||
int days_forward = (current_wday <= end_day) ? (end_day - current_wday)
|
||||
: (end_day + 7 - current_wday);
|
||||
uint8_t days_forward = (current_wday <= end_day)
|
||||
? (end_day - current_wday)
|
||||
: (end_day + 7 - current_wday);
|
||||
|
||||
// Adjust dates
|
||||
start_week.tm_mday -= days_back;
|
||||
@ -384,8 +423,8 @@ reload_for_new_week:
|
||||
goto reload_for_new_week;
|
||||
break;
|
||||
case 10: // ENTER
|
||||
json *atom = find_atom_by_indexes(resp_from_api, selected_cell.y,
|
||||
selected_cell.x, HourIdLookupTable);
|
||||
const json *atom = find_atom_by_indexes(
|
||||
resp_from_api, selected_cell.y, selected_cell.x, HourIdLookupTable);
|
||||
if (atom == nullptr) {
|
||||
std::cerr << RED "[ERROR]" << RESET " Selector at invalid position\n";
|
||||
safe_exit(129);
|
||||
@ -535,7 +574,7 @@ reload_for_new_week:
|
||||
}
|
||||
|
||||
void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
|
||||
json &resp_from_api) {
|
||||
const json &resp_from_api) {
|
||||
for (uint8_t i = 0; i < num_of_days; i++) {
|
||||
// this wont draw left boarder window making it so it looks partially
|
||||
// offscreen
|
||||
@ -549,8 +588,9 @@ void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
|
||||
}
|
||||
|
||||
void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
|
||||
uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
|
||||
json &resp_from_api) {
|
||||
uint16_t cell_width,
|
||||
const std::vector<uint8_t> &HourIdLookupTable,
|
||||
const json &resp_from_api) {
|
||||
for (uint8_t i = 0; i < num_of_columns; i++) {
|
||||
wborder(lesson_windows[i], 0, 0, ' ', 0, ACS_VLINE, ACS_VLINE, 0, 0);
|
||||
std::wstring caption;
|
||||
@ -594,11 +634,13 @@ void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
|
||||
void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
|
||||
uint16_t cell_width, uint16_t cell_height,
|
||||
std::vector<std::vector<WINDOW *>> &cells,
|
||||
std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api) {
|
||||
const std::vector<uint8_t> &HourIdLookupTable,
|
||||
const json &resp_from_api) {
|
||||
for (uint8_t i = 0; i < num_of_days; i++) {
|
||||
for (uint8_t j = 0; j < num_of_columns; j++) {
|
||||
|
||||
json *atom = find_atom_by_indexes(resp_from_api, i, j, HourIdLookupTable);
|
||||
const json *atom =
|
||||
find_atom_by_indexes(resp_from_api, i, j, HourIdLookupTable);
|
||||
if (atom == nullptr) {
|
||||
continue;
|
||||
}
|
||||
@ -612,20 +654,24 @@ void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
|
||||
hash_djb2a(atom->at("Change")["ChangeType"].get<std::string>())) {
|
||||
case "Canceled"_sh:
|
||||
case "Removed"_sh:
|
||||
wattron(cells[i][j], COLOR_PAIR(COLOR_GREEN));
|
||||
wattron(cells[i][j], COLOR_PAIR(REMOVED_COLOR_PAIR));
|
||||
box(cells[i][j], 0, 0);
|
||||
wattroff(cells[i][j], COLOR_PAIR(COLOR_GREEN));
|
||||
wattroff(cells[i][j], COLOR_PAIR(REMOVED_COLOR_PAIR));
|
||||
break;
|
||||
case "RoomChanged"_sh:
|
||||
case "Substitution"_sh:
|
||||
wattron(cells[i][j], COLOR_PAIR(COLOR_YELLOW));
|
||||
wattron(cells[i][j], COLOR_PAIR(ROOMCHANGED_COLOR_PAIR));
|
||||
box(cells[i][j], 0, 0);
|
||||
wattroff(cells[i][j], COLOR_PAIR(COLOR_YELLOW));
|
||||
wattroff(cells[i][j], COLOR_PAIR(ROOMCHANGED_COLOR_PAIR));
|
||||
break;
|
||||
case "Substitution"_sh:
|
||||
wattron(cells[i][j], COLOR_PAIR(SUBSTITUTION_COLOR_PAIR));
|
||||
box(cells[i][j], 0, 0);
|
||||
wattroff(cells[i][j], COLOR_PAIR(SUBSTITUTION_COLOR_PAIR));
|
||||
break;
|
||||
case "Added"_sh:
|
||||
wattron(cells[i][j], COLOR_PAIR(COLOR_BLUE));
|
||||
wattron(cells[i][j], COLOR_PAIR(ADDED_COLOR_PAIR));
|
||||
box(cells[i][j], 0, 0);
|
||||
wattroff(cells[i][j], COLOR_PAIR(COLOR_BLUE));
|
||||
wattroff(cells[i][j], COLOR_PAIR(ADDED_COLOR_PAIR));
|
||||
break;
|
||||
default:
|
||||
// TODO add error handling
|
||||
|
@ -3,6 +3,7 @@
|
||||
#define _ba_ty_hg_
|
||||
|
||||
#include <istream>
|
||||
#include <menu.h>
|
||||
struct Config {
|
||||
bool verbose = false;
|
||||
bool ignoressl = false;
|
||||
@ -144,4 +145,11 @@ struct SelectorType {
|
||||
: x(xArg, min_limit_x, max_limit_x), y(yArg, min_limit_y, max_limit_y) {}
|
||||
};
|
||||
|
||||
struct complete_menu {
|
||||
WINDOW *win;
|
||||
ITEM **items;
|
||||
size_t items_size;
|
||||
MENU *menu;
|
||||
};
|
||||
|
||||
#endif
|
Loading…
x
Reference in New Issue
Block a user