From ab534b21c11b36bf1e86addcb607214c37e10027 Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Sun, 2 Apr 2017 10:42:33 +0200 Subject: [PATCH] Code cosmetics --- cps/db.py | 22 +++++++++++----------- cps/helper.py | 2 +- cps/ub.py | 6 ++---- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/cps/db.py b/cps/db.py index c6e069e5..831b597e 100755 --- a/cps/db.py +++ b/cps/db.py @@ -67,9 +67,9 @@ class Identifiers(Base): val = Column(String) book = Column(Integer, ForeignKey('books.id')) - def __init__(self, val, type, book): + def __init__(self, val, id_type, book): self.val = val - self.type = type + self.type = id_type self.book = book def formatType(self): @@ -209,9 +209,9 @@ class Data(Base): uncompressed_size = Column(Integer) name = Column(String) - def __init__(self, book, format, uncompressed_size, name): + def __init__(self, book, book_format, uncompressed_size, name): self.book = book - self.format = format + self.format = book_format self.uncompressed_size = uncompressed_size self.name = name @@ -274,7 +274,7 @@ class Custom_Columns(Base): display = Column(String) is_multiple = Column(Boolean) normalized = Column(Boolean) - + def get_display_dict(self): display_dict = ast.literal_eval(self.display) return display_dict @@ -333,15 +333,15 @@ def setup_db(): 'value': Column(String)} cc_classes[row.id] = type('Custom_Column_' + str(row.id), (Base,), ccdict) - for id in cc_ids: - if id[1] == 'bool': - setattr(Books, 'custom_column_' + str(id[0]), relationship(cc_classes[id[0]], + for cc_id in cc_ids: + if cc_id[1] == 'bool': + setattr(Books, 'custom_column_' + str(cc_id[0]), relationship(cc_classes[cc_id[0]], primaryjoin=( - Books.id == cc_classes[id[0]].book), + Books.id == cc_classes[cc_id[0]].book), backref='books')) else: - setattr(Books, 'custom_column_' + str(id[0]), relationship(cc_classes[id[0]], - secondary=books_custom_column_links[id[0]], + setattr(Books, 'custom_column_' + str(cc_id[0]), relationship(cc_classes[cc_id[0]], + secondary=books_custom_column_links[cc_id[0]], backref='books')) # Base.metadata.create_all(engine) diff --git a/cps/helper.py b/cps/helper.py index 71cacd74..36a25d0e 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -94,7 +94,7 @@ def make_mobi(book_id, calibrepath): if not check or check < 2: book.data.append(db.Data( name=book.data[0].name, - format="MOBI", + book_format="MOBI", book=book.id, uncompressed_size=os.path.getsize(file_path + ".mobi") )) diff --git a/cps/ub.py b/cps/ub.py index 05f0714e..448bb29e 100644 --- a/cps/ub.py +++ b/cps/ub.py @@ -293,10 +293,8 @@ class Config: else: self.config_google_drive_watch_changes_response=None self.config_columns_to_ignore = data.config_columns_to_ignore - if self.config_calibre_dir is not None and (not self.config_use_google_drive or os.path.exists(self.config_calibre_dir + '/metadata.db')): - self.db_configured = True - else: - self.db_configured = False + self.db_configured = bool(self.config_calibre_dir is not None and + (not self.config_use_google_drive or os.path.exists(self.config_calibre_dir + '/metadata.db'))) @property def get_main_dir(self):