Skip to content

Commit

Permalink
(#15) Basic support for adding new entry
Browse files Browse the repository at this point in the history 
Needs more error checking
  • Loading branch information
@Nykseli
Nykseli committed Aug 30, 2020
1 parent 464244f commit 7655e0d
Show file tree
Hide file tree
Showing 3 changed files with 228 additions and 28 deletions.
25 changes: 25 additions & 0 deletions src/database.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#include <assert.h>
#include <fcntl.h>
#include <stdbool.h>
#include <stdint.h>
Expand Down Expand Up @@ -124,6 +125,30 @@ int teledb_delete_entry(int index)
return 0;
}

// TODO: fail error?
void teledb_add_page(char* page, char* desc)
{
size_t page_len = strlen(page);
size_t desc_len = strlen(desc);
assert(page_len == DB_PAGE_NUM_LEN);
assert(desc_len <= DB_DESCRIPT_LEN);

// Make sure that we are adding the page to the newest db data
entries = teledb_load_data();

tele_entry te;
te.page_num_size = page_len;
te.descript_size = desc_len;
memcpy(te.page_num, page, page_len);
te.page_num[page_len] = '\0';
memcpy(te.descript, desc, desc_len);
te.descript[desc_len] = '\0';

entries.db_entries = realloc(entries.db_entries, sizeof(tele_entry) * (entries.db_count + 1));
entries.db_entries[entries.db_count] = te;
entries.db_count++;
}

/**
* Move the data entry up or down.
* First entry cannot be moved up and last cannot be moved down.
Expand Down
11 changes: 8 additions & 3 deletions src/database.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <stdint.h>

/* Maximum length of the description db field*/
/* Maximum length of the description db field */
#define DB_DESCRIPT_LEN 40
/* Maximum length of the page_num db field*/
/* Maximum length of the page_num db field */
#define DB_PAGE_NUM_LEN 3

