version 0.8

This reverts commit 50ef8d9fda.

Makefile

@@ -1,7 +1,7 @@
 # Compiler and flags
 CPPC = g++
-CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
+CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
-DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
+DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
 
 
 SRC_PATH := src
@@ -29,7 +29,7 @@ $(BIN_PATH)/bakatui: $(OBJ_FILES)
 	$(CPPC) $(CPPC_FLAGS) $^ -o $@
 
 
-$(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp
+$(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp $(SRC_PATH)/%.h
 	$(CPPC) $(CPPC_FLAGS) -c $< -o $@
 
 

src/const.h

@@ -1,7 +1,7 @@
 #include <string_view>
 #ifndef VERSION
 
-#define VERSION "0.7.2"
+#define VERSION "0.8"
 #define NAME "bakatui"
 
 inline constexpr auto hash_djb2a(const std::string_view sv) {

src/helper_funcs.cpp

@@ -3,6 +3,7 @@
 #include "main.h"
 #include "memory.h"
 #include "net.h"
+#include <algorithm>
 #include <codecvt>
 #include <csignal>
 #include <curses.h>
@@ -12,6 +13,7 @@
 #include <iostream>
 #include <locale>
 #include <panel.h>
+#include <regex>
 #include <string>
 #include <termios.h>
 #include <unistd.h>
@@ -199,7 +201,7 @@ std::wstring wrm_tr_le_whitespace(const std::wstring &s) {
 }
 
 // Conversion utilities
-char *wchar_to_char(wchar_t *src) {
+char *wchar_to_char(const wchar_t *src) {
   if (!src)
     return nullptr;
 
@@ -210,7 +212,7 @@ char *wchar_to_char(wchar_t *src) {
   return dest;
 }
 
-wchar_t *char_to_wchar(char *src) {
+wchar_t *char_to_wchar(const char *src) {
   if (!src)
     return nullptr;
 
@@ -242,3 +244,29 @@ void move_panel_relative(PANEL *panel, int dy, int dx) {
 
   move_panel(panel, new_y, new_x);
 }
+
+std::string html_to_string(std::string html) {
+  { // fix new lines
+    const std::string search = "<br />";
+    const std::string replace = "\n";
+
+    size_t pos = 0;
+    while ((pos = html.find(search, pos)) != std::string::npos) {
+      html.replace(pos, search.length(), replace);
+      pos += replace.length();
+    }
+  }
+
+  {
+    std::regex linkPattern("<a\\s+href=[\"'](.*?)[\"'](.*?)>(.*?)</a>");
+    html = std::regex_replace(html, linkPattern,
+                              "\033]8;;$1\033\\$3\033]8;;\033\\");
+  }
+
+  {
+    std::regex tag("<[^>]*>");
+    html = std::regex_replace(html, tag, "");
+  }
+
+  return html;
+}

src/helper_funcs.h

@@ -27,10 +27,12 @@ void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
 std::wstring wrm_tr_le_whitespace(const std::wstring &s);
 
 // Conversion utilities
-char *wchar_to_char(wchar_t *src);
+char *wchar_to_char(const wchar_t *src);
-wchar_t *char_to_wchar(char *src);
+wchar_t *char_to_wchar(const char *src);
 
 std::wstring string_to_wstring(const std::string &str);
 std::string wstring_to_string(const std::wstring &wstr);
 
+std::string html_to_string(std::string html);
+
 #endif

src/komens.cpp

@@ -0,0 +1,172 @@
+#include "komens.h"
+#include "helper_funcs.h"
+#include "memory.h"
+#include "net.h"
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <curses.h>
+#include <cwchar>
+#include <menu.h>
+#include <nlohmann/json.hpp>
+#include <string>
+#include <vector>
+
+#define WIN_HIGHT 40
+#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 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 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);
+  }
+
+  /* Initialize curses */
+  setlocale(LC_ALL, "");
+  initscr();
+  start_color();
+  cbreak();
+  noecho();
+  keypad(stdscr, TRUE);
+
+  /* Initialize all the colors */
+  for (uint8_t i = 0; i < 8; i++) {
+    init_pair(i, i, COLOR_BLACK);
+  }
+  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});
+
+  char **title_bufs = new char *[num_of_komens];
+  char **name_bufs = new char *[num_of_komens];
+  size_t max_item_lenght;
+  {
+    size_t max_title_lenght = 0;
+    size_t max_name_lenght = 0;
+    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));
+
+      tmp_lenght =
+          resp_from_api["Messages"][i]["Title"].get<std::string>().length();
+
+      if (tmp_lenght > max_title_lenght) {
+        max_title_lenght = tmp_lenght;
+      }
+
+      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));
+
+      tmp_lenght = resp_from_api["Messages"][i]["Sender"]["Name"]
+                       .get<std::string>()
+                       .length();
+
+      if (tmp_lenght > max_name_lenght) {
+        max_name_lenght = tmp_lenght;
+      }
+
+      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]);
+    }
+    max_item_lenght = 3 + max_title_lenght + 1 + max_name_lenght;
+  }
+  komens_items[num_of_komens] = nullptr;
+
+  MENU *komens_choise_menu = new_menu(komens_items);
+  komens_allocated.push_back({MENU_TYPE, komens_choise_menu, 1});
+
+  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});
+
+  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_mark(komens_choise_menu, " * ");
+
+  box(komens_choise_menu_win, 0, 0);
+
+  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);
+
+  post_menu(komens_choise_menu);
+  wrefresh(komens_choise_menu_win);
+
+  WINDOW *content_window =
+      newwin(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);
+
+  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();
+
+  int c;
+  while ((c = getch()) != KEY_F(1)) {
+    switch (c) {
+    case KEY_DOWN:
+    case KEY_NPAGE:
+    case 'j':
+      menu_driver(komens_choise_menu, REQ_DOWN_ITEM);
+      break;
+
+    case KEY_UP:
+    case KEY_PPAGE:
+    case 'k':
+      menu_driver(komens_choise_menu, REQ_UP_ITEM);
+      break;
+    }
+    insert_content(content_window, item_index(current_item(komens_choise_menu)),
+                   resp_from_api);
+    wrefresh(content_window);
+    wrefresh(komens_choise_menu_win);
+  }
+  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());
+}

