mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-29 14:27:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py
This commit is contained in:
Ozzieisaacs
2020-01-02 16:20:38 +01:00
parent d9adb4fc94 32e818af6a
commit 48495f0d66
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cps/editbooks.py
View File

@@ -689,8 +689,7 @@ def upload():
db.session.commit()
db.update_title_sort(config)
book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
# upload book to gdrive if nesseccary and add "(bookid)" to folder name
# upload book to gdrive if necessary and add "(bookid)" to folder name
if config.config_use_google_drive:
gdriveutils.updateGdriveCalibreFromLocal()
error = helper.update_dir_stucture(book.id, config.config_calibre_dir)