src/helper_funcs.cpp

@@ -1,7 +1,5 @@
 #include "helper_funcs.h"
 #include "color.h"
-#include "main.h"
-#include "memory.h"
 #include "net.h"
 #include <codecvt>
 #include <csignal>
@@ -15,9 +13,7 @@
 #include <string>
 #include <termios.h>
 #include <unistd.h>
-#include <vector>
+#include "main.h"
-
-std::vector<allocation> *current_allocated;
 
 void safe_exit(int code) {
   switch (code) {
@@ -42,7 +38,6 @@ void safe_exit(int code) {
   default:
     break;
   }
-  delete_all(current_allocated);
 
   curl_easy_cleanup(curl);
   endwin();
@@ -158,10 +153,8 @@ void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
   wattron(win, color);
   if (mvwaddwstr(win, y, x, string) == ERR) {
     if(config.verbose){
-      std::wcerr << RED "[ERROR]" << RESET " wprint_in_middle failed to print "
+    std::wcerr << RED"[ERROR]"<< RESET" wprint_in_middle failed to print " << string << "\n";
-                 << string << "\n";
+  }}
-    }
-  }
   wattroff(win, color);
   refresh();
 }

src/helper_funcs.h

@@ -1,14 +1,10 @@
-#include "memory.h"
 #include <curses.h>
 #include <string>
-#include <vector>
 
 // header guard
 #ifndef _ba_hf_hg_
 #define _ba_hf_hg_
 
-extern std::vector<allocation> *current_allocated;
-
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 void safe_exit(int code);

src/marks.cpp

@@ -1,6 +1,5 @@
 #include "marks.h"
 #include "helper_funcs.h"
-#include "memory.h"
 #include "net.h"
 #include <algorithm>
 #include <cstddef>
@@ -13,7 +12,6 @@
 #include <nlohmann/json.hpp>
 #include <panel.h>
 #include <string>
-#include <vector>
 
 using nlohmann::json;
 
@@ -29,26 +27,23 @@ using nlohmann::json;
 
 #define DEFAULT_PADDING 4
 
-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 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);
   }
+  WINDOW **my_wins;
   size_t size_my_wins = resp_from_api["Subjects"].size();
-  WINDOW **my_wins = new (std::nothrow) WINDOW *[size_my_wins];
+  my_wins = new (std::nothrow) WINDOW *[size_my_wins];
-  marks_allocated.push_back({WINDOW_ARRAY, my_wins, size_my_wins});
 
+  PANEL **my_panels;
   size_t size_my_panels = resp_from_api["Subjects"].size();
-  PANEL **my_panels = new (std::nothrow) PANEL *[size_my_panels];
+  my_panels = new (std::nothrow) PANEL *[size_my_panels];
-  marks_allocated.push_back({PANEL_ARRAY, my_panels, size_my_panels});
 
   // trows compiler warning for some reason but cannot be removed
   PANEL *top;
@@ -71,9 +66,7 @@ void marks_page() {
 
   // store all original window position
   int *original_y = new int[size_my_wins];
-  marks_allocated.push_back({GENERIC_ARRAY, original_y, size_my_wins});
   int *original_x = new int[size_my_wins];
-  marks_allocated.push_back({GENERIC_ARRAY, original_x, size_my_wins});
   for (size_t i = 0; i < size_my_wins; ++i) {
     getbegyx(my_wins[i], original_y[i], original_x[i]);
   }
@@ -128,7 +121,10 @@ void marks_page() {
   // Cleanup
   endwin();
   clear();
-  delete_all(&marks_allocated);
+  delete[] my_wins;
+  delete[] my_panels;
+  delete[] original_y;
+  delete[] original_x;
 }
 
 /* Put all the windows */
@@ -157,9 +153,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
              wsub_name.c_str(), wsub_avg_s.c_str());
 
     size_t max_text_length = wcslen(label);
-    for (unsigned int j = 0; j < static_cast<unsigned int>(
+    for (unsigned int j = 0; j < static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()); j++) {
-                                     marks_json["Subjects"][i]["Marks"].size());
-         j++) {
       std::string caption =
           rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Caption"]);
       std::string theme =
@@ -184,10 +178,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
       MaxHight = 0;
     }
 
-    if (static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()) *
+    if (static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()) * 2 + DEFAULT_PADDING > MaxHight) {
-                2 +
-            DEFAULT_PADDING >
-        MaxHight) {
       MaxHight =
           marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING;
     }