src/komens.h

@@ -0,0 +1,9 @@
+#ifndef _ba_ko_hg_
+#define _ba_ko_hg_
+enum koment_type {
+  RECEIVED,
+  SEND,
+  NOTICEBOARD,
+};
+void komens_page(koment_type type);
+#endif

src/komens_menu.cpp

@@ -0,0 +1,106 @@
+#include "komens_menu.h"
+#include "helper_funcs.h"
+#include "komens.h"
+#include "net.h"
+#include <cstdlib>
+#include <cstring>
+#include <curses.h>
+#include <menu.h>
+
+void komens_menu() {
+  wchar_t *choices[] = {
+      L"received", L"sent", L"noticeboard", L"Exit", nullptr,
+  };
+
+  ITEM **my_items;
+  int c;
+  MENU *my_menu;
+  WINDOW *my_menu_win;
+  int n_choices, i;
+
+  /* Initialize curses */
+  setlocale(LC_ALL, "");
+  initscr();
+  start_color();
+  cbreak();
+  noecho();
+  keypad(stdscr, TRUE);
+  init_pair(1, COLOR_RED, COLOR_BLACK);
+  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]));
+
+  /* Crate menu */
+  my_menu = new_menu((ITEM **)my_items);
+
+  /* Create the window to be associated with the menu */
+  my_menu_win = newwin(12, 40, 4, 4);
+  keypad(my_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 mark to the string " * " */
+  set_menu_mark(my_menu, " * ");
+
+  /* Print a border around the main window and print a title */
+  box(my_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);
+
+  /* Post the menu */
+  post_menu(my_menu);
+  wrefresh(my_menu_win);
+
+  attron(COLOR_PAIR(2));
+  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(2));
+  refresh();
+
+  while ((c = getch()) != KEY_F(1)) {
+    switch (c) {
+    case KEY_DOWN:
+    case KEY_NPAGE:
+    case 'j':
+      menu_driver(my_menu, REQ_DOWN_ITEM);
+      break;
+
+    case KEY_UP:
+    case KEY_PPAGE:
+    case 'k':
+      menu_driver(my_menu, REQ_UP_ITEM);
+      break;
+    case 10: // ENTER
+      clear();
+      if (item_index(current_item(my_menu)) == n_choices - 1) {
+        goto close_menu;
+      }
+      komens_page(static_cast<koment_type>(item_index(current_item(my_menu))));
+      pos_menu_cursor(my_menu);
+      refresh();
+      wrefresh(my_menu_win);
+      break;
+    }
+    wrefresh(my_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]);
+  endwin();
+}

src/komens_menu.h

@@ -0,0 +1,6 @@
+#ifndef _ba_km_hg_
+#define _ba_km_hg_
+
+void komens_menu();
+
+#endif

src/main_menu.cpp

@@ -1,24 +1,20 @@
 #include "helper_funcs.h"
+#include "komens_menu.h"
+#include "marks.h"
 #include "net.h"
 #include "timetable.h"
-#include <cstddef>
 #include <cstdlib>
 #include <cstring>
 #include <curses.h>
 #include <menu.h>
 
