13 changed files with 365 additions and 796 deletions
--- a/339
+++ b/339
@ -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.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    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.
  <signature of Ty Coon>, 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.
--- a/28
+++ b/28
@ -1,6 +1,24 @@
-all: src/*.c
+CC=gcc
-	gcc src/main.c src/json.c src/curl.c src/db.c -lsqlite3 -lcurl -lcjson -o isbn -Wall
+CFLAGS= -c -g -Wall
-	mkdir -p build
+
-	mv isbn build
+LDLIBS = -lcurl -lcjson -lsqlite3 -lm
 TARGET := isbn-lookup
 BUILD_DIR := ./build
 SRC_DIRS := ./src
 SRCS := $(shell find $(SRC_DIRS) -name '*.c')
 OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
 $(BUILD_DIR)/$(TARGET): $(OBJS)
 	$(CC) $(OBJS) -o $@ $(LDLIBS)
 $(BUILD_DIR)/%.c.o: %.c
 	mkdir -p $(dir $@)
 	$(CC) $(CFLAGS) -c $< -o $@
 .PHONY: clean
 clean:
-	rm -rf build
+	rm -rf $(BUILD_DIR)
--- a/README.md
+++ b/README.md
@ -1,17 +0,0 @@
 # ISBN Lookup tool
 Just a simple tool that allows you to seek the details of a book using its ISBN10 or ISBN13.
 Uses [Open Library](https://openlibrary.org) for the ISBN lookup API.
 ## Building
 Requires `libcurl` and `cJSON`.
 Simply run `make`.
 ## Usage
 `./isbn [isbn]`
--- a/src/curl.c
+++ b/src/curl.c
@ -3,65 +3,82 @@
 #include <stdlib.h>
 #include <string.h>
-#include "curl.h"
+#include "include/curl.h"
-#define BASE_URL_SIZE 38
+#define API_URL "https://openlibrary.org/search.json?page=1&q="
 #define API_URL_LEN 45
-void init_string(string* s)
+static void setup_api_link(const char* isbn, char** buf)
 {
-	s->len = 0;
+	size_t buffer_len;
-	s->buf = malloc(s->len + 1);
+	
 	buffer_len = API_URL_LEN + strlen(isbn);
 	(*buf) = malloc(sizeof(char) * buffer_len);
 	strncpy((*buf), API_URL, API_URL_LEN + 1);
 	strncpy((*buf)+ API_URL_LEN, isbn, strlen(isbn));
 	(*buf)[buffer_len] = '\0';
 	if (NULL == s->buf) {
 		fprintf(stderr, "malloc() failed!\n");
 		exit(EXIT_FAILURE);
 	}
 	s->buf[0] = '\0';
 }
-size_t writefunc(void* ptr, size_t size, size_t nmemb, string* s)
+#undef API_URL
 #undef API_URL_LEN
 static void init_get_response(get_response* buf)
 {
-	size_t new_len = s->len + (size * nmemb);
+	buf->len = 0;
-	s->buf = realloc(s->buf, new_len + 1);
+	buf->buf = malloc(buf->len + 1);
-	if (NULL == s->buf) {
+	if (!(buf->buf)) {
-		fprintf(stderr, "realloc() failed!\n");
+		perror("malloc");
 		exit(EXIT_FAILURE);
 	}
-	memcpy(s->buf + s->len, ptr, size * nmemb);
+	buf->buf[0] = '\0';
-	s->buf[new_len] = '\0';
+}
-	s->len = new_len;
+
 void free_get_response(get_response* buf)
 {
 	free(buf->buf);
 }
 static size_t curl_write_response(void* ptr, size_t size, size_t nmemb, get_response* buf)
 {
 	size_t new_len = buf->len + (size * nmemb);
 	buf->buf = realloc(buf->buf, new_len + 1);
 	if (!(buf->buf)) {
 		perror("realloc");
 		exit(EXIT_FAILURE);
 	}
 	memcpy(buf->buf + buf->len, ptr, size * nmemb);
 	buf->buf[new_len] = '\0';
 	buf->len = new_len;
 	return size * nmemb;
 }
-CURLcode perform_book_get(char* isbn, string* s)
+CURLcode book_api_call(const char* isbn, get_response* buf)
 {
 	CURL* handler;
 	char* base_url;
 	size_t finalurl_size = BASE_URL_SIZE + 15;
 	char finalurl[finalurl_size];
 	CURLcode result;
 	char* request_url;
 	handler = curl_easy_init();
 	if (!handler) {
-		fprintf(stderr, "cURL failed to initialize!\n");
+		perror("curl_easy_init");
 		exit(EXIT_FAILURE);
 	}
-	base_url = "https://openlibrary.org/search.json?q=";
+	setup_api_link(isbn, &request_url);
 	init_get_response(buf);
-	// Setup the URL for the request
+	curl_easy_setopt(handler, CURLOPT_URL, request_url);
 	snprintf(finalurl, finalurl_size, "%s%s", base_url, isbn);
 	curl_easy_setopt(handler, CURLOPT_URL, finalurl);
 	curl_easy_setopt(handler, CURLOPT_HTTPGET, 1L);
-	curl_easy_setopt(handler, CURLOPT_WRITEFUNCTION, writefunc);
+	curl_easy_setopt(handler, CURLOPT_WRITEFUNCTION, curl_write_response);
-	curl_easy_setopt(handler, CURLOPT_WRITEDATA, s);
+	curl_easy_setopt(handler, CURLOPT_WRITEDATA, buf);
 	result = curl_easy_perform(handler);
 	// Always clean up
 	curl_easy_cleanup(handler);
 	return result;
 }
--- a/src/curl.h
+++ b/src/curl.h
@ -1,40 +0,0 @@
 #ifndef CURL_H
 #define CURL_H
 /**
 * struct string_t
 * char* buf - The buffer containing the string data
 * size_t len - The length of the buffer
 */
 typedef struct string_t {
 	char* buf;
 	size_t len;
 } string;
 /**
 * void init_string
 * string* s - The string struct
 *
 * Initializes the string struct
 */
 void init_string(string* s);
 /**
 * size_t writefunc
 *
 * The arguments from CURLOPT_WRITEFUNCTION
 *
 * Writes the cURL get into the string struct
 */
 size_t writefunc(void* ptr, size_t size, size_t nmemb, string* s);
 /**
 * CURLcode perform_book_get
 * char* isbn - The ISBN
 * string* s - The string struct to place the GET output in
 *
 * Performs a GET request with the ISBN
 */
 CURLcode perform_book_get(char* isbn, string* s);
 #endif