@@ -206,8 +197,7 @@ 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) {
   
-  // is the compiler smoking weed or something, why is it thinking starty is not
+  // is the compiler smoking weed or something, why is it thinking starty is not used ??
-  // used ??
   int startx, starty;
 
   wresize(win, height, width);

src/memory.cpp

@@ -1,45 +0,0 @@
-#include "memory.h"
-#include "color.h"
-#include <iostream>
-#include <ncurses.h>
-#include <panel.h>
-
-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;
-      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;
-      break;
-    }
-    case GENERIC_ARRAY:
-      delete[] static_cast<char *>(allocated->at(i).ptr);
-      break;
-    case WINDOW_TYPE:
-      delwin(static_cast<WINDOW *>(allocated->at(i).ptr));
-      break;
-    case PANEL_TYPE:
-      del_panel(static_cast<PANEL *>(allocated->at(i).ptr));
-      break;
-    case GENERIC_TYPE:
-      delete static_cast<char *>(allocated->at(i).ptr);
-      break;
-    default:
-      std::cerr << RED "[!!CRITICAL!!]" << RESET " Unknown allocation type"
-                << "\n";
-      break;
-    }
-    allocated->pop_back();
-  }
-}

src/memory.h

@@ -1,23 +0,0 @@
-// header guard
-#ifndef _ba_me_hg_
-#define _ba_me_hg_
-
-#include <cstddef>
-#include <vector>
-enum AllocationType {
-  WINDOW_ARRAY,
-  PANEL_ARRAY,
-  GENERIC_ARRAY,
-  WINDOW_TYPE,
-  PANEL_TYPE,
-  GENERIC_TYPE
-};
-
-struct allocation {
-  AllocationType type;
-  void *ptr;
-  std::size_t size;
-};
-
-void delete_all(std::vector<allocation> *allocated);
-#endif

src/net.cpp

@@ -21,7 +21,7 @@
 using nlohmann::json;
 
 // metods
-enum metod {
+enum {
   GET,
   POST,
 };
@@ -38,8 +38,8 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
   return totalSize;
 }
 
