user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added thumbnails

Browse Source 
Merge remote-tracking branch 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
This commit is contained in:
Ozzie Isaacs
2021-03-20 11:32:50 +01:00
parent 5d8d796807
commit dd30ac4fbd
33 changed files with 965 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/db.py
+8 -5
View File
@@ -620,15 +620,18 @@ class CalibreDB():
randm = self.session.query(Books) \
.filter(self.common_filters(allow_show_archived)) \
.order_by(func.random()) \
.limit(self.config.config_random_books)
.limit(self.config.config_random_books) \
.all()
else:
randm = false()
off = int(int(pagesize) * (page - 1))
query = self.session.query(database) \
.filter(db_filter) \
query = self.session.query(database)
if len(join) == 3:
query = query.join(join[0], join[1]).join(join[2], isouter=True)
elif len(join) == 2:
query = query.join(join[0], join[1], isouter=True)
query = query.filter(db_filter)\
.filter(self.common_filters(allow_show_archived))
if len(join):
query = query.join(*join, isouter=True)
entries = list()
pagination = list()
try: