|
|
@ -34,6 +34,7 @@ from sqlalchemy.ext.declarative import declarative_base
|
|
|
|
from sqlalchemy.exc import OperationalError
|
|
|
|
from sqlalchemy.exc import OperationalError
|
|
|
|
from flask_login import current_user
|
|
|
|
from flask_login import current_user
|
|
|
|
from sqlalchemy.sql.expression import and_, true, false, text, func, or_
|
|
|
|
from sqlalchemy.sql.expression import and_, true, false, text, func, or_
|
|
|
|
|
|
|
|
from sqlalchemy.ext.associationproxy import association_proxy
|
|
|
|
from babel import Locale as LC
|
|
|
|
from babel import Locale as LC
|
|
|
|
from babel.core import UnknownLocaleError
|
|
|
|
from babel.core import UnknownLocaleError
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
from flask_babel import gettext as _
|
|
|
@ -48,7 +49,7 @@ except ImportError:
|
|
|
|
use_unidecode = False
|
|
|
|
use_unidecode = False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cc_exceptions = ['datetime', 'comments', 'composite', 'series']
|
|
|
|
cc_exceptions = ['datetime', 'comments', 'composite']
|
|
|
|
cc_classes = {}
|
|
|
|
cc_classes = {}
|
|
|
|
|
|
|
|
|
|
|
|
Base = declarative_base()
|
|
|
|
Base = declarative_base()
|
|
|
@ -406,33 +407,45 @@ class CalibreDB(threading.Thread):
|
|
|
|
books_custom_column_links = {}
|
|
|
|
books_custom_column_links = {}
|
|
|
|
for row in cc:
|
|
|
|
for row in cc:
|
|
|
|
if row.datatype not in cc_exceptions:
|
|
|
|
if row.datatype not in cc_exceptions:
|
|
|
|
books_custom_column_links[row.id] = Table('books_custom_column_' + str(row.id) + '_link', Base.metadata,
|
|
|
|
if row.datatype == 'series':
|
|
|
|
|
|
|
|
dicttable = {'__tablename__': 'books_custom_column_' + str(row.id) + '_link',
|
|
|
|
|
|
|
|
'id': Column(Integer, primary_key=True),
|
|
|
|
|
|
|
|
'book': Column(Integer, ForeignKey('books.id'),
|
|
|
|
|
|
|
|
primary_key=True),
|
|
|
|
|
|
|
|
'map_value': Column('value', Integer,
|
|
|
|
|
|
|
|
ForeignKey('custom_column_' +
|
|
|
|
|
|
|
|
str(row.id) + '.id'),
|
|
|
|
|
|
|
|
primary_key=True),
|
|
|
|
|
|
|
|
'extra': Column(Float),
|
|
|
|
|
|
|
|
'asoc' : relationship('Custom_Column_' + str(row.id), uselist=False),
|
|
|
|
|
|
|
|
'value' : association_proxy('asoc', 'value')
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
books_custom_column_links[row.id] = type(str('Books_Custom_Column_' + str(row.id) + '_link'),
|
|
|
|
|
|
|
|
(Base,), dicttable)
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
books_custom_column_links[row.id] = Table('books_custom_column_' + str(row.id) + '_link',
|
|
|
|
|
|
|
|
Base.metadata,
|
|
|
|
Column('book', Integer, ForeignKey('books.id'),
|
|
|
|
Column('book', Integer, ForeignKey('books.id'),
|
|
|
|
primary_key=True),
|
|
|
|
primary_key=True),
|
|
|
|
Column('value', Integer,
|
|
|
|
Column('value', Integer,
|
|
|
|
ForeignKey('custom_column_' + str(row.id) + '.id'),
|
|
|
|
ForeignKey('custom_column_' +
|
|
|
|
|
|
|
|
str(row.id) + '.id'),
|
|
|
|
primary_key=True)
|
|
|
|
primary_key=True)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
cc_ids.append([row.id, row.datatype])
|
|
|
|
cc_ids.append([row.id, row.datatype])
|
|
|
|
if row.datatype == 'bool':
|
|
|
|
|
|
|
|
ccdict = {'__tablename__': 'custom_column_' + str(row.id),
|
|
|
|
ccdict = {'__tablename__': 'custom_column_' + str(row.id),
|
|
|
|
'id': Column(Integer, primary_key=True),
|
|
|
|
'id': Column(Integer, primary_key=True)}
|
|
|
|
'book': Column(Integer, ForeignKey('books.id')),
|
|
|
|
if row.datatype == 'float':
|
|
|
|
'value': Column(Boolean)}
|
|
|
|
ccdict['value'] = Column(Float)
|
|
|
|
elif row.datatype == 'int':
|
|
|
|
elif row.datatype == 'int':
|
|
|
|
ccdict = {'__tablename__': 'custom_column_' + str(row.id),
|
|
|
|
ccdict['value'] = Column(Integer)
|
|
|
|
'id': Column(Integer, primary_key=True),
|
|
|
|
elif row.datatype == 'bool':
|
|
|
|
'book': Column(Integer, ForeignKey('books.id')),
|
|
|
|
ccdict['value'] = Column(Boolean)
|
|
|
|
'value': Column(Integer)}
|
|
|
|
|
|
|
|
elif row.datatype == 'float':
|
|
|
|
|
|
|
|
ccdict = {'__tablename__': 'custom_column_' + str(row.id),
|
|
|
|
|
|
|
|
'id': Column(Integer, primary_key=True),
|
|
|
|
|
|
|
|
'book': Column(Integer, ForeignKey('books.id')),
|
|
|
|
|
|
|
|
'value': Column(Float)}
|
|
|
|
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
ccdict = {'__tablename__': 'custom_column_' + str(row.id),
|
|
|
|
ccdict['value'] = Column(String)
|
|
|
|
'id': Column(Integer, primary_key=True),
|
|
|
|
if row.datatype in ['float', 'int', 'bool']:
|
|
|
|
'value': Column(String)}
|
|
|
|
ccdict['book'] = Column(Integer, ForeignKey('books.id'))
|
|
|
|
cc_classes[row.id] = type(str('Custom_Column_' + str(row.id)), (Base,), ccdict)
|
|
|
|
cc_classes[row.id] = type(str('Custom_Column_' + str(row.id)), (Base,), ccdict)
|
|
|
|
|
|
|
|
|
|
|
|
for cc_id in cc_ids:
|
|
|
|
for cc_id in cc_ids:
|
|
|
@ -440,9 +453,14 @@ class CalibreDB(threading.Thread):
|
|
|
|
setattr(Books,
|
|
|
|
setattr(Books,
|
|
|
|
'custom_column_' + str(cc_id[0]),
|
|
|
|
'custom_column_' + str(cc_id[0]),
|
|
|
|
relationship(cc_classes[cc_id[0]],
|
|
|
|
relationship(cc_classes[cc_id[0]],
|
|
|
|
primaryjoin=(
|
|
|
|
primaryjoin=( # ToDo: Check Remove
|
|
|
|
Books.id == cc_classes[cc_id[0]].book),
|
|
|
|
Books.id == cc_classes[cc_id[0]].book),
|
|
|
|
backref='books'))
|
|
|
|
backref='books'))
|
|
|
|
|
|
|
|
elif (cc_id[1] == 'series'):
|
|
|
|
|
|
|
|
setattr(Books,
|
|
|
|
|
|
|
|
'custom_column_' + str(cc_id[0]),
|
|
|
|
|
|
|
|
relationship(books_custom_column_links[cc_id[0]],
|
|
|
|
|
|
|
|
backref='books'))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
setattr(Books,
|
|
|
|
setattr(Books,
|
|
|
|
'custom_column_' + str(cc_id[0]),
|
|
|
|
'custom_column_' + str(cc_id[0]),
|
|
|
|