anon/histui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

query situation solved

Browse Source
This commit is contained in:
anon
2024-08-15 13:25:54 +02:00
parent 4a3cf300cc
commit 7fe923bf8c
6 changed files with 53 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
documentation/TODO.md
View File

@ -1,6 +1,5 @@
+ scroll flashes
+ technical dept in tui.cpp -
+ fuzzy search is shit
+ resizing
+ man page
+ readme

3
source/argument_yy.y
View File

@ -1,6 +1,6 @@
%token HELP VERSION EXECUTE
%token TUI ENABLE
%token FUZZY CASELESS
%token FUZZY CASELESS GROUP
%{
#include <stdlib.h>
#include "cli.h"
@ -24,6 +24,7 @@ tui_args: %empty
| EXECUTE tui_args { do_execute = true; }
| FUZZY tui_args { is_fuzzy = true; }
| CASELESS tui_args { is_caseless = true; }
| GROUP tui_args { is_grouped = true; }
;
%%

3
source/cli.c
View File

@ -98,6 +98,9 @@ void parse_arguments(const int argc, const char * const * const argv) {
} else
if (!strcmp(argv[i], "--caseless")) {
tokens[token_empty_head++] = CASELESS;
} else
if (!strcmp(argv[i], "--group")) {
tokens[token_empty_head++] = GROUP;
} else {
tokens[token_empty_head++] = YYUNDEF;
}

41
source/queries.inc
View File

@ -1,41 +0,0 @@
static const char * const insert_entry_sql =
"INSERT INTO entries (stamp, data) VALUES (?, ?);"
;
static const char * const empty_query =
"SELECT * FROM entries "
"ORDER BY stamp DESC "
"LIMIT ? "
"OFFSET ?;"
;
static const char * const literal_query =
"SELECT * FROM entries "
"WHERE data GLOB CONCAT('*', ?, '*') "
"GROUP BY data "
"ORDER BY stamp DESC "
"LIMIT ? "
"OFFSET ?;"
;
static const char * const literal_caseless_query =
"SELECT * FROM entries "
"WHERE data LIKE CONCAT('%', ?, '%') "
"GROUP BY data "
"ORDER BY stamp DESC "
"LIMIT ? "
"OFFSET ?;"
;
static const char * const fuzzy_query =
"SELECT * FROM entries "
"WHERE BRAINDAMAGED_FUZZY_SEARCH(data, ?) "
"GROUP BY data "
"ORDER BY stamp DESC "
"LIMIT ? "
"OFFSET ?;"
;
static const char * const fuzzy_caseless_query =
"SELECT * FROM entries "
"WHERE BRAINDAMAGED_FUZZY_SEARCH(LOWER(data), LOWER(?)) "
"GROUP BY data "
"ORDER BY stamp DESC "
"LIMIT ? "
"OFFSET ?;"
;

69
source/storage.c
View File

@ -5,15 +5,14 @@
#include <string.h>
#include <sqlite3.h>
/* I would heavily prefer to not have dynamically generated SQL.
* This might became a scaling issue in the future tho,
* but untill then hardcoding will work.
*/
#include "queries.inc"
static const char * const * query_method;
#define SELECT "SELECT * FROM entries "
#define GROUP_SELECT "SELECT MAX(stamp), data FROM entries "
#define ORDERING "ORDER BY stamp DESC "
#define PAGING "LIMIT ? OFFSET ? "
bool is_fuzzy = false;
bool is_caseless = false;
bool is_grouped = false;
static sqlite3 * db = NULL;
@ -28,32 +27,58 @@ static sqlite3_stmt * query_stmt = NULL;
static sqlite3_stmt * empty_query_stmt = NULL;
static sqlite3_stmt * * stmt;
void braindamaged_fuzzy_search(sqlite3_context *context, [[maybe_unused]] int argc, sqlite3_value **argv);
void braindamaged_fuzzy_search(sqlite3_context * context, [[maybe_unused]] int argc, sqlite3_value * * argv);
int init_storage(void) {
// Create database
sqlite3_open(":memory:", &db);
sqlite3_create_function(db, "braindamaged_fuzzy_search", 2, SQLITE_ANY, 0, braindamaged_fuzzy_search, NULL, NULL);
static const char * sql_create_table = "CREATE TABLE entries (stamp INTEGER, data TEXT);";
const char * const sql_create_table = "CREATE TABLE entries (stamp INTEGER, data TEXT);";
sqlite3_exec(db, sql_create_table, 0, 0, 0);
// Prepare inserts
const char * const insert_entry_sql = "INSERT INTO entries (stamp, data) VALUES (?, ?);";
sqlite3_prepare_v2(db, insert_entry_sql, -1, &insert_stmt, 0);
if (not is_fuzzy) {
if (not is_caseless) {
query_method = &literal_query;
} else {
query_method = &literal_caseless_query;
}
// Prepare queries
char filtered_query[256] = "\0";
char empty_query[256] = "\0";
if (not is_grouped) {
strcat(filtered_query, SELECT);
strcat(empty_query, SELECT);
} else {
if (not is_caseless) {
query_method = &fuzzy_query;
} else {
query_method = &fuzzy_caseless_query;
}
strcat(filtered_query, GROUP_SELECT);
strcat(empty_query, GROUP_SELECT);
}
sqlite3_prepare_v2(db, *query_method, -1, & query_stmt, 0);
sqlite3_prepare_v2(db, empty_query, -1, &empty_query_stmt, 0);
char * sql_mid[2][2] = {
{
"WHERE data GLOB CONCAT('*', ?, '*') ",
"WHERE data LIKE CONCAT('%', ?, '%') ",
},
{
"WHERE BRAINDAMAGED_FUZZY_SEARCH(data, ?) ",
"WHERE BRAINDAMAGED_FUZZY_SEARCH(LOWER(data), LOWER(?)) ",
},
};
strcat(filtered_query, sql_mid[is_fuzzy][is_caseless]);
if (is_grouped) {
strcat(filtered_query, "GROUP BY data ");
strcat(empty_query, "GROUP BY data ");
}
strcat(filtered_query, ORDERING);
strcat(empty_query, ORDERING);
strcat(filtered_query, PAGING);
strcat(empty_query, PAGING);
strcat(filtered_query, ";");
strcat(empty_query, ";");
sqlite3_prepare_v2(db, filtered_query, -1, & query_stmt, 0);
sqlite3_prepare_v2(db, empty_query, -1, &empty_query_stmt, 0);
return 0;
}
@ -114,7 +139,7 @@ entry_t get_entry(void) {
};
}
void braindamaged_fuzzy_search(sqlite3_context *context, [[maybe_unused]] int argc, sqlite3_value **argv) {
void braindamaged_fuzzy_search(sqlite3_context * context, [[maybe_unused]] int argc, sqlite3_value * * argv) {
const char * const db_text = (const char *)sqlite3_value_text(argv[0]);
const char * const user_query = (const char *)sqlite3_value_text(argv[1]);

1
source/storage.h
View File

@ -6,6 +6,7 @@
extern bool is_fuzzy;
extern bool is_caseless;
extern bool is_grouped;
extern int init_storage(void);
extern int deinit_storage(void);