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

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
This commit is contained in:
Ozzieisaacs
2019-04-20 18:32:46 +02:00
parent 05da2ae3c7 f1a65a2aeb
commit 2de4bfdcf2
13 changed files with 266 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/opds.py
+2 -2
View File
@@ -312,14 +312,14 @@ def feed_get_cover(book_id):
return helper.get_book_cover(book.path)
@opds.route("/opds/readbooks/")
@login_required_if_no_ano
@requires_basic_auth_if_no_ano
def feed_read_books():
off = request.args.get("offset") or 0
return render_read_books(int(off) / (int(config.config_books_per_page)) + 1, True, True)
@opds.route("/opds/unreadbooks/")
@login_required_if_no_ano
@requires_basic_auth_if_no_ano
def feed_unread_books():
off = request.args.get("offset") or 0
return render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True)