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

Adjusted logging to avoid max recursion errors

Browse Source
This commit is contained in:
th3r00t
2020-09-10 14:11:55 -04:00
parent b23cbf17d5
commit 88c0eff293
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@@ -6,7 +6,6 @@ from pathlib import Path
from django.core.management.utils import get_random_secret_key from django.core.management.utils import get_random_secret_key
from src.backend.lib.pyShelf import Admin from src.backend.lib.pyShelf import Admin
def load_config(): def load_config():
with open('config.json',"r") as file: with open('config.json',"r") as file:
config = json.load(file) config = json.load(file)
@@ -26,8 +25,20 @@ def set_secret(config=load_config()):
write_config(config) write_config(config)
print(config["SECRET"]) print(config["SECRET"])
else: else:
print(config["SECRET"]) print("Secret already set, skipping.")
def init_django_database():
cmds = [
'python manage.py makemigrations',
'python manage.py makemigrations interface',
'python manage.py migrate',
'python manage.py migrate interface',
]
os.chdir("src")
for cmd in cmds:
os.system(cmd)
os.chdir("../")
set_secret() set_secret()
init_django_database()
Admin(Path.cwd()).createsuperuser() Admin(Path.cwd()).createsuperuser()

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

@@ -7,16 +7,16 @@ import psycopg2
class Storage: class Storage:
"""Contains all methods for system storage""" """Contains all methods for system storage"""
def __init__(self, config): def __init__(self, config):
self.sql = config.catalogue_db self.sql = config.catalogue_db
self.user = config.user self.user = config.user
self.password = config.password self.password = config.password
self.db_host = config.db_host self.db_host = config.db_host
self.db_port = config.db_port self.db_port = config.db_port
self.db = psycopg2.connect( self.db = psycopg2.connect(database=self.sql,
database=self.sql, user=self.user, password=self.password, host=self.db_host user=self.user,
) password=self.password,
host=self.db_host)
self.config = config self.config = config
self.cursor = self.db.cursor() self.cursor = self.db.cursor()
@@ -77,7 +77,7 @@ class Storage:
book[9], # tags book[9], # tags
), ),
) )
self.config.logger.info(book[0]) self.config.logger.info(book[0][0:80])
return True return True
except Exception as e: except Exception as e:
if e.pgcode == '22007': # psycopg2's error code for invalid date if e.pgcode == '22007': # psycopg2's error code for invalid date
@@ -143,12 +143,11 @@ class Storage:
try: try:
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\
"""INSERT INTO collections\ (collection, book_id_id) VALUES ('%s',%s)""" %
(collection, book_id_id) VALUES ('%s',%s)""" (_s, book[0]))
% (_s, book[0]) self.config.logger.info(
) "Collection {} Added".format(_s))
self.config.logger.info("Collection {} Added".format(_s))
except Exception as e: except Exception as e:
self.config.logger.error(e) self.config.logger.error(e)
_collections.append(_p) _collections.append(_p)