--- a/src/db.c
+++ b/src/db.c
@ -1,124 +1,167 @@
 #include <stdio.h>
 #include <sqlite3.h>
 #include <stdlib.h>
-#include <stdarg.h>
+#include <stdio.h>
-#include <cjson/cJSON.h>
+#include <stdbool.h>
-#include <curl/curl.h>
+#include <sqlite3.h>
 #include <string.h>
 #include <math.h>
 #include "include/db.h"
-#include "curl.h"
+static void open_db(sqlite3** db)
 #include "json.h"
 #include "db.h"
 void do_db_entry(enum DB_OPTIONS option, ...)
 {
-	int rc;
+	int err;
 	sqlite3* db;
 	va_list args;
 	rc = sqlite3_open("books.db", &db);
 	if (rc != SQLITE_OK) {
 		fprintf(stderr, "Cannot open database: %s\n", sqlite3_errmsg(db));
 		sqlite3_close(db);
 	err = sqlite3_open("books.db", db);
 	if (err != SQLITE_OK) {
 		fprintf(stderr, "Cannot open db: %s\n", sqlite3_errmsg(*db));
 		sqlite3_close(*db);
 		exit(EXIT_FAILURE);
 	}
 }
-	setup_db(db);
+static int get_num_rows(sqlite3* db)
 {
 	int rows = 0;
-	va_start(args, option);
+	sqlite3_stmt* msg;
-	switch(option) {
+	sqlite3_prepare(db, "SELECT * FROM books;", -1, &msg, NULL);
-		case ADD:
+	while (sqlite3_step(msg) == SQLITE_ROW)
-			add_to_db(va_arg(args, book_t*), db);
+		rows++;
-			break;
+	sqlite3_finalize(msg);
 		case REMOVE:
 			remove_from_db(va_arg(args, int), db);
 			break;
 		default:
 			fprintf(stderr, "Invalid db command given!\n");
 			break;
 	}
 	va_end(args);
-	sqlite3_close(db);
+	return rows;
 }
 void setup_db(sqlite3* db)
 {
-	int rc;
+	int err;
-	char* err_msg = 0;
+	char* err_buf = 0;
-	rc = sqlite3_exec(db, 
+	open_db(&db);
 	err = sqlite3_exec(db,
 			"CREATE TABLE IF NOT EXISTS books (id UNSIGNED INT PRIMARY KEY, \
-			isbn TEXT, title TEXT, authors TEXT, imageurl TEXT, year_of_publication YEAR, \
+			title TEXT, subtitle TEXT, isbn TEXT, authors TEXT, subjects TEXT, \
-			page_length UNSIGNED INT, subjects TEXT, date_added TEXT, date_completed TEXT, \
+			langs TEXT, date_added TEXT, pub_date TEXT, \
-			progress UNSIGNED TINYINT, publication_date TEXT, subtitle TEXT);", 
+			image_code TEXT, year_of_pub YEAR, page_len UNSIGNED INT);",
-			0, 0, &err_msg);
+			0, 0, &err_buf);
-
+	if (err != SQLITE_OK) {
-	if (rc != SQLITE_OK) {
+		fprintf(stderr, "sqlite3_exec: %s\n", err_buf);
-		fprintf(stderr, "SQL error: %s\n", err_msg);
+		sqlite3_free(err_buf);
 		sqlite3_free(err_msg);
 		sqlite3_close(db);
 		exit(EXIT_FAILURE);
 	}
 	sqlite3_close(db);
 }
 static void add_str_entry(char** dst, char** src, bool last)
 {
 	size_t len;
 	len = strlen(*src) + strlen(*dst) + 2 + 1 + (last ? 0 : 2);
 	*dst = realloc(*dst, sizeof(char) * len);
 	*dst = strcat(*dst, "\"");
 	*dst = strcat(*dst, *src);
 	*dst = strcat(*dst, "\"");
 	if (!last)
 		*dst = strcat(*dst, ", ");
 }
 static void add_int_entry(char** dst, int src, bool last)
 {
 	size_t len_int, len;
 	char* num;
 	len_int = (src == 0) ? 1 : floor(log10(abs(src))) + 1;
 	num = malloc(sizeof(char) * (len_int + 1));
 	snprintf(num, len_int + 1, "%d", src);
 	len = strlen(*dst) + len_int + 1 + (last ? 0 : 2);
 	*dst = realloc(*dst, sizeof(char) * len);
 	*dst = strcat(*dst, num);
 	if (!last)
 		strcat(*dst, ", ");
 	free(num);
 }
 static void string_cat_vals(char** dst, book_t* book, int id)
 {
 	add_int_entry(dst, id, false);
 	add_str_entry(dst, &(book->title), false);
 	add_str_entry(dst, &(book->subtitle), false);
 	add_str_entry(dst, &(book->isbn), false);
 	add_str_entry(dst, &(book->authors), false);
 	add_str_entry(dst, &(book->subjects), false);
 	add_str_entry(dst, &(book->langs), false);
 	add_str_entry(dst, &(book->date_added), false);
 	add_str_entry(dst, &(book->pub_date), false);
 	add_str_entry(dst, &(book->image_code), false);
 	add_int_entry(dst, book->page_len, true);
 	*dst = realloc(*dst, sizeof(char) * (strlen(*dst) + 3));
 	strcat(*dst, ");");
 }
 #define INSERT_STR "INSERT INTO books (id, title, subtitle, isbn, authors, subjects, langs, date_added, pub_date, image_code, page_len) VALUES("
 void add_to_db(book_t* book, sqlite3* db)
 {
-	char* sql;
+	int id, err;
-	int asp_err, rc, entries = 0;
+	char* cmd;
 	char* err_msg = 0;
-	sqlite3_stmt* getmsg;
+	open_db(&db);
 	sqlite3_prepare(db, "SELECT * FROM BOOKS;", -1, &getmsg, NULL);
 	while (sqlite3_step(getmsg) == SQLITE_ROW)
 		entries++;
 	sqlite3_finalize(getmsg);
-	entries++; // new id!!
+	id = get_num_rows(db) + 4;
-	asp_err = asprintf(&sql, "INSERT INTO books \
+	cmd = malloc(sizeof(char) * (strlen(INSERT_STR) + 1));
-			(id, isbn, title, authors, imageurl, year_of_publication, \
+	snprintf(cmd, strlen(INSERT_STR) + 1, "%s", INSERT_STR);
 			 page_length, subjects, date_added, publication_date, subtitle) \
 			VALUES(%d, \"%s\", \"%s\", \"%s\", \"%s\", %d, %d, \"%s\", \"%s\", \"%s\", \"%s\");", 
 			entries, book->isbn, book->title, book->authors, book->image_url, book->year_of_publication, 
 			book->page_len, book->subjects, book->date_added, book->publication_date, book->subtitle);
-	if (-1 == asp_err) {
+	string_cat_vals(&cmd, book, id);
 		fprintf(stderr, "asprintf failed!\n");
 		exit(EXIT_FAILURE);
 	}
-	rc = sqlite3_exec(db, sql, 0, 0, &err_msg);
+	printf("%s\n", cmd);
-	if (rc != SQLITE_OK) {
+
-		fprintf(stderr, "SQL error: %s\n", err_msg);
+	err = sqlite3_exec(db, cmd, 0, 0, &err_msg);
 	if (err != SQLITE_OK) {
 		fprintf(stderr, "sqlite3_exec: %s\n", err_msg);
 		sqlite3_free(err_msg);
 		sqlite3_close(db);
 		exit(EXIT_FAILURE);
 	}
 }
 	sqlite3_close(db);
 	free(cmd);
 }
 #undef INSERT_STR
 #define DEL_STR "DELETE FROM books WHERE id = "
 void remove_from_db(int id, sqlite3* db)
 {
-	char* sql;
+	int err;
-	int asp_err, rc;
+	char *cmd, *err_msg;
 	char* err_msg = 0;
-	asp_err = asprintf(&sql, "DELETE FROM books WHERE id = %d;", id);
+	open_db(&db);
 	if (-1 == asp_err) {
 		fprintf(stderr, "asprintf failed!\n");
 		exit(EXIT_FAILURE);
 	}
-	rc = sqlite3_exec(db, sql, 0, 0, &err_msg);
+	cmd = malloc(sizeof(char) * (strlen(DEL_STR) + 1));
-	if (rc != SQLITE_OK) {
+	snprintf(cmd, strlen(DEL_STR), "%s", DEL_STR);
-		fprintf(stderr, "SQL error: %s\n", err_msg);
+
 	add_int_entry(&cmd, id, true);
 	err = sqlite3_exec(db, cmd, 0, 0, &err_msg);
 	if (err != SQLITE_OK) {
 		fprintf(stderr, "sqlite3_exec: %s\n", err_msg);
 		sqlite3_free(err_msg);
 		sqlite3_close(db);
 		exit(EXIT_FAILURE);
 	}
 	sqlite3_close(db);
 	free(cmd);
 }
 #undef DEL_STR
--- a/src/db.h
+++ b/src/db.h
@ -1,47 +0,0 @@
 #ifndef DH_H
 #define DH_H
 enum DB_OPTIONS {
 	ADD,
 	REMOVE
 };
 /**
 * void do_db_entry
 *
 * enum DB_OPTIONS option - The type of transaction being made to the DB
 * VA args
 * 	- Expects book_t if option is ADD
 * 	- Expects int if option is REMOVE
 *
 * Handles the whole process of interacting with the database
 */
 void do_db_entry(enum DB_OPTIONS option, ...);
 /**
 * void setup_db
 * sqlite3* db - The database
 *
 * Just creates the database if it doesn't exist.
 */
 void setup_db(sqlite3* db);
 /**
 * void add_to_db
 * book_t* book - The struct full of book information
 * sqlite3* db - The database
 *
 * Adds the book information to the database
 */
 void add_to_db(book_t* book, sqlite3* db);
 /**
 * void remove_from_db
 * int id - The id of the book to remove
 * sqlite3* db - The database
 *
 * Removes the given ID (and its associated book) from the database.
 */
 void remove_from_db(int id, sqlite3* db);
 #endif
--- a/src/include/curl.h
+++ b/src/include/curl.h
@ -0,0 +1,15 @@
 #include <curl/curl.h>
 #ifndef CURL_H
 #define CURL_H
 typedef struct {
 	char* buf;
 	size_t len;
 } get_response;
 void free_get_response(get_response* buf);
 CURLcode book_api_call(const char* isbn, get_response* buf);
 #endif
--- a/src/include/db.h
+++ b/src/include/db.h
@ -0,0 +1,22 @@
 #include <sqlite3.h>
 #ifndef DB_H
 #define DB_H
 typedef struct {
 	char *title, *subtitle, *isbn;
 	char *authors, *subjects, *langs;
 	char *date_added, *pub_date;
 	char *image_code;
 	int page_len;
 } book_t;
 void setup_db(sqlite3* db);
 void add_to_db(book_t* book, sqlite3* db);
 void remove_from_db(int id, sqlite3* db);
 #endif
--- a/src/include/json.h
+++ b/src/include/json.h
@ -0,0 +1,10 @@
 #include <cjson/cJSON.h>
 #include "curl.h"
 #ifndef JSON_H
 #define JSON_H
 void json_out(cJSON** json);
 void get_json_book(get_response* resp, cJSON** query);
 #endif
--- a/src/json.c
+++ b/src/json.c
@ -1,116 +1,42 @@
 #include <curl/curl.h>
 #include <cjson/cJSON.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <stdbool.h>
 #include <time.h>
-#include "curl.h"
+#include "include/curl.h"
-#include "json.h"
+#include "include/json.h"
-#define MAX_BUF_LEN 1024
+static bool check_valid_query(cJSON* query) {return (query->valueint != 0);}
-void check_valid_query(cJSON* numfound)
+#define FILE_OUT "book.json"
 void json_out(cJSON** json)
 {
-	if (0 != numfound->valueint)
+	FILE* f = fopen(FILE_OUT, "w");
-		return;
+	fprintf(f, "%s", cJSON_Print(*json));
-	fprintf(stderr, "No ISBN found!\n");
+	fclose(f);
 	exit(EXIT_FAILURE);
 }
 #undef FILE_OUT
-void get_list(cJSON* bookinfo, char* in_str, char* json_value)
+void get_json_book(get_response* resp, cJSON** query)
 {
-	char* temp_str;
+	bool err;
-	size_t new_len;
+	cJSON* json;
 	cJSON* str_arr = cJSON_GetObjectItemCaseSensitive(bookinfo, json_value)->child;
-	snprintf(in_str, strlen(str_arr->valuestring) + 1, "%s", str_arr->valuestring);
+	json = cJSON_Parse(resp->buf);
-	str_arr = str_arr->next;
+	if (!json) {
-
+		const char* err_ptr = cJSON_GetErrorPtr();
-	while (NULL != str_arr) {
+		if (err_ptr)
-		// The plus 1 is for the \0, the plus 2 is for the ", "
+			fprintf(stderr, "cJSON_Parse: %s\n", err_ptr);
 		new_len = strlen(in_str) + strlen(str_arr->valuestring) + 1 + 2;
 		temp_str = malloc(sizeof(char) * new_len);
 		snprintf(temp_str, new_len, "%s, %s", in_str, str_arr->valuestring);
 		memcpy(in_str, temp_str, new_len);
 		free(temp_str);
 		str_arr = str_arr->next;
 	}
 }
 void get_image_link(cJSON* bookinfo, book_t* book)
 {
 	int image_id = cJSON_GetObjectItemCaseSensitive(bookinfo, "cover_i")->valueint;
 	const char* begin = "https://covers.openlibrary.org/b/id/";
 	const char* end = "-L.jpg";
 	book->image_url = malloc(sizeof(char) * MAX_BUF_LEN);
 	sprintf(book->image_url, "%s%d%s", begin, image_id, end);
 }
 void set_list_values(cJSON* bookinfo, book_t* book)
 {
 	char authors[MAX_BUF_LEN];
 	char subjects[MAX_BUF_LEN];
 	get_list(bookinfo, authors, "author_name");
 	get_list(bookinfo, subjects, "subject");
 	// Need to malloc, because we need to copy authors into the book struct
 	book->authors = (char*) malloc(sizeof(char) * (strlen(authors) + 1));
 	memcpy(book->authors, authors, strlen(authors) + 1);
 	book->subjects = (char*) malloc(sizeof(char) * (strlen(subjects) + 1));
 	memcpy(book->subjects, subjects, strlen(subjects) + 1);
 }
 void set_actual_values(cJSON* bookinfo, book_t* book, char* isbn)
 {
 	book->isbn = isbn;
 	book->title = cJSON_GetObjectItemCaseSensitive(bookinfo, "title")->valuestring;
 	book->year_of_publication = cJSON_GetObjectItemCaseSensitive(bookinfo, "first_publish_year")->valueint;
 	book->page_len = cJSON_GetObjectItemCaseSensitive(bookinfo, "number_of_pages_median")->valueint;
 	book->subtitle = cJSON_GetObjectItemCaseSensitive(bookinfo, "subtitle")->valuestring;
 	book->publication_date = cJSON_GetObjectItemCaseSensitive(bookinfo, "publish_date")->child->valuestring;
 	get_image_link(bookinfo, book);
 }
 void set_current_date(book_t* book)
 {
 	char date[MAX_BUF_LEN];
 	time_t t;
 	time(&t);
 	sprintf(date, "%s", ctime(&t));
 	book->date_added = (char*) malloc(sizeof(char) * (strlen(date) + 1));
 	memcpy(book->date_added, date, strlen(date) + 1);
 }
 void parse_json(string* s, char* isbn, book_t* book)
 {
 	cJSON* json = cJSON_Parse(s->buf);
 	if (NULL == json) {
 		const char* error_ptr = cJSON_GetErrorPtr();
 		if (NULL != error_ptr)
 			fprintf(stderr, "JSON error: %s\n", error_ptr);
 		cJSON_Delete(json);
 		exit(EXIT_FAILURE);
 	}
-	check_valid_query(cJSON_GetObjectItemCaseSensitive(json, "numFound"));
+	err = check_valid_query(cJSON_GetObjectItemCaseSensitive(json, "numFound"));
 	if (!err) {
 		fprintf(stderr, "ISBN not found!\n");
 		exit(EXIT_SUCCESS);
 	}
-	cJSON* bookinfo = cJSON_GetObjectItemCaseSensitive(json, "docs")->child;
+	// first entry of the "docs" json entry, which is the search result	
-
+	(*query) = cJSON_GetObjectItemCaseSensitive(json, "docs")->child;
 	set_current_date(book);
 	set_actual_values(bookinfo, book, isbn);
 	set_list_values(bookinfo, book);
 }
--- a/src/json.h
+++ b/src/json.h
@ -1,46 +0,0 @@
 #ifndef JSON_H
 #define JSON_H
 #define MAX_BUF_LEN 1024
 typedef struct book_t {
 	char* isbn;
 	char* title;
 	char* authors;
 	char* image_url;
 	int year_of_publication;
 	int page_len;
 	char* subjects;
 	char* date_added;
 	char* publication_date;
 	char* subtitle;
 } book_t;
 /**
 * void check_valid_query
 * cJSON* numfound - The json entry that contains the numFound value
 *
 * Checks if there are any search results in this json entry
 */
 void check_valid_query(cJSON* numfound);
 /**
 * void get_authors
 * cJSON* bookinfo - The JSON entry that has all of the information about the book
 * char* authors - The string to fill
 *
 * Takes the JSON entry from bookinfo and combines all of the authors into one final string
 */
 void get_authors(cJSON* bookinfo, char* authors);
 /**
 * void parse_json
 * string* s - The string struct
 * char* isbn - The ISBN
 * book_t* book - The struct to fill with book information
 *
 * Parses through the given JSON entry and gathers all of the information we need
 */
 void parse_json(string* s, char* isbn, book_t* book);
 #endif
--- a/src/main.c
+++ b/src/main.c
@ -1,103 +1,110 @@
 #include <curl/curl.h>
 #include <cjson/cJSON.h>
-#include <stdio.h> 
+#include <argp.h>
 #include <stdlib.h>
-#include <string.h>
+#include <stdbool.h>
 #include <sqlite3.h>
 #include <unistd.h>
-#include "curl.h"
+#include "include/curl.h"
-#include "json.h"
+#include "include/db.h"
-#include "db.h"
+#include "include/json.h"
-#define MAX_BUF_LEN 1024 
+struct flags {
 	char* isbn;
 	bool json, db, print;
 };
-void do_ISBN_get(char* argv[])
+static void init_flags(struct flags* flags) {flags->json = false;flags->db = false;flags->print = false;}
 const char* argp_program_version = "isbn-lookup 2.1";
 const char* argp_program_bug_address = "supernovaa41@gmx.com";
 static char doc[] = "Lookup details of a book from the ISBN. Using OpenLibrary API.";
 static char args_doc[] = "<ISBN>";
 static struct argp_option options[] = {
 	{"json", 'j', 0, 0, "output to json", 0},
 	{"db", 'd', 0, 0, "output to sqlite3 database", 0},
 	{0, 'p', 0, 0, "print the full json response", 0},
 	{0}
 };
 static error_t parse_opt(int key, char* arg, struct argp_state* state)
 {
-	// want to hold a max of 14 so we can hold up to ISBN13s
+	struct flags* flags = state->input;
-	char isbn_buf[14];
+	switch (key) {
-	book_t new_book;
+		case 'j':
-	CURLcode res;
+			if (flags->db) {
-	size_t input_len = strlen(argv[1]);
+				fprintf(stderr, "-j and -d are mutually exclusive.\n");
-
+				exit(EXIT_FAILURE);
-
+			}
-	if (!(13 == input_len || 10 == input_len)) {
+			flags->json = true;
-		fprintf(stderr, "Invalid ISBN submitted!\n");
+			break;
-		exit(EXIT_FAILURE);
+		case 'd':
 			if (flags->json) {
 				fprintf(stderr, "-j and -d are mutually exclusive.\n");
 				exit(EXIT_FAILURE);
 			}
 			flags->db = true;
 			break;
 		case 'p':
 			flags->print = true;
 			break;
 		case ARGP_KEY_ARG:
 			flags->isbn = arg;
 			break;
 		case ARGP_KEY_END:
 			if (state->arg_num < 1)
 				argp_usage(state);
 			break;
 		default:
 			return ARGP_ERR_UNKNOWN;
 	}
-
+	return 0;
 	// We must initialize cURL
 	curl_global_init(CURL_GLOBAL_ALL);
 	// Grab the ISBN from argv
 	memcpy(isbn_buf, argv[1], 14);
 	// Setup the output string
 	string get_output;
 	init_string(&get_output);
 	//  Perform the get request
 	res = perform_book_get(isbn_buf, &get_output);
 	if (0 != res) {
 		fprintf(stderr, "Failed to perform the get request!\n");
 		exit(EXIT_FAILURE);
 	}
 	// Now we want to parse the JSON input
 	parse_json(&get_output, isbn_buf, &new_book);
 	do_db_entry(ADD, &new_book);
 	// we need to free these strings
 	free(get_output.buf);
 	free(new_book.authors);
 	free(new_book.image_url);
 }
-void print_help_menu(char* program)
+static struct argp argp = {options, parse_opt, args_doc, doc, 0, 0, 0};
-{
+struct flags flags;
 	printf("%s - An ISBN lookup tool.\n", program);
 	printf("Author: Nathan Singer\n");
 	puts("\n");
 	puts("--help - Shows this message.");
 	puts("[isbn] -- Attempts to download a book from the given ISBN-10 or ISBN-13 input.");
 	puts("remove [id] -- Removes a book with the given ID from the book database.");
 }
 void process_args(char* argv[])
 {
 	int id;
 	if (0 == strcmp(argv[1], "--help")) {
 		print_help_menu(argv[0]);
 	} else if (0 == strcmp(argv[1], "remove")) {
 		if (NULL == argv[2]) {
 			printf("Not enough arguments! Try typing %s --help\n", argv[0]);
 			exit(EXIT_FAILURE);
 		}
 		id = atoi(argv[2]);
 		if (0 == id) {
 			printf("Invalid book ID given!\n");
 			exit(EXIT_FAILURE);
 		}
 		do_db_entry(REMOVE, id);
 	} else {
 		// lets assume its an ISBN and let the other functions fail if its not
 		do_ISBN_get(argv);
 	}
 }
 int main(int argc, char* argv[])
 {
-	if (1 == argc) {
+	get_response resp;
-		printf("Not enough arguments! Try typing %s --help\n", argv[0]);
+	cJSON* query;
 		return EXIT_FAILURE;
 	}
-	process_args(argv);
+	init_flags(&flags);
 	argp_parse(&argp, argc, argv, 0, 0, &flags);
 	/*
 	//book_api_call("9780762437818", &resp);
 	book_api_call(flags.isbn, &resp);
 	if (flags.print)
 		puts(resp.buf);
 	get_json_book(&resp, &query);
 	free_get_response(&resp);
 	if (flags.json)
 		json_out(&query);
 	else
 	 	;	// db out;
 	*/
 	book_t book;
 	book.title = "hi";
 	book.subtitle = "test";
 	book.isbn = "1234";
 	book.authors = "test";
 	book.subjects = "test";
 	book.langs = "eng";
 	book.date_added = "test";
 	book.pub_date = "test";
 	book.image_code = "test";
 	book.page_len = 1;
 	sqlite3* db;
 	setup_db(db);
 	add_to_db(&book, db);
 	return 0;