From 6dd0c4747aa57227b5898fc639e3f2b643ce013c Mon Sep 17 00:00:00 2001 From: "Gabriel A. Giovanini" Date: Mon, 15 Apr 2024 22:16:28 +0200 Subject: feat: Remove C implementation --- .gitignore | 2 +- CMakeLists.txt | 8 -- LICENSE | 339 ------------------------------------------------ README.md | 6 - dict/CMakeLists.txt | 6 - dict/main.c | 85 ------------ ext/CMakeLists.txt | 4 - importer/CMakeLists.txt | 9 -- importer/main.c | 82 ------------ lib/CMakeLists.txt | 5 - lib/data.c | 125 ------------------ lib/data.h | 47 ------- lib/list.c | 52 -------- lib/list.h | 30 ----- lib/ui.c | 105 --------------- lib/ui.h | 32 ----- lib/util.c | 62 --------- lib/util.h | 13 -- 18 files changed, 1 insertion(+), 1011 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 dict/CMakeLists.txt delete mode 100644 dict/main.c delete mode 100644 ext/CMakeLists.txt delete mode 100644 importer/CMakeLists.txt delete mode 100644 importer/main.c delete mode 100644 lib/CMakeLists.txt delete mode 100644 lib/data.c delete mode 100644 lib/data.h delete mode 100644 lib/list.c delete mode 100644 lib/list.h delete mode 100644 lib/ui.c delete mode 100644 lib/ui.h delete mode 100644 lib/util.c delete mode 100644 lib/util.h diff --git a/.gitignore b/.gitignore index 567609b..e660fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build/ +bin/ diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 63c9d1e..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.26) - -project(dict VERSION 0.1 LANGUAGES C) - -add_subdirectory(ext) -add_subdirectory(importer) -add_subdirectory(lib) -add_subdirectory(dict) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d159169..0000000 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/README.md b/README.md deleted file mode 100644 index 11c392b..0000000 --- a/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Dict - -It is meant to be a interactive terminal based dictionary. -The ideia is to iteratve over dictionary as fast as possible. - -The first dict to be supported is dict.cc EN-DE and PT-DE. diff --git a/dict/CMakeLists.txt b/dict/CMakeLists.txt deleted file mode 100644 index 051635b..0000000 --- a/dict/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -file(GLOB src CONFIGURE_DEPENDS "*.c") -add_executable(dict ${src}) - -target_compile_options(dict PRIVATE -Wall -Wextra -Wpedantic -Werror) -target_include_directories(dict PUBLIC "${PROJECT_BINARY_DIR}") -target_link_libraries(dict sqlite3 ncursesw m c lib) diff --git a/dict/main.c b/dict/main.c deleted file mode 100644 index 18aeb63..0000000 --- a/dict/main.c +++ /dev/null @@ -1,85 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include "../lib/data.h" -#include "../lib/ui.h" -#include "../lib/util.h" - -Data *data; -WINDOW* tpanel; -PANEL* panel; - -void search(char*, int); -int run(const char*); - -int main(int argc, char** argv) -{ - int opt; - char* db = NULL; - - while ((opt = getopt(argc, argv, "t:d:h")) != -1) { - switch(opt) { - case 'd': - db = copy_achar(optarg); - break; - case 'h': - // fall through - default: - printf("Usage: %s", argv[0]); - goto end; - } - } - - int r = run(db); - -end: - if (db != NULL) - free(db); - - return r; -} - -int run(const char *db) -{ - data = new_data(":memory:"); - load_or_save_db(data->db, db, 0); - - setlocale(LC_ALL, ""); - initscr(); - noecho(); - cbreak(); - keypad(stdscr, TRUE); - - WINDOW* tbox = newwin(3,COLS,0,0); - TEXT_BOX *box = new_text_box(tbox, 100); - - tpanel = newwin(LINES-3, COLS, 3,0); - panel = new_panel(tpanel); - - get_char(box, search); - - refresh(); - - endwin(); - - free_data(data); - return 0; -} - -void search(char *sch, int len) -{ - - - LIST* l = data_select(data, sch, len, LINES-5); - - for (int y = 0; y < (LINES-5); y++) { - move(y, 0); - Word *item = (Word*)list_get(l, y); - if (item != NULL) - write_char(panel, y, (char*)item->Line); - } -} diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt deleted file mode 100644 index d107d7f..0000000 --- a/ext/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -project(sqlite3ext VERSION 0.1 DESCRIPTION "sqlite3 ext library") - -file(GLOB src CONFIGURE_DEPENDS "*.c") -add_library(sqlite3ext SHARED ${src}) diff --git a/importer/CMakeLists.txt b/importer/CMakeLists.txt deleted file mode 100644 index 587952e..0000000 --- a/importer/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -project(dict_importer VERSION 0.1 LANGUAGES C) - -file(GLOB src CONFIGURE_DEPENDS "*.c") -add_executable(dict_importer ${src}) - -target_compile_options(dict_importer PRIVATE -Wall -Wextra -Wpedantic -Werror) -target_include_directories(dict_importer PUBLIC "${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}") -target_link_libraries(dict_importer sqlite3 lib) - diff --git a/importer/main.c b/importer/main.c deleted file mode 100644 index 087fc48..0000000 --- a/importer/main.c +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include -#include - -#include "../lib/util.h" -#include "../lib/data.h" - -int run(const char *db, const char *txt); - -int main(int argc, char** argv) -{ - int opt; - char* txt = NULL; - char* db = NULL; - - while ((opt = getopt(argc, argv, "t:d:h")) != -1) { - switch(opt) { - case 't': - txt = copy_achar(optarg); - break; - case 'd': - db = copy_achar(optarg); - break; - case 'h': - // fall through - default: - printf("Usage: %s", argv[0]); - goto end; - } - } - - int r = run(db, txt); - -end: - if (txt != NULL) - free(txt); - if (db != NULL) - free(db); - - return r; -} - -int run(const char *db, const char *txt) -{ - char * line = NULL; - size_t len = 0; - int count = 0; - ssize_t read; - Data *data; - FILE *f; - int total; - - printf("\33[?25l"); // hide cursor - - data = new_data(":memory:"); - f = fopen(txt, "r"); - - bootstrap(data); - - total = count_file_lines(f); - fseek(f, 0, SEEK_SET); - - while ((read = getline(&line, &len, f)) != -1) { - if (line[0] == '#' || line[0] == '\n') - continue; - - insert(data, line, read-1); - count++; - - float t = ((float)count/(float)total)*100; - printf("\rLoading data [%03.0f%%] %d/%d", t, count, total); - } - - float t = ((float)count/(float)total)*100; - printf("\rLoading data [%03.0f%%] %d/%d", t, count, total); - int r = load_or_save_db(data->db, db, 1); - - printf("\rDONE!"); - printf("\33[?25h"); // reenable cursor - - return r; -} diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt deleted file mode 100644 index 023cdf1..0000000 --- a/lib/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -file(GLOB lib CONFIGURE_DEPENDS "*.h" "*.c") - -add_library(lib ${lib}) -target_compile_options(lib PRIVATE -Wall -Wextra -Wpedantic -Werror) -target_link_libraries(lib sqlite3 ncursesw m c) diff --git a/lib/data.c b/lib/data.c deleted file mode 100644 index afbbbb1..0000000 --- a/lib/data.c +++ /dev/null @@ -1,125 +0,0 @@ -#include -#include -#include - -#include "data.h" -#include "../lib/util.h" - -const char *insert_into = "INSERT INTO words (LINE) VALUES($VVV);"; -const char *select_words = "SELECT Id, Line FROM words WHERE line MATCH $VVV LIMIT $NNN;"; -const char *create_table = "CREATE VIRTUAL TABLE IF NOT EXISTS words USING fts4 (ID INTEGER PRIMARY KEY AUTOINCREMENT, LINE TEXT NOT NULL);"; - -Data* new_data(const char* con) -{ - Data* data = (Data*)malloc(sizeof(Data)); - - int v = sqlite3_open(con, &(data->db)); - if (v != SQLITE_OK) { - print_result_code(v); - return NULL; - } - - sqlite3_enable_load_extension(data->db, 1); - v = sqlite3_load_extension(data->db, "ext/libsqlite3ext", "sqlite3_spellfix_init",0); - if (v != SQLITE_OK) { - print_result_code(v); - return NULL; - } - - return data; -} - -void free_data(Data* data) -{ - sqlite3_close(data->db); - free(data); -} - -void insert(Data* data, char* line, int len) -{ - sqlite3_stmt *stmt; - int r = sqlite3_prepare_v2(data->db, insert_into, -1, &stmt, NULL); - - if (r != SQLITE_OK) { - printf("Error executing insert: "); - print_result_code(r); - printf("\n"); - return; - } - - sqlite3_bind_text(stmt, 1, line, len, NULL); - - int c = sqlite3_step(stmt); - if (c != SQLITE_DONE) { - printf("Error executing insert: "); - print_result_code(r); - printf("\n"); - } - - sqlite3_finalize(stmt); -} - -void bootstrap(Data* data) -{ - sqlite3_stmt *stmt; - int r = sqlite3_prepare_v2(data->db, create_table, -1, &stmt, NULL); - - if (r != SQLITE_OK) { - printf("Error preparing bootstrap: "); - print_result_code(r); - printf("\n"); - return; - } - - int c = sqlite3_step(stmt); - if (c != SQLITE_DONE) { - printf("Error executing bootstrap: "); - print_result_code(r); - printf("\n"); - } - - sqlite3_finalize(stmt); -} - -LIST* data_select(Data* data, char *sch, int len, int limit) -{ - sqlite3_stmt *stmt; - int r = sqlite3_prepare_v2(data->db, select_words, -1, &stmt, NULL); - - if (r != SQLITE_OK) { - printf("Error executing select: "); - print_result_code(r); - printf("\n"); - return NULL; - } - - LIST *list = NULL; - - sqlite3_bind_text(stmt, 1, sch, len, NULL); - sqlite3_bind_int(stmt, 2, limit); - - int m = sqlite3_step(stmt); - while(m == SQLITE_ROW) { - Word *word = (Word*)malloc(sizeof(Word)); - - int id = sqlite3_column_int(stmt, 0); - const unsigned char *line = sqlite3_column_text(stmt, 1); - unsigned char *line2 = malloc(sizeof(char*)+strlen((char*)line)); - memcpy(line2, line, strlen((char*)line)); - - word->Id = id; - word->Line = line2; - list = list_add(list, word); - - m = sqlite3_step(stmt); - } - - sqlite3_finalize(stmt); - - return list; -} - -void print_result_code(int code) -{ - printf(sqlite3_errstr(code)); -} diff --git a/lib/data.h b/lib/data.h deleted file mode 100644 index 6c9f30f..0000000 --- a/lib/data.h +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once -#include -#include "list.h" - -/* - * This word into the dictionary - */ -typedef struct word -{ - int Id; - const unsigned char *Line; -} Word; - -/* - * This is database connection. - */ -typedef struct data -{ - sqlite3 *db; -} Data; - -/* - * create a new data struct from sqlite filename. - */ -Data* new_data(const char*); - -void free_data(Data*); - -/* - * Create the tables. - */ -void bootstrap(Data*); - -/* - * insert line into database. - */ -void insert(Data*, char*, int); - -/* - * Select all words. - */ -LIST* data_select(Data*, char*, int, int); - -/* - * Print result code from sqlite. - */ -void print_result_code(int error); diff --git a/lib/list.c b/lib/list.c deleted file mode 100644 index be1ac61..0000000 --- a/lib/list.c +++ /dev/null @@ -1,52 +0,0 @@ -#include "list.h" -#include - -LIST* list_add(LIST* list, void* item) -{ - - if (list == NULL) { - list = (LIST*)malloc(sizeof(LIST)); - list->size = 0; - list->list = (void**)malloc(sizeof(0)); - - } - - list->size ++; - void** new_list = (void**)reallocarray(list->list, list->size, sizeof(void*)); - - new_list[list->size-1] = item; - list->list = new_list; - - return list; - -} - -LIST* list_remove(LIST* list, unsigned int pos) -{ - for(unsigned int i = pos; i < list->size - 1; i++) - list->list[i] = list->list[i + 1]; - - list->size--; - - void** new_list = reallocarray(list->list, list->size, sizeof(void*)); - list->list = new_list; - - return list; -} - -void list_free(LIST* list) -{ - free(list->list); - free(list); -} - -void *list_get(LIST *list, unsigned int index) -{ - if (list == NULL) - return NULL; - - if (index < list->size) - return list->list[index]; - - return NULL; -} diff --git a/lib/list.h b/lib/list.h deleted file mode 100644 index 18bc423..0000000 --- a/lib/list.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once -#include - -#define LIST_SIZE_FACTOR 1.5 -struct list -{ - unsigned int size; - unsigned int allocated_size; - void** list; -}; - -typedef struct list LIST; - -/** -* Add an item to a list -* @list: array list structure. -* @item: item to be added to the list. -*/ -LIST* list_add(LIST* list, void* item); - -/** -* Remove an item from a given list -* @list: array list structure. -* @pos: position of item to be removed. -*/ -LIST *list_remove(LIST *list, unsigned int pos); - -void list_free(LIST* list); - -void *list_get(LIST *list, unsigned int index); diff --git a/lib/ui.c b/lib/ui.c deleted file mode 100644 index cd54cd4..0000000 --- a/lib/ui.c +++ /dev/null @@ -1,105 +0,0 @@ -#define NCURSES_WIDECHAR 1 - -#include -#include -#include -#include -#include -#include "ui.h" - -const char *uload = "█"; - -PROGRESS_BAR* new_progress_bar(WINDOW* scr, float total) -{ - PROGRESS_BAR *bar = (PROGRESS_BAR*)malloc(sizeof(PROGRESS_BAR)); - bar->scr = scr; - bar->total = total; - bar->current = 0; - return bar; -} - -void bar_step(PROGRESS_BAR* bar, float step) -{ - bar->current += step; - - int x, y; - int hx, hy; - - getmaxyx(bar->scr, y, x); - - hx = x/2; - hy = y/2; - - float total = (bar->current/bar->total); - - wmove(bar->scr, hy-1, 0); - for (int i = 0; i < ((float)x*total); i++) - wprintw(bar->scr, uload); - - wmove(bar->scr, hy, hx-4); - wprintw(bar->scr,"%03.0f%% ", total*100); - - int len = floor(log10(abs((int)bar->total))) + 3; - - wmove(bar->scr, hy+1, hx - len); - wprintw(bar->scr, "%.0f/%.0f", bar->current, bar->total); - - wmove(bar->scr,0,0); - wrefresh(bar->scr); -} - -TEXT_BOX* new_text_box(WINDOW* scr, int length) -{ - TEXT_BOX *text = (TEXT_BOX*)malloc(sizeof(TEXT_BOX)); - text->scr = scr; - text->length = length; - text->current = 0; - text->text = malloc(sizeof(char)*(length+1)); - memset(text->text, '\0', length); - box(scr, 0,0); - return text; -} - -void get_char(TEXT_BOX* text, void (*sch)(char*, int)) -{ - while(1) { - wchar_t c; - get_wch((wint_t*)&c); - - switch(c) { - case KEY_BACKSPACE: - if (text->current > 0) { - text->text[text->current--] = '\0'; - } - break; - default: - if (text->current < (text->length-2)) { - text->text[text->current] = c; - text->text[++text->current] = '\0'; - } - } - - char str[text->length]; - wcstombs(str, text->text, sizeof(text->text)); - sch(str, (int)strlen(str)); - - wmove(text->scr,1,1); - wprintw(text->scr, "%*ls", text->current,text->text); - wrefresh(text->scr); - } -} - -PANEL* new_panel(WINDOW* scr) -{ - PANEL *panel = (PANEL*)malloc(sizeof(PANEL)); - panel->scr = scr; - box(scr, 0,0); - return panel; -} -void write_char(PANEL* panel, int l, char *text) -{ - int x = getmaxx(panel->scr); - wmove(panel->scr, l+1, 1); - wprintw(panel->scr, "%.*s", x-3, text); - wrefresh(panel->scr); -} diff --git a/lib/ui.h b/lib/ui.h deleted file mode 100644 index 271105a..0000000 --- a/lib/ui.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include - -typedef struct progress_bar -{ - float total; - float current; - WINDOW *scr; -} PROGRESS_BAR; - -PROGRESS_BAR* new_progress_bar(WINDOW*, float); -void bar_step(PROGRESS_BAR*, float); - -typedef struct text_box -{ - wchar_t *text; - int length; - int current; - WINDOW *scr; -} TEXT_BOX; - -TEXT_BOX* new_text_box(WINDOW*, int); -void get_char(TEXT_BOX* text, void (*sch)(char*, int)); - -typedef struct panel -{ - WINDOW *scr; -} PANEL; - - -PANEL* new_panel(WINDOW*); -void write_char(PANEL*, int, char*); diff --git a/lib/util.c b/lib/util.c deleted file mode 100644 index 895ca89..0000000 --- a/lib/util.c +++ /dev/null @@ -1,62 +0,0 @@ -#include -#include -#include - -#include "util.h" - -#define BUF_SIZE 100 - -char* copy_achar(const char* src) -{ - int len = strlen(src) + 1; - char* dest = (char*)malloc(sizeof(char)*len); - strcpy(dest, src); - - return dest; -} - -int load_or_save_db(sqlite3 *pInMemory, const char *zFilename, int isSave) -{ - int rc; /* Function return code */ - sqlite3 *pFile; /* Database connection opened on zFilename */ - sqlite3_backup *pBackup; /* Backup object used to copy data */ - sqlite3 *pTo; /* Database to copy to (pFile or pInMemory) */ - sqlite3 *pFrom; /* Database to copy from (pFile or pInMemory) */ - - rc = sqlite3_open(zFilename, &pFile); - if( rc==SQLITE_OK ) { - pFrom = (isSave ? pInMemory : pFile); - pTo = (isSave ? pFile : pInMemory); - - pBackup = sqlite3_backup_init(pTo, "main", pFrom, "main"); - if( pBackup ) { - (void)sqlite3_backup_step(pBackup, -1); - (void)sqlite3_backup_finish(pBackup); - } - rc = sqlite3_errcode(pTo); - } - - (void)sqlite3_close(pFile); - return rc; -} - -unsigned int count_file_lines(FILE *file) -{ - char buf[BUF_SIZE]; - unsigned int counter = 0; - for(;;) { - size_t res = fread(buf, 1, BUF_SIZE, file); - if (ferror(file)) - return -1; - - size_t i; - for(i = 0; i < res; i++) - if (buf[i] == '\n') - counter++; - - if (feof(file)) - break; - } - - return counter; -} diff --git a/lib/util.h b/lib/util.h deleted file mode 100644 index 33c61ed..0000000 --- a/lib/util.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include -#include - -/* - * Copy of a char to a newly created string of the same size. - */ -char* copy_achar(const char*); - -int load_or_save_db(sqlite3 *pInMemory, const char *zFilename, int isSave); - -unsigned int count_file_lines(FILE *file); -- cgit v1.2.3