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

Merge branch 'Develop' into metadata -> Now all tests should run "pass" now

Browse Source 
# Conflicts:
#	cps/constants.py
#	cps/helper.py
#	cps/tasks/convert.py
#	test/Calibre-Web TestSummary_Linux.html
This commit is contained in:
Ozzie Isaacs
2023-12-11 14:23:12 +01:00
parent 9ef89dbcc3 3a012c900e
commit 31c8909dea
79 changed files with 4922 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/tasks/convert.py
Executable → Regular
+4 -5
View File
@@ -49,7 +49,6 @@ class TaskConvert(CalibreTask):
self.file_path = file_path
self.book_id = book_id
self.title = ""
self.has_cover = None
self.settings = settings
self.ereader_mail = ereader_mail
self.user = user
@@ -67,14 +66,14 @@ class TaskConvert(CalibreTask):
data.name + "." + self.settings['old_book_format'].lower())
df_cover = gdriveutils.getFileFromEbooksFolder(cur_book.path, "cover.jpg")
if df:
datafile = os.path.join(config.config_calibre_dir,
datafile = os.path.join(config.get_book_path(),
cur_book.path,
data.name + "." + self.settings['old_book_format'].lower())
if df_cover:
datafile_cover = os.path.join(config.config_calibre_dir,
datafile_cover = os.path.join(config.get_book_path(),
cur_book.path, "cover.jpg")
if not os.path.exists(os.path.join(config.config_calibre_dir, cur_book.path)):
os.makedirs(os.path.join(config.config_calibre_dir, cur_book.path))
if not os.path.exists(os.path.join(config.get_book_path(), cur_book.path)):
os.makedirs(os.path.join(config.get_book_path(), cur_book.path))
df.GetContentFile(datafile)
if df_cover:
df_cover.GetContentFile(datafile_cover)