-#include "marks.h"
+void main_menu() {
-
-#define CTRLD 4
-
   wchar_t *choices[] = {
       L"login",    L"Marks",   L"timetable", L"Komens",
-    L"Homework", L"Absence", L"Exit",      (wchar_t *)NULL,
+      L"Homework", L"Absence", L"Exit",      nullptr,
   };
-void (*choicesFuncs[])() = {nullptr, marks_page, timetable_page, nullptr,
+  void (*choicesFuncs[])() = {nullptr, marks_page, timetable_page, komens_menu,
                               nullptr, nullptr,    nullptr,        nullptr};
-
-void main_menu() {
   ITEM **my_items;
   int c;
   MENU *my_menu;
@@ -79,19 +75,21 @@ void main_menu() {
   while ((c = getch()) != KEY_F(1)) {
     switch (c) {
     case KEY_DOWN:
-      menu_driver(my_menu, REQ_DOWN_ITEM);
-      break;
-    case KEY_UP:
-      menu_driver(my_menu, REQ_UP_ITEM);
-      break;
     case KEY_NPAGE:
+    case 'j':
       menu_driver(my_menu, REQ_DOWN_ITEM);
       break;
+
+    case KEY_UP:
     case KEY_PPAGE:
+    case 'k':
       menu_driver(my_menu, REQ_UP_ITEM);
       break;
     case 10: // ENTER
       clear();
+      if (item_index(current_item(my_menu)) == n_choices - 1) {
+        goto close_menu;
+      }
       choicesFuncs[item_index(current_item(my_menu))]();
       pos_menu_cursor(my_menu);
       refresh();
@@ -100,6 +98,7 @@ void main_menu() {
     }
     wrefresh(my_menu_win);
   }
+close_menu:
 
   /* Unpost and free all the memory taken up */
   unpost_menu(my_menu);

src/marks.cpp

@@ -40,7 +40,7 @@ void marks_page() {
   json resp_from_api;
   {
     std::string endpoint = "api/3/marks";
-    resp_from_api = bakaapi::get_data_from_endpoint(endpoint);
+    resp_from_api = bakaapi::get_data_from_endpoint(endpoint, GET);
   }
   size_t size_my_wins = resp_from_api["Subjects"].size();
   WINDOW **my_wins = new (std::nothrow) WINDOW *[size_my_wins];

src/memory.cpp

@@ -26,6 +26,14 @@ void delete_all(std::vector<allocation> *allocated) {
       delete[] panels;
       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[] items;
+      break;
+    }
     case GENERIC_ARRAY:
       delete[] static_cast<char *>(allocated->at(i).ptr);
       break;
@@ -35,6 +43,9 @@ void delete_all(std::vector<allocation> *allocated) {
     case PANEL_TYPE:
       del_panel(static_cast<PANEL *>(allocated->at(i).ptr));
       break;
+    case MENU_TYPE:
+      free_menu(static_cast<MENU *>(allocated->at(i).ptr));
+      break;
     case GENERIC_TYPE:
       delete static_cast<char *>(allocated->at(i).ptr);
       break;

src/memory.h

@@ -3,13 +3,16 @@
 #define _ba_me_hg_
 
 #include <cstddef>
+#include <menu.h>
 #include <vector>
 enum AllocationType {
   WINDOW_ARRAY,
   PANEL_ARRAY,
+  ITEM_ARRAY,
   GENERIC_ARRAY,
   WINDOW_TYPE,
   PANEL_TYPE,
+  MENU_TYPE,
   GENERIC_TYPE
 };
 

src/net.cpp

@@ -20,12 +20,6 @@
 
 using nlohmann::json;
 
-// metods
-enum metod {
-  GET,
-  POST,
-};
-
 std::string access_token;
 
 CURL *curl = curl_easy_init();
@@ -159,7 +153,7 @@ void is_access_token_empty() {
 }
 
 // supports all endpoints that only require access_token
-json get_data_from_endpoint(std::string &endpoint,
+json get_data_from_endpoint(const std::string &endpoint, metod metod,
                             std::string additional_data) {
   is_access_token_empty();
 access_token_refreshed:
@@ -169,7 +163,7 @@ access_token_refreshed:
     req_data.append(std::format("&{}", additional_data));
   }
 
-  auto [response, http_code] = send_curl_request(endpoint, GET, req_data);
+  auto [response, http_code] = send_curl_request(endpoint, metod, req_data);
 
   if (http_code != 200) {
     refresh_access_token();

src/net.h

@@ -5,12 +5,19 @@
 #ifndef _ba_ne_hg_
 #define _ba_ne_hg_
 
+// metods
+enum metod {
+  GET,
+  POST,
+};
+
 using nlohmann::json;
 
 extern CURL *curl;
 namespace bakaapi {
 void login(std::string username, std::string password);
 void refresh_access_token();
-json get_data_from_endpoint(std::string &endpoint, std::string data = "");
+json get_data_from_endpoint(const std::string &endpoint, metod metod,
+                            std::string additional_data = "");
 } // namespace bakaapi
 #endif

src/timetable.cpp

@@ -100,7 +100,8 @@ reload_for_new_week:
   std::string date_string = "date=" + date_stringstream.str();
   std::string endpoint = "api/3/timetable/actual";
 
-  json resp_from_api = bakaapi::get_data_from_endpoint(endpoint, date_string);
+  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
   // it sorts the hours by start time