th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36 from th3r00t/0.5.0-collections

Browse Source 
Time to merge the collections branch.
This commit is contained in:
th3r00t
2020-04-06 18:55:49 -04:00
committed by GitHub
parent 739c3fa0f5 5ac71b4031
commit 46541d33c4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.json vendored
View File

@@ -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"}

7
src/backend/lib/storage.py
View File

@@ -112,9 +112,9 @@ class Storage:
_s = _p.replace("'", "") _s = _p.replace("'", "")
_x = re.sub(_title_regx, "", _s) _x = re.sub(_title_regx, "", _s)
_s = _x.strip() _s = _x.strip()
breakpoint()
_q_x = """ _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, _s,
book[0], book[0],
@@ -123,7 +123,8 @@ class Storage:
self.cursor.execute(_q_x) self.cursor.execute(_q_x)
if len(self.cursor.fetchall()) < 1: if len(self.cursor.fetchall()) < 1:
self.cursor.execute( 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]) % (_s, book[0])
) )
except Exception as e: except Exception as e:

1
src/interface/views.py
View File

@@ -206,7 +206,6 @@ def menu(which, _set=1):
x = x + 1 x = x + 1
else: else:
x = 0 x = 0
breakpoint()
# TODO trim #'s and symbols from front of collection name # TODO trim #'s and symbols from front of collection name
if len(i.collection) > 16: if len(i.collection) > 16:
collection_string = i.collection[0:16] + " ..." collection_string = i.collection[0:16] + " ..."