From f54414c30031e300308deaa382b0d2df28e13b6b Mon Sep 17 00:00:00 2001 From: FrederikBaerentsen Date: Tue, 7 Jun 2022 21:44:57 +0200 Subject: [PATCH] pushed tentative fix for import --- config.py | 4 ++-- main.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index fc57441..9aaab21 100644 --- a/config.py +++ b/config.py @@ -1,8 +1,8 @@ import os from werkzeug.security import generate_password_hash -CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/library") -#CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/home/drudoo/ComicsTest/Comics") +#CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/library") +CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/home/drudoo/ComicsTest/Comics") TEENYOPDS_ADMIN_PASSWORD = os.getenv("TEENYOPDS_ADMIN_PASSWORD", None) users = {} diff --git a/main.py b/main.py index a8ca9b1..dc68855 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,7 @@ def healthz(): @app.route('/import') def import2sql(): - conn = sqlite3.connect('/app/app.db') + conn = sqlite3.connect('app.db') list = [] start_time = timeit.default_timer() @@ -45,7 +45,6 @@ def import2sql(): for file in files: f = os.path.join(root, file) #try: - print(f,file=sys.stdout) try: s = zipfile.ZipFile(f) #s = gzip.GzipFile(f) @@ -60,13 +59,17 @@ def import2sql(): SERIES=Bs_data.select('Series')[0].text VOLUME=Bs_data.select('Volume')[0].text PUBLISHER=Bs_data.select('Publisher')[0].text - TITLE=Bs_data.select('Title')[0].text + try: + TITLE=Bs_data.select('Title')[0].text + except: + TITLE="" #sometimes title is blank. PATH=f UPDATED=str(datetime.datetime.now()) #print(UPDATED,file=sys.stdout) - sql="INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES ("+CVDB[0]+",'"+ISSUE+"','"+SERIES+"','"+VOLUME+"','"+PUBLISHER+"','"+TITLE+"','"+file+"','" + f + "','" + UPDATED + "')" + #sql="INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES ("+CVDB[0]+",'"+ISSUE+"','"+SERIES+"','"+VOLUME+"','"+PUBLISHER+"','"+TITLE+"','"+file+"','" + f + "','" + UPDATED + "')" #print(sql,file=sys.stdout) - conn.execute(sql); + #conn.execute(sql); + conn.execute("INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES (?,?,?,?,?,?,?,?,?)", (CVDB[0], ISSUE, SERIES, VOLUME, PUBLISHER, TITLE, file, f, UPDATED)) conn.commit() except: print(f,file=sys.stdout)