typedef struct {
Expand All @@ -33,13 +33,18 @@ typedef enum {
/* Load data from database */
tele_entries teledb_load_data();

/*
/**
* Delete database entry based on index. Starting from 0.
*
* Return -1 if delete failed, 0 if successfull
*/
int teledb_delete_entry(int index);

/**
* Add a new entry to the database
*/
void teledb_add_page(char* page, char* desc);

/**
* Move the data entry up or down.
* First entry cannot be moved up and last cannot be moved down.
Expand Down
220 changes: 195 additions & 25 deletions src/drawer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,29 @@ typedef enum {

static navigation nav_links;

typedef enum {
EDIT_ENTRY_NONE,
EDIT_ENTRY_PAGE,
EDIT_ENTRY_DESC,
HIGHLIGHT_ENTRY_NONE,
HIGHLIGHT_ENTRY_PAGE,
HIGHLIGHT_ENTRY_DESC,
} edit_entry_select;

typedef struct {
char page[DB_PAGE_NUM_LEN + 1];
int page_size;
char desc[DB_DESCRIPT_LEN + 1];
int desc_size;
} edit_entry;

static edit_entry fav_edit = {
.page_size = 0,
.desc_size = 0,
.page = "\0",
.desc = "\0",
};

static void search_mode(drawer* drawer, html_parser* parser);
static void load_link(drawer* drawer, html_parser* parser, bool add_history);

Expand Down Expand Up @@ -214,6 +237,24 @@ static void escape_text(char* src, char* target, size_t src_len)
target[targeti] = '\0';
}

static void set_link_color_on(drawer* drawer, bool highlight)
{
if (drawer->color_support) {
wattron(drawer->window, LINK_COLOR);
if (highlight)
wattron(drawer->window, A_REVERSE);
}
}

static void set_link_color_off(drawer* drawer, bool highlight)
{
if (drawer->color_support) {
wattroff(drawer->window, LINK_COLOR);
if (highlight)
wattroff(drawer->window, A_REVERSE);
}
}

static void draw_to_drawer(drawer* drawer, char* text)
{
char escape_buf[256];
Expand All @@ -231,19 +272,11 @@ static void draw_link_item(drawer* drawer, html_link link)
highlight = hlight.start_x == drawer->current_x && hlight.start_y == drawer->current_y;
}

if (drawer->color_support) {
wattron(drawer->window, LINK_COLOR);
if (highlight)
wattron(drawer->window, A_REVERSE);
}
set_link_color_on(drawer, highlight);

draw_to_drawer(drawer, html_link_text(link));

if (drawer->color_support) {
wattroff(drawer->window, LINK_COLOR);
if (highlight)
wattroff(drawer->window, A_REVERSE);
}
set_link_color_off(drawer, highlight);
}

static void add_link_highlight(drawer* drawer, html_link link)
Expand Down Expand Up @@ -650,7 +683,8 @@ void search_mode(drawer* drawer, html_parser* parser)
refresh();
}

static void favourite_mode(drawer* drawer, html_parser* parser, int highlight_id)
// TODO: Draw maximum amount (10?) of entries per page
static void favourite_listing_mode(drawer* drawer, html_parser* parser, int highlight_id)
{
// First clear the window
wclear(drawer->window);
Expand All @@ -661,23 +695,15 @@ static void favourite_mode(drawer* drawer, html_parser* parser, int highlight_id
drawer->current_x = middle_startx();
drawer->current_y = 2;

// TODO: way to select and load a favourite page. Show them as links?
tele_entries entries = teledb_load_data();
for (int i = 0; i < entries.db_count; i++) {
tele_entry te = entries.db_entries[i];
bool highlight = highlight_id == (int)i;
if (drawer->color_support) {
wattron(drawer->window, LINK_COLOR);
if (highlight)
wattron(drawer->window, A_REVERSE);
}
bool highlight = highlight_id == i;

set_link_color_on(drawer, highlight);
mvwprintw(drawer->window, drawer->current_y, drawer->current_x, te.page_num);
set_link_color_off(drawer, highlight);

if (drawer->color_support) {
wattroff(drawer->window, LINK_COLOR);
if (highlight)
wattroff(drawer->window, A_REVERSE);
}
// ncurses is abit unreliable with \t so use spaces instead
mvwprintw(drawer->window, drawer->current_y, drawer->current_x + DB_PAGE_NUM_LEN, " %s", te.descript);
drawer->current_y++;
Expand All @@ -686,6 +712,7 @@ static void favourite_mode(drawer* drawer, html_parser* parser, int highlight_id
// Refresh to show the new text
wrefresh(drawer->window);

// TODO: way to modify/edit the selected link
int fav = -1;
while (true) {
short c = getch();
Expand Down Expand Up @@ -751,7 +778,148 @@ static void favourite_mode(drawer* drawer, html_parser* parser, int highlight_id
else if (fav == -2)
load_link(drawer, parser, true);
else
favourite_mode(drawer, parser, fav);
favourite_listing_mode(drawer, parser, fav);
}

static void add_favourite_mode(drawer* drawer, html_parser* parser, edit_entry_select select)
{

// Spaces between the number and desc editing fields
int padding = 8;
// First clear the window
wclear(drawer->window);
mvprintw(0, 0, " ");
mvprintw(0, 0, "Press q to return");

// Then draw the add editing fields
drawer->current_x = middle_startx();

// Draw the page field
drawer->current_y = 2;
if (select == EDIT_ENTRY_PAGE || select == HIGHLIGHT_ENTRY_PAGE)
set_link_color_on(drawer, true);

// Draw the text
mvwprintw(drawer->window, drawer->current_y, drawer->current_x, fav_edit.page);
// Draw the highlighting to show how much space there is to edit
for (int i = fav_edit.page_size; i < DB_PAGE_NUM_LEN; i++) {
int x = drawer->current_x + i;
mvwprintw(drawer->window, drawer->current_y, x, " ");
}

if (select == EDIT_ENTRY_PAGE || select == HIGHLIGHT_ENTRY_PAGE)
set_link_color_off(drawer, true);

// Draw the description field
if (select == EDIT_ENTRY_DESC || select == HIGHLIGHT_ENTRY_DESC)
set_link_color_on(drawer, true);

// Draw the text
mvwprintw(drawer->window, drawer->current_y, drawer->current_x + DB_PAGE_NUM_LEN + padding, fav_edit.desc);
// Draw the highlighting to show how much space there is to edit
for (int i = fav_edit.desc_size; i < DB_DESCRIPT_LEN; i++) {
int x = drawer->current_x + i + DB_PAGE_NUM_LEN + padding;
mvwprintw(drawer->window, drawer->current_y, x, " ");
}
if (select == EDIT_ENTRY_DESC || select == HIGHLIGHT_ENTRY_DESC)
set_link_color_off(drawer, true);

// Draw lines to indicate where the text fields are
drawer->current_y++;
for (int i = 0; i < DB_PAGE_NUM_LEN; i++) {
int x = drawer->current_x + i;
mvwprintw(drawer->window, drawer->current_y, x, "_");
}
for (int i = 0; i < DB_DESCRIPT_LEN; i++) {
int x = drawer->current_x + i + DB_PAGE_NUM_LEN + padding;
mvwprintw(drawer->window, drawer->current_y, x, "_");
}

wrefresh(drawer->window);

bool exit = false;
while (true) {
short c = getch();
if (select == EDIT_ENTRY_DESC) {
if (c == '\n') {
select = HIGHLIGHT_ENTRY_DESC;
break;
}

// Remove letter
if (c == KEY_BACKSPACE) {
if (fav_edit.desc_size > 0) {
fav_edit.desc_size--;
fav_edit.desc[fav_edit.desc_size] = '\0';
}
break;
}

// Make sure whe don't add too many numbers
if (fav_edit.page_size >= DB_DESCRIPT_LEN)
continue;

fav_edit.desc[fav_edit.desc_size++] = c;
fav_edit.desc[fav_edit.desc_size] = '\0';
break;
} else if (select == EDIT_ENTRY_PAGE) {
if (c == '\n') {
select = HIGHLIGHT_ENTRY_PAGE;
break;
}

// Remove letter
if (c == KEY_BACKSPACE) {
if (fav_edit.page_size > 0) {
fav_edit.page_size--;
fav_edit.page[fav_edit.page_size] = '\0';
}
break;
}

// Page can only contain 0-9
if (c < '0' || c > '9')
continue;
// Make sure whe don't add too many numbers
if (fav_edit.page_size >= DB_PAGE_NUM_LEN)
continue;

fav_edit.page[fav_edit.page_size++] = c;
fav_edit.page[fav_edit.page_size] = '\0';
break;
} else {
if (c == 'l' || c == 'h') {
select = select == HIGHLIGHT_ENTRY_PAGE ? HIGHLIGHT_ENTRY_DESC : HIGHLIGHT_ENTRY_PAGE;
break;
} else if (c == 'q') {
exit = true;
break;
} else if (c == '\n') {
if (select == HIGHLIGHT_ENTRY_DESC) {
select = EDIT_ENTRY_DESC;
break;
} else if (select == HIGHLIGHT_ENTRY_PAGE) {
select = EDIT_ENTRY_PAGE;
break;
}
} else if (c == 's') {
// TODO: report error if page is not exaclty 3 numbers
teledb_add_page(fav_edit.page, fav_edit.desc);
teledb_commit_data();
fav_edit.desc[0] = '\0';
fav_edit.desc_size = 0;
fav_edit.page[0] = '\0';
fav_edit.page_size = 0;
exit = true;
break;
}
}
}

if (!exit)
add_favourite_mode(drawer, parser, select);
else
redraw_parser(drawer, parser, true, false);
}

void main_draw_loop(drawer* drawer, html_parser* parser)
Expand Down Expand Up @@ -801,7 +969,9 @@ void main_draw_loop(drawer* drawer, html_parser* parser)
} else if (c == 's') {
search_mode(drawer, parser);
} else if (c == 'f') {
favourite_mode(drawer, parser, -1);
favourite_listing_mode(drawer, parser, -1);
} else if (c == 'a') {
add_favourite_mode(drawer, parser, EDIT_ENTRY_NONE);
}
}
}
Expand Down

0 comments on commit 7655e0d

Please sign in to comment.