Commit 46197d82 authored by Ozzieisaacs's avatar Ozzieisaacs

Edit and Upload books refactored

parent e4eab175
...@@ -437,20 +437,22 @@ class CalibreDB(threading.Thread): ...@@ -437,20 +437,22 @@ class CalibreDB(threading.Thread):
for cc_id in cc_ids: for cc_id in cc_ids:
if (cc_id[1] == 'bool') or (cc_id[1] == 'int') or (cc_id[1] == 'float'): if (cc_id[1] == 'bool') or (cc_id[1] == 'int') or (cc_id[1] == 'float'):
setattr(Books, 'custom_column_' + str(cc_id[0]), relationship(cc_classes[cc_id[0]], setattr(Books,
primaryjoin=( 'custom_column_' + str(cc_id[0]),
Books.id == cc_classes[cc_id[0]].book), relationship(cc_classes[cc_id[0]],
backref='books')) primaryjoin=(
Books.id == cc_classes[cc_id[0]].book),
backref='books'))
else: else:
setattr(Books, 'custom_column_' + str(cc_id[0]), relationship(cc_classes[cc_id[0]], setattr(Books,
secondary=books_custom_column_links[cc_id[0]], 'custom_column_' + str(cc_id[0]),
backref='books')) relationship(cc_classes[cc_id[0]],
secondary=books_custom_column_links[cc_id[0]],
backref='books'))
# global session
Session = scoped_session(sessionmaker(autocommit=False, Session = scoped_session(sessionmaker(autocommit=False,
autoflush=False, autoflush=False,
bind=self.engine)) bind=self.engine))
self.session = Session() self.session = Session()
return True return True
......
This diff is collapsed.
...@@ -57,12 +57,12 @@ def get_language_name(locale, lang_code): ...@@ -57,12 +57,12 @@ def get_language_name(locale, lang_code):
def get_language_codes(locale, language_names, remainder=None): def get_language_codes(locale, language_names, remainder=None):
language_names = set(x.strip().lower() for x in language_names if x) language_names = set(x.strip().lower() for x in language_names if x)
languages = list()
for k, v in get_language_names(locale).items(): for k, v in get_language_names(locale).items():
v = v.lower() v = v.lower()
if v in language_names: if v in language_names:
languages.append(k)
language_names.remove(v) language_names.remove(v)
yield k
if remainder is not None: if remainder is not None:
remainder.extend(language_names) remainder.extend(language_names)
return languages
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment