Compare commits
No commits in common. "6e573ab99279503eb8de48afcf564661f4fabf2a" and "4c0abe5464c671f8c3ed6f888c83d1cbe8066af1" have entirely different histories.
6e573ab992
...
4c0abe5464
11
Makefile
11
Makefile
@ -1,7 +1,8 @@
|
||||
# Compiler and flags
|
||||
CPPC = g++
|
||||
CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
|
||||
DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
|
||||
# Debug flags:
|
||||
# CPPC_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
|
||||
|
||||
|
||||
SRC_PATH := src
|
||||
@ -10,18 +11,16 @@ BIN_PATH := build/bin
|
||||
|
||||
|
||||
SRC_FILES := $(shell find $(SRC_PATH) -name '*.cpp')
|
||||
# Generate corresponding object file paths by replacing src/ with build/obj/
|
||||
OBJ_FILES := $(patsubst $(SRC_PATH)/%.cpp,$(OBJ_PATH)/%.o,$(SRC_FILES))
|
||||
|
||||
|
||||
all: make-build-dir $(BIN_PATH)/bakatui
|
||||
|
||||
|
||||
debug: CPPC_FLAGS = $(DEBUG_FLAGS)
|
||||
debug: make-build-dir $(BIN_PATH)/bakatui
|
||||
|
||||
|
||||
make-build-dir:
|
||||
mkdir -p $(OBJ_PATH)
|
||||
mkdir -p $(OBJ_PATH)/marks
|
||||
mkdir -p $(BIN_PATH)
|
||||
|
||||
|
||||
@ -36,4 +35,4 @@ $(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp
|
||||
clean:
|
||||
rm -fr build
|
||||
|
||||
.PHONY: all clean install debug
|
||||
.PHONY: all clean install
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include <string_view>
|
||||
#ifndef VERSION
|
||||
|
||||
#define VERSION "0.7"
|
||||
#define VERSION "0.6"
|
||||
#define NAME "bakatui"
|
||||
|
||||
inline constexpr auto hash_djb2a(const std::string_view sv) {
|
||||
|
||||
@ -23,17 +23,15 @@ using nlohmann::json;
|
||||
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);
|
||||
void draw_days(WINDOW**& day_windows, uint16_t cell_height,uint8_t num_of_days, 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);
|
||||
void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable, 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);
|
||||
std::vector<uint8_t> &HourIdLookupTable,
|
||||
json &resp_from_api);
|
||||
|
||||
uint8_t hour_id_to_index(const std::vector<uint8_t> &HourIdLookupTable,
|
||||
uint8_t id) {
|
||||
@ -81,8 +79,7 @@ json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
|
||||
|
||||
void timetable_page() {
|
||||
// DONT FORGET TO UNCOMMENT
|
||||
json resp_from_api =
|
||||
bakaapi::get_data_from_endpoint("api/3/timetable/actual");
|
||||
json resp_from_api = bakaapi::get_data_from_endpoint("api/3/timetable/actual");
|
||||
/*std::ifstream f("test-data/timetable.json");
|
||||
json resp_from_api = json::parse(f);*/
|
||||
|
||||
@ -187,17 +184,14 @@ void timetable_page() {
|
||||
day_windows[i] = newwin(cell_height, DEFAULT_OFFSET,
|
||||
i * cell_height + DEFAULT_OFFSET, 0);
|
||||
}
|
||||
draw_days(day_windows, cell_height,num_of_days, resp_from_api);
|
||||
|
||||
|
||||
// init cell windows
|
||||
for (uint8_t i = 0; i < num_of_columns; i++) {
|
||||
lesson_windows[i] =
|
||||
newwin(DEFAULT_OFFSET, cell_width, 0, i * cell_width + DEFAULT_OFFSET);
|
||||
}
|
||||
draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable,
|
||||
resp_from_api);
|
||||
// days have to be drawn after lessons for some reason i actualy have no idea
|
||||
// why
|
||||
draw_days(day_windows, cell_height, num_of_days, resp_from_api);
|
||||
draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable, resp_from_api);
|
||||
|
||||
// init the cell windows
|
||||
for (uint8_t i = 0; i < num_of_days; i++) {
|
||||
@ -267,9 +261,8 @@ void timetable_page() {
|
||||
refresh();
|
||||
|
||||
// Redraw everithing
|
||||
draw_days(day_windows, cell_height, num_of_days, resp_from_api);
|
||||
draw_lessons(lesson_windows, num_of_columns, cell_width,
|
||||
HourIdLookupTable, resp_from_api);
|
||||
draw_days(day_windows, cell_height,num_of_days, resp_from_api);
|
||||
draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable, resp_from_api);
|
||||
draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
|
||||
HourIdLookupTable, resp_from_api);
|
||||
|
||||
@ -336,14 +329,14 @@ void timetable_page() {
|
||||
}
|
||||
}
|
||||
|
||||
std::wstring Teacher = L"";
|
||||
std::wstring Teacher= L"";
|
||||
try {
|
||||
Teacher = get_data_for_atom(resp_from_api, atom, "Teachers",
|
||||
"TeacherId", "Name");
|
||||
} catch (...) {
|
||||
} catch(...) {
|
||||
__asm__("nop");
|
||||
}
|
||||
Teacher.insert(0, L"Teacher: ");
|
||||
Teacher.insert(0,L"Teacher: ");
|
||||
|
||||
std::wstring Groups = L"";
|
||||
try {
|
||||
@ -365,31 +358,28 @@ void timetable_page() {
|
||||
Groups = wrm_tr_le_whitespace(Groups);
|
||||
Groups.insert(0, L"Groups: ");
|
||||
|
||||
std::wstring Room = L"";
|
||||
std::wstring Room= L"";
|
||||
try {
|
||||
Room =
|
||||
get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
|
||||
if (Room.empty()) {
|
||||
Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId",
|
||||
"Abbrev");
|
||||
;
|
||||
Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
|
||||
if(Room.empty()) {
|
||||
Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Abbrev");;
|
||||
}
|
||||
} catch (...) {
|
||||
__asm__("nop");
|
||||
}
|
||||
Room.insert(0, L"Room: ");
|
||||
|
||||
std::wstring Theme = L"";
|
||||
std::wstring Theme= L"";
|
||||
try {
|
||||
Theme = wrm_tr_le_whitespace(
|
||||
string_to_wstring(atom->at("Theme").get<std::string>()));
|
||||
Theme = wrm_tr_le_whitespace(string_to_wstring(atom->at("Theme").get<std::string>()));
|
||||
} catch (...) {
|
||||
__asm__("nop");
|
||||
}
|
||||
Theme.insert(0, L"Theme: ");
|
||||
|
||||
wprint_in_middle(infobox_window, 1, 0, getmaxx(infobox_window),
|
||||
Caption.c_str(), COLOR_PAIR(COLOR_CYAN));
|
||||
wprint_in_middle(
|
||||
infobox_window, 1, 0, getmaxx(infobox_window), Caption.c_str(),
|
||||
COLOR_PAIR(COLOR_CYAN));
|
||||
|
||||
// printing out of order to reduce wattro* directives
|
||||
wattron(infobox_window, COLOR_PAIR(COLOR_YELLOW));
|
||||
@ -402,6 +392,8 @@ void timetable_page() {
|
||||
mvwaddwstr(infobox_window, 6, 1, Theme.c_str());
|
||||
wattroff(infobox_window, COLOR_PAIR(COLOR_CYAN));
|
||||
|
||||
|
||||
|
||||
top_panel(infobox_panel);
|
||||
update_panels();
|
||||
doupdate();
|
||||
@ -430,8 +422,8 @@ void timetable_page() {
|
||||
DEFAULT_OFFSET + y_offset + selected_cell.y * cell_height,
|
||||
DEFAULT_OFFSET + x_offset + selected_cell.x * cell_width);
|
||||
}
|
||||
draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
|
||||
HourIdLookupTable, resp_from_api);
|
||||
draw_cells(num_of_columns, num_of_days, cell_width, cell_height,
|
||||
cells, HourIdLookupTable, resp_from_api);
|
||||
update_panels();
|
||||
doupdate();
|
||||
|
||||
@ -446,23 +438,18 @@ void timetable_page() {
|
||||
endwin();
|
||||
}
|
||||
|
||||
void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
|
||||
json &resp_from_api) {
|
||||
void draw_days(WINDOW**& day_windows, uint16_t cell_height,uint8_t num_of_days, 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
|
||||
wborder(day_windows[i], ' ', 0, 0, 0, ACS_HLINE, 0, ACS_HLINE, 0);
|
||||
|
||||
mvwaddwstr(
|
||||
day_windows[i], cell_height / 2, 0,
|
||||
day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()]);
|
||||
mvwaddwstr(day_windows[i], cell_height / 2, 0,day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()]);
|
||||
wrefresh(day_windows[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
|
||||
uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
|
||||
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) {
|
||||
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;
|
||||
@ -493,12 +480,12 @@ void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
|
||||
|
||||
hour_id_found:
|
||||
|
||||
wprint_in_middle(lesson_windows[i], 0, 0, cell_width, caption.c_str(),
|
||||
COLOR_PAIR(0));
|
||||
wprint_in_middle(lesson_windows[i], 0, 0, cell_width,
|
||||
caption.c_str(), COLOR_PAIR(0));
|
||||
mvwaddwstr(lesson_windows[i], 1, 1, start_time.c_str());
|
||||
print_in_middle(lesson_windows[i], 1, 0, cell_width, "-", COLOR_PAIR(0));
|
||||
mvwaddwstr(lesson_windows[i], 1, cell_width - end_time.length() - 1,
|
||||
end_time.c_str());
|
||||
print_in_middle(lesson_windows[i], 1, 0, cell_width, "-",
|
||||
COLOR_PAIR(0));
|
||||
mvwaddwstr(lesson_windows[i], 1, cell_width - end_time.length() - 1, end_time.c_str());
|
||||
wrefresh(lesson_windows[i]);
|
||||
}
|
||||
}
|
||||
@ -506,7 +493,8 @@ 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) {
|
||||
std::vector<uint8_t> &HourIdLookupTable,
|
||||
json &resp_from_api) {
|
||||
for (uint8_t i = 0; i < num_of_days; i++) {
|
||||
for (uint8_t j = 0; j < num_of_columns; j++) {
|
||||
|
||||
@ -574,11 +562,12 @@ void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
|
||||
__asm__("nop");
|
||||
}
|
||||
|
||||
wprint_in_middle(cells[i][j], cell_height / 2, 0, cell_width,
|
||||
Subject_Abbrev.c_str(), COLOR_PAIR(0));
|
||||
wprint_in_middle(cells[i][j], cell_height / 2,
|
||||
0,
|
||||
cell_width, Subject_Abbrev.c_str(),
|
||||
COLOR_PAIR(0));
|
||||
mvwaddwstr(cells[i][j], cell_height - 2,
|
||||
cell_width - wcslen(Room_Abbrev.c_str()) - 1,
|
||||
Room_Abbrev.c_str());
|
||||
cell_width - wcslen(Room_Abbrev.c_str()) - 1, Room_Abbrev.c_str());
|
||||
|
||||
mvwaddwstr(cells[i][j], cell_height - 2, 1, Teacher_Abbrev.c_str());
|
||||
wrefresh(cells[i][j]);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user