-std::tuple<std::string, int> send_curl_request(std::string endpoint, metod type,
+std::tuple<std::string, int>
-                                               std::string req_data) {
+send_curl_request(std::string endpoint, uint8_t type, std::string req_data) {
   std::string response;
   std::string url = baka_api_url + endpoint;
   if (type == GET) {
@@ -121,6 +121,8 @@ void login(std::string username, std::string password) {
   json resp_parsed = json::parse(response);
 
   access_token = resp_parsed["access_token"];
+
+
 }
 
 void refresh_access_token() {
@@ -137,6 +139,7 @@ void refresh_access_token() {
                   "token&refresh_token={}",
                   refresh_token);
 
+ 
   auto [response, http_code] = send_curl_request("api/login", POST, req_data);
   if (http_code != 200) {
     std::cerr << RED "[ERROR] " << RESET << http_code
@@ -159,8 +162,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(std::string &endpoint, std::string additional_data) {
-                            std::string additional_data) {
   is_access_token_empty();
   access_token_refreshed:
   std::string req_data =

src/timetable.cpp

@@ -2,7 +2,6 @@
 #include "color.h"
 #include "const.h"
 #include "helper_funcs.h"
-#include "memory.h"
 #include "net.h"
 #include "types.h"
 #include <bits/chrono.h>
@@ -21,13 +20,13 @@
 #include <sys/types.h>
 #include <vector>
 
+
+
 using nlohmann::json;
 #define BOTTOM_PADDING 5
 
 #define DEFAULT_OFFSET 3
 
-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"};
 
@@ -88,19 +87,20 @@ json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
 }
 
 void timetable_page() {
-  current_allocated = &timetable_allocated;
 	auto dateSelected = std::chrono::system_clock::now();
   reload_for_new_week:
 	std::time_t date_time_t = std::chrono::system_clock::to_time_t(dateSelected);
  	std::tm local_time = *std::localtime(&date_time_t);
   
+
 	std::stringstream date_stringstream;
 	date_stringstream << std::put_time(&local_time, "%Y-%m-%d");
 
 	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, date_string);
 
   // this may be unnecessary but i dont have enaugh data to test it
   // it sorts the hours by start time
@@ -111,8 +111,6 @@ reload_for_new_week:
 
     Id_and_Start_time *temp_hour_sorting_array =
         new Id_and_Start_time[resp_from_api["Hours"].size()];
-    timetable_allocated.push_back({GENERIC_ARRAY, temp_hour_sorting_array,
-                                   resp_from_api["Hours"].size()});
 
     for (uint8_t i = 0; i < resp_from_api["Hours"].size(); i++) {
       temp_hour_sorting_array[i] = std::make_tuple(
@@ -157,7 +155,6 @@ reload_for_new_week:
     }
 
     delete[] temp_hour_sorting_array;
-    timetable_allocated.pop_back();
   }
 
   // some lambda dark magic
@@ -197,11 +194,7 @@ reload_for_new_week:
   const uint16_t cell_height = (LINES - BOTTOM_PADDING) / num_of_days;
 
   WINDOW **day_windows = new WINDOW *[num_of_days];
-  timetable_allocated.push_back({WINDOW_ARRAY, day_windows, num_of_days});
-
   WINDOW **lesson_windows = new WINDOW *[num_of_columns];
-  timetable_allocated.push_back({WINDOW_ARRAY, lesson_windows, num_of_columns});
-
   std::vector<std::vector<WINDOW *>> cells(
       num_of_days, std::vector<WINDOW *>(num_of_columns));
 
@@ -263,11 +256,7 @@ reload_for_new_week:
 
       selector_windows[i] =
           newwin(1, 1, DEFAULT_OFFSET + y_offset, DEFAULT_OFFSET + x_offset);
-      timetable_allocated.push_back({WINDOW_TYPE, selector_windows[i], 1});
-
       selector_panels[i] = new_panel(selector_windows[i]);
-      timetable_allocated.push_back({PANEL_TYPE, selector_panels[i], 1});
-
       wattron(selector_windows[i], COLOR_PAIR(COLOR_RED));
       mvwaddch(selector_windows[i], 0, 0, corners[i]);
       wattroff(selector_windows[i], COLOR_PAIR(COLOR_RED));
@@ -275,8 +264,7 @@ 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 "
+           "Arrows/hjkl to select | ENTER to show info | p/n to select weeks |F1 to exit");
-           "|F1 to exit");
   {
     std::tm end_week = local_time;
 std::tm start_week = local_time; 
@@ -286,9 +274,7 @@ reload_for_new_week:
 
 // Get days of week from API (1-7 format where Monday is 1)
 uint8_t start_day = resp_from_api["Days"][0]["DayOfWeek"].get<uint8_t>();
-    uint8_t end_day =
+uint8_t end_day = resp_from_api["Days"][resp_from_api["Days"].size() - 1]["DayOfWeek"].get<uint8_t>();
-        resp_from_api["Days"][resp_from_api["Days"].size() - 1]["DayOfWeek"]
-            .get<uint8_t>();
 
 // Calculate days back to start day (handles week wraparound)
 int days_back = (current_wday >= start_day) 
@@ -296,7 +282,8 @@ reload_for_new_week:
                 : (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)
+int days_forward = (current_wday <= end_day) 
+                  ? (end_day - current_wday) 
                   : (end_day + 7 - current_wday);
 
 // Adjust dates
@@ -313,12 +300,9 @@ reload_for_new_week:
 end_week_strstream << std::put_time(&end_week, "%d.%m.%Y");
 
 // kern. developer approved ↓↓
-    mvprintw(LINES - 2,
+mvprintw(LINES - 2, COLS - (start_week_strstream.str().length() + 3 + end_week_strstream.str().length()), 
-             COLS - (start_week_strstream.str().length() + 3 +
+         "%s", (start_week_strstream.str() + " - " + end_week_strstream.str()).c_str());
-                     end_week_strstream.str().length()),
+
-             "%s",
-             (start_week_strstream.str() + " - " + end_week_strstream.str())
-                 .c_str());
   }
   attroff(COLOR_PAIR(COLOR_BLUE));
 
@@ -376,10 +360,11 @@ reload_for_new_week:
       selected_cell.x++;
       break;
     case 'p':
+      dateSelected = dateSelected - std::chrono::days(7);
+      goto reload_for_new_week;
+    break;
     case 'n':
-      (ch == 'p') ? dateSelected = dateSelected - std::chrono::days(7)
+      dateSelected = dateSelected + std::chrono::days(7);
-                  : dateSelected = dateSelected + std::chrono::days(7);
-      delete_all(&timetable_allocated);
       goto reload_for_new_week;
     break;
     case 10: // ENTER
@@ -528,8 +513,8 @@ reload_for_new_week:
       }
     }
   }
-  delete_all(&timetable_allocated);
+  delete[] day_windows;
-  clear();
+  delete[] lesson_windows;
   endwin();
 }