mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-30 23:03:02 +00:00
Code Issues Releases Wiki Activity

Bugfix after merge

Browse Source 
Bugfix generate Metadata backup
This commit is contained in:
Ozzie Isaacs
2023-02-28 19:48:53 +01:00
parent 3cf778b591
commit 64e9b13311
5 changed files with 1634 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cps/admin.py
View File

@@ -163,7 +163,7 @@ def queue_metadata_backup():
show_text = {} show_text = {}
log.warning("Queuing all books for metadata backup") log.warning("Queuing all books for metadata backup")
helper.set_all_metadata_dirty() helper.set_all_metadata_dirty()
show_text['text'] = _('Success! Books queued for Metadata Backup') show_text['text'] = _('Success! Books queued for Metadata Backup, please check Tasks for result')
return json.dumps(show_text) return json.dumps(show_text)
@@ -1995,7 +1995,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
else: else:
content.role &= ~constants.ROLE_ANONYMOUS content.role &= ~constants.ROLE_ANONYMOUS
if to_save.get("password", ""): if to_save.get("password", ""):
content.password = generate_password_hash(helper.valid_password(to_save.get["password"])) content.password = generate_password_hash(helper.valid_password(to_save.get("password", "")))
new_email = valid_email(to_save.get("email", content.email)) new_email = valid_email(to_save.get("email", content.email))
if not new_email: if not new_email:

6
cps/tasks/metadata_backup.py
View File

@@ -89,7 +89,6 @@ class TaskBackupMetadata(CalibreTask):
self.open_metadata(book, custom_columns) self.open_metadata(book, custom_columns)
else: else:
self.log.error("Book {} not found in database".format(backup.book)) self.log.error("Book {} not found in database".format(backup.book))
# self._handleError("Book {} not found in database".format(backup.book))
i += 1 i += 1
self.progress = (1.0 / count) * i self.progress = (1.0 / count) * i
self._handleSuccess() self._handleSuccess()
@@ -230,9 +229,8 @@ class TaskBackupMetadata(CalibreTask):
try: try:
with open(book_metadata_filepath, 'wb') as f: with open(book_metadata_filepath, 'wb') as f:
doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True) doc.write(f, xml_declaration=True, encoding='utf-8', pretty_print=True)
except Exception: except Exception as ex:
# ToDo: Folder not writeable error raise Exception('Writing Metadata failed with error: {} '.format(ex))
pass
@property @property
def name(self): def name(self):

2
cps/web.py
View File

@@ -1423,7 +1423,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
try: try:
if current_user.role_passwd() or current_user.role_admin(): if current_user.role_passwd() or current_user.role_admin():
if to_save.get("password", "") != "": if to_save.get("password", "") != "":
current_user.password = generate_password_hash(to_save.get("password")) current_user.password = generate_password_hash(valid_password(to_save.get("password")))
if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail: if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
current_user.kindle_mail = valid_email(to_save.get("kindle_mail")) current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
new_email = valid_email(to_save.get("email", current_user.email)) new_email = valid_email(to_save.get("email", current_user.email))

2
setup.cfg
View File

@@ -58,7 +58,7 @@ install_requires =
flask-wtf>=0.14.2,<1.2.0 flask-wtf>=0.14.2,<1.2.0
chardet>=3.0.0,<4.1.0 chardet>=3.0.0,<4.1.0
advocate>=1.0.0,<1.1.0 advocate>=1.0.0,<1.1.0
Flask-Limiter>=2.3.0,<3.2.0 Flask-Limiter>=2.3.0,<3.3.0
[options.extras_require] [options.extras_require]

3297
test/Calibre-Web TestSummary_Linux.html
View File

File diff suppressed because it is too large Load Diff