From 8431b6b2a552935174137c88729f869180a3a896 Mon Sep 17 00:00:00 2001 From: Raelon Masters Date: Mon, 6 Apr 2020 17:15:55 -0400 Subject: [PATCH 1/3] Removed breakpoints --- src/backend/lib/storage.py | 6 ++++-- src/interface/views.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/backend/lib/storage.py b/src/backend/lib/storage.py index 972937d..efb6b29 100755 --- a/src/backend/lib/storage.py +++ b/src/backend/lib/storage.py @@ -114,7 +114,8 @@ class Storage: _s = _x.strip() breakpoint() _q_x = """ - SELECT id FROM collections where collection='%s' AND book_id_id=%s + SELECT id FROM collections where collection='%s'\ + AND book_id_id=%s """ % ( _s, book[0], @@ -123,7 +124,8 @@ class Storage: self.cursor.execute(_q_x) if len(self.cursor.fetchall()) < 1: self.cursor.execute( - """INSERT INTO collections (collection, book_id_id) VALUES ('%s',%s)""" + """INSERT INTO collections\ + (collection, book_id_id) VALUES ('%s',%s)""" % (_s, book[0]) ) except Exception as e: diff --git a/src/interface/views.py b/src/interface/views.py index d244e7d..590bb39 100755 --- a/src/interface/views.py +++ b/src/interface/views.py @@ -206,7 +206,6 @@ def menu(which, _set=1): x = x + 1 else: x = 0 - breakpoint() # TODO trim #'s and symbols from front of collection name if len(i.collection) > 16: collection_string = i.collection[0:16] + " ..." From 6df2bdab970dada543cdf1ae9566def3a6dfcb9a Mon Sep 17 00:00:00 2001 From: Raelon Masters Date: Mon, 6 Apr 2020 17:18:21 -0400 Subject: [PATCH 2/3] Removed breakpoints --- src/backend/lib/storage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/backend/lib/storage.py b/src/backend/lib/storage.py index efb6b29..953d8ec 100755 --- a/src/backend/lib/storage.py +++ b/src/backend/lib/storage.py @@ -112,7 +112,6 @@ class Storage: _s = _p.replace("'", "") _x = re.sub(_title_regx, "", _s) _s = _x.strip() - breakpoint() _q_x = """ SELECT id FROM collections where collection='%s'\ AND book_id_id=%s From 5ac71b4031954be138f63de8ea612788984d235e Mon Sep 17 00:00:00 2001 From: th3r00t Date: Mon, 6 Apr 2020 17:20:54 -0400 Subject: [PATCH 3/3] Update config.json Removed my user book folder --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 28132cf..71951be 100755 --- a/config.json +++ b/config.json @@ -1 +1 @@ -{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "/home/raelon/Books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"} +{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}