Compare commits
16 Commits
v0.1
...
a6ff11ff71
| Author | SHA1 | Date | |
|---|---|---|---|
| a6ff11ff71 | |||
| 87c2e2e01c | |||
| 98b6b8df7e | |||
| 0d11dbec32 | |||
| 4f852161aa | |||
| 50447ac8cd | |||
| d81876f527 | |||
| 05d3819d56 | |||
| 6985b21d37 | |||
| 4ba8710a71 | |||
| bd01b506f0 | |||
| 4c383fce4c | |||
| 86b9ea812d | |||
| 0119429514 | |||
| 025c51c3ad | |||
| 1a882baab6 |
@@ -4,3 +4,4 @@ compile_commands.json
|
|||||||
core*
|
core*
|
||||||
build
|
build
|
||||||
test-data
|
test-data
|
||||||
|
log
|
||||||
@@ -3,3 +3,6 @@
|
|||||||
|
|
||||||
> ### Dependencies:
|
> ### Dependencies:
|
||||||
> [nlohmann-json](https://github.com/nlohmann/json)
|
> [nlohmann-json](https://github.com/nlohmann/json)
|
||||||
|
|
||||||
|
> [!IMPORTANT]
|
||||||
|
> Only marks work right now
|
||||||
@@ -1,3 +1,7 @@
|
|||||||
|
|
||||||
|
// Header guard
|
||||||
|
#ifndef RESET
|
||||||
|
|
||||||
#define RESET "\033[0m"
|
#define RESET "\033[0m"
|
||||||
#define BLACK "\033[30m" /* Black */
|
#define BLACK "\033[30m" /* Black */
|
||||||
#define RED "\033[31m" /* Red */
|
#define RED "\033[31m" /* Red */
|
||||||
@@ -15,3 +19,5 @@
|
|||||||
#define BOLDMAGENTA "\033[1m\033[35m" /* Bold Magenta */
|
#define BOLDMAGENTA "\033[1m\033[35m" /* Bold Magenta */
|
||||||
#define BOLDCYAN "\033[1m\033[36m" /* Bold Cyan */
|
#define BOLDCYAN "\033[1m\033[36m" /* Bold Cyan */
|
||||||
#define BOLDWHITE "\033[1m\033[37m" /* Bold White */
|
#define BOLDWHITE "\033[1m\033[37m" /* Bold White */
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#ifndef VERSION
|
||||||
|
|
||||||
|
#define VERSION "0.5"
|
||||||
|
#define NAME "bakatui"
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#include "const.h"
|
||||||
|
#include <iostream>
|
||||||
|
#include "helper_funcs.h"
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
|
void PrintHelp() {
|
||||||
|
std::cout << "Usage: " << NAME << " [OPTIONS]" << "\n"
|
||||||
|
<< "-h Show this help menu\n"
|
||||||
|
<< "-V Show version\n"
|
||||||
|
<< "-v verbose mode\n"
|
||||||
|
<< "-L Force new login\n"
|
||||||
|
<< "-S Ignore SSL cert validity\n";
|
||||||
|
safe_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintVersion() {
|
||||||
|
std::cout << NAME" " << VERSION"\n" << "License GPLv3: GNU GPL version 3 <https://gnu.org/licenses/gpl.html>.\n";
|
||||||
|
safe_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DeleteLogin(std::string savedir_path) {
|
||||||
|
std::remove((savedir_path + "/authfile").c_str());
|
||||||
|
std::remove((savedir_path + "/urlfile").c_str());
|
||||||
|
}
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
#include <string>
|
||||||
|
// header guard
|
||||||
|
#ifndef _ba_fl_hg_
|
||||||
|
#define _ba_fl_hg_
|
||||||
|
|
||||||
|
void PrintHelp();
|
||||||
|
void PrintVersion();
|
||||||
|
void DeleteLogin(std::string savedir_path);
|
||||||
|
|
||||||
|
#endif
|
||||||
+56
-27
@@ -8,6 +8,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include "color.h"
|
||||||
|
|
||||||
void safe_exit(int code) {
|
void safe_exit(int code) {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
@@ -26,7 +27,7 @@ void safe_exit(int code) {
|
|||||||
|
|
||||||
case SIGSEGV:
|
case SIGSEGV:
|
||||||
std::cerr << "\nreceived SIGSEGV(segmentaiton fault) exiting...\nIf this "
|
std::cerr << "\nreceived SIGSEGV(segmentaiton fault) exiting...\nIf this "
|
||||||
"repeats please report it as bug\n";
|
"repeats please report it as a bug\n";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@@ -34,6 +35,7 @@ void safe_exit(int code) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
curl_easy_cleanup(curl);
|
curl_easy_cleanup(curl);
|
||||||
|
endwin();
|
||||||
|
|
||||||
exit(code);
|
exit(code);
|
||||||
}
|
}
|
||||||
@@ -42,35 +44,45 @@ std::string bool_to_string(bool bool_in) { return bool_in ? "true" : "false"; }
|
|||||||
|
|
||||||
std::string SoRAuthFile(bool save, std::string data) {
|
std::string SoRAuthFile(bool save, std::string data) {
|
||||||
|
|
||||||
std::string savedir_path = std::getenv("HOME");
|
std::string home = std::getenv("HOME");
|
||||||
savedir_path.append("/.local/share/bakatui");
|
if (home.empty()) {
|
||||||
|
std::cerr << RED "[ERROR] " RESET << "HOME environment variable not set.\n";
|
||||||
|
safe_exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
DIR *savedir = opendir(savedir_path.c_str());
|
std::string savedir_path = home;
|
||||||
if (savedir) {
|
savedir_path.append("/.local/share/bakatui");
|
||||||
/* Directory exists. */
|
|
||||||
closedir(savedir);
|
|
||||||
} else if (ENOENT == errno) {
|
|
||||||
/* Directory does not exist. */
|
|
||||||
std::filesystem::create_directories(savedir_path);
|
|
||||||
} else {
|
|
||||||
/* opendir() failed for some other reason. */
|
|
||||||
std::cerr << "cannot access ~/.local/share/bakatui\n";
|
|
||||||
safe_exit(100);
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string authfile_path = std::string(savedir_path) + "/auth";
|
|
||||||
|
|
||||||
if (save) {
|
if (!std::filesystem::exists(savedir_path)) {
|
||||||
std::ofstream authfile(authfile_path);
|
if (!std::filesystem::create_directories(savedir_path)) {
|
||||||
authfile << data;
|
std::cerr << RED "[ERROR] " RESET << "Failed to create directory: " << savedir_path << "\n";
|
||||||
authfile.close();
|
safe_exit(EXIT_FAILURE);
|
||||||
return "";
|
}
|
||||||
} else {
|
}
|
||||||
std::ifstream authfile(authfile_path);
|
|
||||||
authfile >> data;
|
std::string authfile_path = savedir_path + "/auth";
|
||||||
authfile.close();
|
|
||||||
return data;
|
if (save) {
|
||||||
}
|
std::ofstream authfile(authfile_path);
|
||||||
|
if (!authfile.is_open()) {
|
||||||
|
std::cerr << RED "[ERROR] " RESET << "Failed to open auth file for writing.\n";
|
||||||
|
safe_exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
authfile << data;
|
||||||
|
authfile.close();
|
||||||
|
return "";
|
||||||
|
} else {
|
||||||
|
std::ifstream authfile(authfile_path);
|
||||||
|
if (!authfile.is_open()) {
|
||||||
|
std::cerr << RED "[ERROR] " RESET << "Failed to open auth file for reading.\n";
|
||||||
|
safe_exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
data.assign((std::istreambuf_iterator<char>(authfile)),
|
||||||
|
std::istreambuf_iterator<char>());
|
||||||
|
authfile.close();
|
||||||
|
return data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void get_input_and_login() {
|
void get_input_and_login() {
|
||||||
@@ -110,3 +122,20 @@ void print_in_middle(WINDOW *win, int starty, int startx, int width,
|
|||||||
wattroff(win, color);
|
wattroff(win, color);
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const std::string WHITESPACE = " \n\r\t\f\v";
|
||||||
|
|
||||||
|
std::string ltrim(const std::string &s) {
|
||||||
|
size_t start = s.find_first_not_of(WHITESPACE);
|
||||||
|
return (start == std::string::npos) ? "" : s.substr(start);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string rtrim(const std::string &s) {
|
||||||
|
size_t end = s.find_last_not_of(WHITESPACE);
|
||||||
|
return (end == std::string::npos) ? "" : s.substr(0, end + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string rm_tr_le_whitespace(const std::string &s) {
|
||||||
|
return rtrim(ltrim(s));
|
||||||
|
}
|
||||||
@@ -1,8 +1,16 @@
|
|||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
// header guard
|
||||||
|
#ifndef _ba_hf_hg_
|
||||||
|
#define _ba_hf_hg_
|
||||||
|
|
||||||
void safe_exit(int code);
|
void safe_exit(int code);
|
||||||
std::string bool_to_string(bool bool_in);
|
std::string bool_to_string(bool bool_in);
|
||||||
std::string SoRAuthFile(bool save, std::string data);
|
std::string SoRAuthFile(bool save, std::string data);
|
||||||
void get_input_and_login();
|
void get_input_and_login();
|
||||||
void print_in_middle(WINDOW *win, int starty, int startx, int width,
|
void print_in_middle(WINDOW *win, int starty, int startx, int width,
|
||||||
char *string, chtype color);
|
char *string, chtype color);
|
||||||
|
std::string rm_tr_le_whitespace(const std::string &s);
|
||||||
|
|
||||||
|
#endif
|
||||||
+20
-5
@@ -2,9 +2,9 @@
|
|||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include "helper_funcs.h"
|
#include "helper_funcs.h"
|
||||||
#include "main_menu.h"
|
#include "main_menu.h"
|
||||||
#include "marks.h"
|
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
|
#include <cstdlib>
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
@@ -12,9 +12,13 @@
|
|||||||
#include <regex>
|
#include <regex>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include "flags.h"
|
||||||
|
#include "types.h"
|
||||||
|
|
||||||
std::string baka_api_url;
|
std::string baka_api_url;
|
||||||
|
|
||||||
|
Config config;
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
// signal handlers
|
// signal handlers
|
||||||
signal(SIGTERM, safe_exit);
|
signal(SIGTERM, safe_exit);
|
||||||
@@ -25,12 +29,23 @@ int main(int argc, char **argv) {
|
|||||||
// error signal handlers
|
// error signal handlers
|
||||||
signal(SIGSEGV, safe_exit);
|
signal(SIGSEGV, safe_exit);
|
||||||
|
|
||||||
marks_page();
|
|
||||||
/*
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
std::string savedir_path = std::getenv("HOME");
|
std::string savedir_path = std::getenv("HOME");
|
||||||
savedir_path.append("/.local/share/bakatui");
|
savedir_path.append("/.local/share/bakatui");
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::string urlfile_path = std::string(savedir_path) + "/url";
|
std::string urlfile_path = std::string(savedir_path) + "/url";
|
||||||
std::ifstream urlfile;
|
std::ifstream urlfile;
|
||||||
urlfile.open(urlfile_path);
|
urlfile.open(urlfile_path);
|
||||||
@@ -64,6 +79,6 @@ int main(int argc, char **argv) {
|
|||||||
get_input_and_login();
|
get_input_and_login();
|
||||||
}
|
}
|
||||||
main_menu();
|
main_menu();
|
||||||
*/
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,11 @@
|
|||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "types.h"
|
||||||
|
// header guard
|
||||||
|
#ifndef _ba_ma_hg_
|
||||||
|
#define _ba_ma_hg_
|
||||||
|
|
||||||
extern std::string baka_api_url;
|
extern std::string baka_api_url;
|
||||||
|
extern Config config;
|
||||||
|
|
||||||
|
#endif
|
||||||
+10
-5
@@ -6,13 +6,18 @@
|
|||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#include <menu.h>
|
#include <menu.h>
|
||||||
|
|
||||||
|
#include "marks.h"
|
||||||
|
|
||||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
||||||
#define CTRLD 4
|
#define CTRLD 4
|
||||||
|
|
||||||
char *choices[] = {
|
char *choices[] = {
|
||||||
"login", "Grades", "shedule", "Komens",
|
"login", "Marks", "timetable", "Komens",
|
||||||
"Homework", "Absence", "Exit", (char *)NULL,
|
"Homework", "Absence", "Exit", (char *)NULL,
|
||||||
};
|
};
|
||||||
|
void (*choicesFuncs[])() = {
|
||||||
|
nullptr, marks_page, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
|
||||||
|
};
|
||||||
|
|
||||||
void main_menu() {
|
void main_menu() {
|
||||||
ITEM **my_items;
|
ITEM **my_items;
|
||||||
@@ -85,11 +90,11 @@ void main_menu() {
|
|||||||
menu_driver(my_menu, REQ_UP_ITEM);
|
menu_driver(my_menu, REQ_UP_ITEM);
|
||||||
break;
|
break;
|
||||||
case 10: // ENTER
|
case 10: // ENTER
|
||||||
move(20, 0);
|
clear();
|
||||||
clrtoeol();
|
choicesFuncs[item_index(current_item(my_menu))]();
|
||||||
mvprintw(20, 0, "Item selected is : %s",
|
|
||||||
item_name(current_item(my_menu)));
|
|
||||||
pos_menu_cursor(my_menu);
|
pos_menu_cursor(my_menu);
|
||||||
|
refresh();
|
||||||
|
wrefresh(my_menu_win);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
wrefresh(my_menu_win);
|
wrefresh(my_menu_win);
|
||||||
|
|||||||
@@ -1 +1,7 @@
|
|||||||
|
// header guard
|
||||||
|
#ifndef _ba_mm_hg_
|
||||||
|
#define _ba_mm_hg_
|
||||||
|
|
||||||
void main_menu();
|
void main_menu();
|
||||||
|
|
||||||
|
#endif
|
||||||
+140
-45
@@ -1,13 +1,18 @@
|
|||||||
#include "marks.h"
|
#include "marks.h"
|
||||||
#include "helper_funcs.h"
|
#include "helper_funcs.h"
|
||||||
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#include <fstream>
|
#include <format>
|
||||||
|
#include <iostream>
|
||||||
#include <menu.h>
|
#include <menu.h>
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
#include <panel.h>
|
#include <panel.h>
|
||||||
|
#include <string>
|
||||||
|
#include <algorithm>
|
||||||
|
#include "net.h"
|
||||||
|
|
||||||
using nlohmann::json;
|
using nlohmann::json;
|
||||||
|
|
||||||
@@ -40,15 +45,20 @@ SOFTWARE.
|
|||||||
#define NLINES 10
|
#define NLINES 10
|
||||||
#define NCOLS 40
|
#define NCOLS 40
|
||||||
|
|
||||||
|
#define DEFAULT_X_OFFSET 10
|
||||||
|
#define DEFAULT_Y_OFFSET 2
|
||||||
|
|
||||||
|
#define DEFAULT_PADDING 4
|
||||||
|
|
||||||
void init_wins(WINDOW **wins, int n, json marks_json);
|
void init_wins(WINDOW **wins, int n, json marks_json);
|
||||||
void win_show(WINDOW *win, char *label, int label_color);
|
void win_show(WINDOW *win, char *label, int label_color, int width, int height,
|
||||||
|
json marks_json, int SubjectIndex);
|
||||||
|
|
||||||
void marks_page() {
|
void marks_page() {
|
||||||
|
|
||||||
// DONT FORGET TO UNCOMMENT
|
// DONT FORGET TO UNCOMMENT
|
||||||
// json resp_from_api = bakaapi::get_grades();
|
json resp_from_api = bakaapi::get_data_from_endpoint("api/3/marks");
|
||||||
std::ifstream f("test-data/marks2.json");
|
// std::ifstream f("test-data/marks3.json");
|
||||||
json resp_from_api = json::parse(f);
|
// json resp_from_api = json::parse(f);
|
||||||
|
|
||||||
WINDOW **my_wins;
|
WINDOW **my_wins;
|
||||||
size_t size_my_wins = resp_from_api["Subjects"].size();
|
size_t size_my_wins = resp_from_api["Subjects"].size();
|
||||||
@@ -69,46 +79,76 @@ void marks_page() {
|
|||||||
noecho();
|
noecho();
|
||||||
keypad(stdscr, TRUE);
|
keypad(stdscr, TRUE);
|
||||||
|
|
||||||
|
std::clog << COLS << " " << LINES << std::endl;
|
||||||
|
|
||||||
/* Initialize all the colors */
|
/* Initialize all the colors */
|
||||||
for (size_t i = 0; i < 8; i++) {
|
for (uint8_t i = 0; i < 8; i++) {
|
||||||
init_pair(i, i, COLOR_BLACK);
|
init_pair(i, i, COLOR_BLACK);
|
||||||
}
|
}
|
||||||
|
|
||||||
init_wins(my_wins, resp_from_api["Subjects"].size(), resp_from_api);
|
init_wins(my_wins, resp_from_api["Subjects"].size(), resp_from_api);
|
||||||
|
|
||||||
for (size_t i = 0; i < size_my_panels; i++) {
|
// store all original window position
|
||||||
/* Attach a panel to each window Order is bottom up */
|
int *original_y = new int[size_my_wins];
|
||||||
my_panels[i] = new_panel(my_wins[i]);
|
int *original_x = new int[size_my_wins];
|
||||||
|
for (size_t i = 0; i < size_my_wins; ++i) {
|
||||||
/* Set up the user pointers to the next panel */
|
getbegyx(my_wins[i], original_y[i], original_x[i]);
|
||||||
if ((i + 1) < size_my_panels) {
|
|
||||||
set_panel_userptr(my_panels[i], my_panels[(i + 1)]);
|
|
||||||
} else {
|
|
||||||
set_panel_userptr(my_panels[i], my_panels[0]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update the stacking order.
|
// Attach panels
|
||||||
update_panels();
|
for (size_t i = 0; i < size_my_panels; i++) {
|
||||||
|
my_panels[i] = new_panel(my_wins[i]);
|
||||||
|
set_panel_userptr(my_panels[i],
|
||||||
|
(i + 1 < size_my_panels) ? my_panels[i+1] : my_panels[0]);
|
||||||
|
}
|
||||||
|
|
||||||
/* Show it on the screen */
|
update_panels();
|
||||||
attron(COLOR_PAIR(4));
|
attron(COLOR_PAIR(4));
|
||||||
mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
|
mvprintw(LINES - 2, 0, "Arrows/j/k to scroll | F1 to exit | {mark} [weight]");
|
||||||
attroff(COLOR_PAIR(4));
|
attroff(COLOR_PAIR(4));
|
||||||
doupdate();
|
doupdate();
|
||||||
|
|
||||||
top = my_panels[2];
|
top = my_panels[size_my_panels - 1];
|
||||||
|
long y_offset = 0;
|
||||||
|
|
||||||
|
// Main loop
|
||||||
while ((ch = getch()) != KEY_F(1)) {
|
while ((ch = getch()) != KEY_F(1)) {
|
||||||
|
bool needs_update = false;
|
||||||
|
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 9:
|
case KEY_UP:
|
||||||
top = (PANEL *)panel_userptr(top);
|
case 'k': // Vim-style up
|
||||||
top_panel(top);
|
y_offset--;
|
||||||
break;
|
needs_update = true;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case KEY_DOWN:
|
||||||
|
case 'j': // Vim-style down
|
||||||
|
y_offset++;
|
||||||
|
needs_update = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update window positions if scrolled
|
||||||
|
if (needs_update) {
|
||||||
|
for (size_t i = 0; i < size_my_panels; ++i) {
|
||||||
|
int new_y = original_y[i] - y_offset;
|
||||||
|
int new_x = original_x[i];
|
||||||
|
move_panel(my_panels[i], new_y, new_x);
|
||||||
|
}
|
||||||
|
|
||||||
|
update_panels();
|
||||||
|
doupdate();
|
||||||
}
|
}
|
||||||
update_panels();
|
|
||||||
doupdate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
endwin();
|
endwin();
|
||||||
|
clear();
|
||||||
|
delete[] my_wins;
|
||||||
|
delete[] my_panels;
|
||||||
|
delete[] original_y;
|
||||||
|
delete[] original_x;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Put all the windows */
|
/* Put all the windows */
|
||||||
@@ -116,32 +156,62 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
|
|||||||
int x, y, i;
|
int x, y, i;
|
||||||
char label[1500];
|
char label[1500];
|
||||||
|
|
||||||
y = 2;
|
y = DEFAULT_Y_OFFSET;
|
||||||
x = 10;
|
x = DEFAULT_X_OFFSET;
|
||||||
uint8_t curent_color = 0;
|
uint8_t curent_color = 0;
|
||||||
for (i = 0; i < n; ++i) {
|
|
||||||
wins[i] = newwin(NLINES, NCOLS, y, x);
|
|
||||||
{
|
|
||||||
std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
|
|
||||||
std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
|
|
||||||
|
|
||||||
sprintf(label, "%s - avg: %s", sub_name.c_str(), sub_avg_s.c_str());
|
int MaxHight = 0;
|
||||||
|
// this loop true subjects
|
||||||
|
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"];
|
||||||
|
// DEBUG
|
||||||
|
// std::clog << BLUE"[LOG]" << RESET" procesing subject: " << sub_name << "\n";
|
||||||
|
std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
|
||||||
|
sprintf(label, "%s - avg: %s", sub_name.c_str(), sub_avg_s.c_str());
|
||||||
|
|
||||||
|
size_t max_text_length = strlen(label);
|
||||||
|
for (int j = 0; 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 = rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Theme"]);
|
||||||
|
caption = rm_tr_le_whitespace(caption);
|
||||||
|
theme = rm_tr_le_whitespace(theme);
|
||||||
|
max_text_length =
|
||||||
|
std::max({max_text_length, caption.length(), theme.length()});
|
||||||
}
|
}
|
||||||
curent_color++;
|
|
||||||
if (curent_color >= 7) {
|
int width = max_text_length + DEFAULT_PADDING;
|
||||||
curent_color = 1;
|
|
||||||
|
// hanndle windows overflowing off screen
|
||||||
|
if (x + width > COLS) {
|
||||||
|
x = DEFAULT_X_OFFSET;
|
||||||
|
y += MaxHight + 2;
|
||||||
|
MaxHight = 0;
|
||||||
}
|
}
|
||||||
win_show(wins[i], label, curent_color);
|
|
||||||
x += 40;
|
if (marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING >
|
||||||
|
MaxHight) {
|
||||||
|
MaxHight =
|
||||||
|
marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING;
|
||||||
|
}
|
||||||
|
|
||||||
|
wins[i] = newwin(NLINES, NCOLS, y, x);
|
||||||
|
win_show(wins[i], label, curent_color + 1, width,
|
||||||
|
marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING,
|
||||||
|
marks_json, i);
|
||||||
|
|
||||||
|
curent_color = (curent_color + 1) % 7;
|
||||||
|
x += width + 5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Show the window with a border and a label */
|
/* Show the window with a border and a label */
|
||||||
void win_show(WINDOW *win, char *label, int label_color) {
|
void win_show(WINDOW *win, char *label, int label_color, int width, int height,
|
||||||
int startx, starty, height, width;
|
json marks_json, int SubjectIndex) {
|
||||||
height = 20;
|
int startx, starty;
|
||||||
|
|
||||||
wresize(win, height, strlen(label) + 4);
|
wresize(win, height, width);
|
||||||
|
|
||||||
getbegyx(win, starty, startx);
|
getbegyx(win, starty, startx);
|
||||||
getmaxyx(win, height, width);
|
getmaxyx(win, height, width);
|
||||||
@@ -152,4 +222,29 @@ void win_show(WINDOW *win, char *label, int label_color) {
|
|||||||
mvwaddch(win, 2, width - 1, ACS_RTEE);
|
mvwaddch(win, 2, width - 1, ACS_RTEE);
|
||||||
|
|
||||||
print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
|
print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
|
||||||
|
|
||||||
|
char CaptionBuf[1500];
|
||||||
|
char ThemeBuf[1500];
|
||||||
|
std::string Caption;
|
||||||
|
int AdditionalOffset = 0;
|
||||||
|
for (size_t i = 0; i < marks_json["Subjects"][SubjectIndex]["Marks"].size();
|
||||||
|
i++) {
|
||||||
|
Caption = marks_json["Subjects"][SubjectIndex]["Marks"][i]["Caption"];
|
||||||
|
Caption = rm_tr_le_whitespace(Caption);
|
||||||
|
Caption.append(std::format(" - {{{}}} [{}]",
|
||||||
|
marks_json["Subjects"][SubjectIndex]["Marks"][i]["MarkText"]
|
||||||
|
.get<std::string>(),marks_json["Subjects"][SubjectIndex]["Marks"][i]["Weight"].get<int>()));
|
||||||
|
|
||||||
|
strncpy(CaptionBuf, Caption.c_str(), sizeof(CaptionBuf)-1);
|
||||||
|
print_in_middle(win, 3 + i + AdditionalOffset, 0, width, CaptionBuf,COLOR_PAIR(label_color));
|
||||||
|
|
||||||
|
strncpy(ThemeBuf,
|
||||||
|
rm_tr_le_whitespace(marks_json["Subjects"][SubjectIndex]["Marks"][i]["Theme"]
|
||||||
|
.get<std::string>())
|
||||||
|
.c_str(),
|
||||||
|
sizeof(ThemeBuf)-1);
|
||||||
|
print_in_middle(win, 3 + i + 1 + AdditionalOffset, 0, width, ThemeBuf,
|
||||||
|
COLOR_PAIR(label_color));
|
||||||
|
AdditionalOffset++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1 +1,5 @@
|
|||||||
|
// header guard
|
||||||
|
#ifndef _ba_mp_hg_
|
||||||
|
#define _ba_mp_hg_
|
||||||
void marks_page();
|
void marks_page();
|
||||||
|
#endif
|
||||||
+46
-14
@@ -2,6 +2,7 @@
|
|||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include "helper_funcs.h"
|
#include "helper_funcs.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include <cerrno>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
@@ -15,9 +16,18 @@
|
|||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
#include <nlohmann/json_fwd.hpp>
|
#include <nlohmann/json_fwd.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "const.h"
|
||||||
|
|
||||||
using nlohmann::json;
|
using nlohmann::json;
|
||||||
|
|
||||||
|
// metods
|
||||||
|
enum {
|
||||||
|
GET,
|
||||||
|
POST,
|
||||||
|
};
|
||||||
|
|
||||||
|
std::string access_token;
|
||||||
|
|
||||||
CURL *curl = curl_easy_init();
|
CURL *curl = curl_easy_init();
|
||||||
|
|
||||||
// Callback function to write data into a std::string
|
// Callback function to write data into a std::string
|
||||||
@@ -29,12 +39,17 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::tuple<std::string, int> send_curl_request(std::string endpoint,
|
std::tuple<std::string, int> send_curl_request(std::string endpoint,
|
||||||
std::string type,
|
uint8_t type,
|
||||||
std::string req_data) {
|
std::string req_data) {
|
||||||
std::string response;
|
std::string response;
|
||||||
std::string url = baka_api_url + endpoint;
|
std::string url = baka_api_url + endpoint;
|
||||||
|
if (type == GET) {
|
||||||
|
url.append("?" + req_data);
|
||||||
|
}
|
||||||
|
|
||||||
if (curl) {
|
if (curl) {
|
||||||
|
// DEBUG
|
||||||
|
// std::clog << BLUE"[LOG]" << RESET" sending to endpoint: " << url << "\n";
|
||||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
|
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
|
||||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||||
@@ -43,15 +58,24 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint,
|
|||||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
|
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
|
||||||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
|
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
|
||||||
|
|
||||||
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, req_data.c_str());
|
|
||||||
|
|
||||||
struct curl_slist *headers = NULL;
|
struct curl_slist *headers = NULL;
|
||||||
headers = curl_slist_append(
|
headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");
|
||||||
headers, "Content-Type: application/x-www-form-urlencoded");
|
headers = curl_slist_append(headers, std::format("User-Agent: bakatui/{}", VERSION).c_str());
|
||||||
|
|
||||||
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
||||||
|
|
||||||
if (type == "POST") {
|
switch (type) {
|
||||||
curl_easy_setopt(curl, CURLOPT_POST, 1L);
|
case GET:
|
||||||
|
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
|
||||||
|
break;
|
||||||
|
case POST:
|
||||||
|
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, req_data.c_str());
|
||||||
|
curl_easy_setopt(curl, CURLOPT_POST, 1L);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
std::cerr << RED "[ERROR] " << RESET "invalid metod\n";
|
||||||
|
safe_exit(EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@@ -63,21 +87,19 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint,
|
|||||||
int http_code = 0;
|
int http_code = 0;
|
||||||
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
|
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
|
||||||
|
|
||||||
curl_easy_cleanup(curl); // Cleanup
|
|
||||||
|
|
||||||
return {response, http_code};
|
return {response, http_code};
|
||||||
}
|
}
|
||||||
namespace bakaapi {
|
namespace bakaapi {
|
||||||
|
|
||||||
std::string access_token;
|
|
||||||
|
|
||||||
void login(std::string username, std::string password) {
|
void login(std::string username, std::string password) {
|
||||||
|
|
||||||
std::string req_data =
|
std::string req_data =
|
||||||
std::format("client_id=ANDR&grant_type=password&username={}&password={}",
|
std::format("client_id=ANDR&grant_type=password&username={}&password={}",
|
||||||
username, password);
|
username, password);
|
||||||
|
|
||||||
auto [response, http_code] = send_curl_request("api/login", "POST", req_data);
|
auto [response, http_code] = send_curl_request("api/login", POST, req_data);
|
||||||
if (http_code != 200) {
|
if (http_code != 200) {
|
||||||
std::cerr << RED "[ERROR] " << RESET << "login failed " << http_code
|
std::cerr << RED "[ERROR] " << RESET << "login failed " << http_code
|
||||||
<< " is non 200 response\n";
|
<< " is non 200 response\n";
|
||||||
@@ -106,6 +128,8 @@ void login(std::string username, std::string password) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void refresh_access_token() {
|
void refresh_access_token() {
|
||||||
|
// DEBUG
|
||||||
|
std::clog << "refreshing access token please wait...\n";
|
||||||
|
|
||||||
json authfile_parsed = json::parse(SoRAuthFile(false, ""));
|
json authfile_parsed = json::parse(SoRAuthFile(false, ""));
|
||||||
|
|
||||||
@@ -116,7 +140,9 @@ void refresh_access_token() {
|
|||||||
"token&refresh_token={}",
|
"token&refresh_token={}",
|
||||||
refresh_token);
|
refresh_token);
|
||||||
|
|
||||||
auto [response, http_code] = send_curl_request("api/login", "POST", req_data);
|
// DEBUG
|
||||||
|
std::clog << "calling send_curl_request() with folowing req_data\n" << req_data << std::endl;
|
||||||
|
auto [response, http_code] = send_curl_request("api/login", POST, req_data);
|
||||||
if (http_code != 200) {
|
if (http_code != 200) {
|
||||||
std::cerr << RED "[ERROR] " << RESET << http_code
|
std::cerr << RED "[ERROR] " << RESET << http_code
|
||||||
<< "is non 200 response\n";
|
<< "is non 200 response\n";
|
||||||
@@ -129,19 +155,25 @@ void refresh_access_token() {
|
|||||||
|
|
||||||
access_token = resp_parsed["access_token"];
|
access_token = resp_parsed["access_token"];
|
||||||
}
|
}
|
||||||
|
void is_access_token_empty() {
|
||||||
json get_grades() {
|
|
||||||
if(access_token.empty()) {
|
if(access_token.empty()) {
|
||||||
json authfile_parsed = json::parse(SoRAuthFile(false, ""));
|
json authfile_parsed = json::parse(SoRAuthFile(false, ""));
|
||||||
access_token = authfile_parsed["access_token"];
|
access_token = authfile_parsed["access_token"];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// supports all endpoints that only require access_token
|
||||||
|
json get_data_from_endpoint(std::string endpoint) {
|
||||||
|
is_access_token_empty();
|
||||||
std::string req_data =
|
std::string req_data =
|
||||||
std::format("Authorization=Bearer&access_token={}",
|
std::format("Authorization=Bearer&access_token={}",
|
||||||
access_token);
|
access_token);
|
||||||
|
|
||||||
auto [response, http_code] = send_curl_request("api/3/marks", "GET", req_data);
|
auto [response, http_code] = send_curl_request(endpoint, GET, req_data);
|
||||||
|
|
||||||
if(http_code != 200) {
|
if(http_code != 200) {
|
||||||
|
// DEBUG
|
||||||
|
std::clog << "Failed geting data from endpoint: " << endpoint << " code: " << http_code << "\nrequest: " << req_data <<"\nresponse: " << response << std::endl;
|
||||||
refresh_access_token();
|
refresh_access_token();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
// header guard
|
||||||
|
#ifndef _ba_ne_hg_
|
||||||
|
#define _ba_ne_hg_
|
||||||
|
|
||||||
using nlohmann::json;
|
using nlohmann::json;
|
||||||
|
|
||||||
@@ -8,5 +11,6 @@ extern CURL *curl;
|
|||||||
namespace bakaapi {
|
namespace bakaapi {
|
||||||
void login(std::string username, std::string password);
|
void login(std::string username, std::string password);
|
||||||
void refresh_access_token();
|
void refresh_access_token();
|
||||||
json get_grades();
|
json get_data_from_endpoint(std::string endpoint);
|
||||||
} // namespace bakaapi
|
} // namespace bakaapi
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
#include "timetable.h"
|
||||||
|
#include <cstdint>
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
|
#include "net.h"
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
using nlohmann::json;
|
||||||
|
|
||||||
|
#define NLINES 10
|
||||||
|
#define NCOLS 40
|
||||||
|
|
||||||
|
#define DEFAULT_X_OFFSET 10
|
||||||
|
#define DEFAULT_Y_OFFSET 2
|
||||||
|
|
||||||
|
#define DEFAULT_PADDING 4
|
||||||
|
|
||||||
|
void timetable_page() {
|
||||||
|
// DONT FORGET TO UNCOMMENT
|
||||||
|
// 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);
|
||||||
|
|
||||||
|
// calculate table size
|
||||||
|
|
||||||
|
uint8_t column_number = 0;
|
||||||
|
for(uint8_t i = 0; i < resp_from_api["Days"].size(); i++) {
|
||||||
|
(resp_from_api["Days"][i]["Atoms"].size() > column_number) ? (column_number = resp_from_api["Days"][i]["Atoms"].size());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// header guard
|
||||||
|
#ifndef _ba_ti_hg_
|
||||||
|
#define _ba_ti_hg_
|
||||||
|
|
||||||
|
void timetable_page();
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// header guard
|
||||||
|
#ifndef _ba_ty_hg_
|
||||||
|
#define _ba_ty_hg_
|
||||||
|
|
||||||
|
struct Config {
|
||||||
|
bool verbose = false;
|
||||||
|
bool ignoressl = false;
|
||||||
|
};
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user