Bugfixes from testrun
This commit is contained in:
parent
ffc13a5565
commit
3814fbf08f
5 changed files with 1577 additions and 489 deletions
|
@ -71,8 +71,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
|
|||
'dc': 'http://purl.org/dc/elements/1.1/'
|
||||
}
|
||||
|
||||
epub_zip = zipfile.ZipFile(tmp_file_path)
|
||||
tree, cf_name = get_content_opf(epub_zip, ns)
|
||||
tree, cf_name = get_content_opf(tmp_file_path, ns)
|
||||
|
||||
cover_path = os.path.dirname(cf_name)
|
||||
|
||||
|
@ -115,6 +114,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
|
|||
|
||||
epub_metadata = parse_epub_series(ns, tree, epub_metadata)
|
||||
|
||||
epub_zip = zipfile.ZipFile(tmp_file_path)
|
||||
cover_file = parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path)
|
||||
|
||||
identifiers = []
|
||||
|
|
|
@ -1018,6 +1018,7 @@ def do_calibre_export(book_id, book_format, ):
|
|||
except OSError as ex:
|
||||
# ToDo real error handling
|
||||
log.error_or_exception(ex)
|
||||
return None, None
|
||||
|
||||
|
||||
##################################
|
||||
|
|
|
@ -208,7 +208,7 @@ class TaskConvert(CalibreTask):
|
|||
return
|
||||
|
||||
def _convert_kepubify(self, file_path, format_old_ext, format_new_ext):
|
||||
if config.config_embed_metadata:
|
||||
if config.config_embed_metadata and config.config_binariesdir:
|
||||
tmp_dir, temp_file_name = helper.do_calibre_export(self.book_id, format_old_ext[1:])
|
||||
filename = os.path.join(tmp_dir, temp_file_name + format_old_ext)
|
||||
temp_file_path = tmp_dir
|
||||
|
|
|
@ -89,7 +89,7 @@ class TaskBackupMetadata(CalibreTask):
|
|||
|
||||
def open_metadata(self, book, custom_columns):
|
||||
# package = self.create_new_metadata_backup(book, custom_columns)
|
||||
package = create_new_metadata_backup(book, custom_columns, self.export_language)
|
||||
package = create_new_metadata_backup(book, custom_columns, self.export_language, self.translated_title)
|
||||
if config.config_use_google_drive:
|
||||
if not gdriveutils.is_gdrive_ready():
|
||||
raise Exception('Google Drive is configured but not ready')
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue