Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make default conv settings available

Browse Source 
Also simply temp file code
This commit is contained in:
Kovid Goyal 2018-06-30 12:05:04 +05:30
parent bc861ca8f8
commit b41f016376
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/srv/convert.py
View File

@ -125,21 +125,16 @@ def queue_job(ctx, rd, library_id, db, fmt, book_id, conversion_data):
from calibre.ebooks.conversion.config import GuiRecommendations, save_specifics from calibre.ebooks.conversion.config import GuiRecommendations, save_specifics
from calibre.customize.conversion import OptionRecommendation from calibre.customize.conversion import OptionRecommendation
tdir = tempfile.mkdtemp(dir=rd.tdir) tdir = tempfile.mkdtemp(dir=rd.tdir)
fd, pathtoebook = tempfile.mkstemp( with tempfile.NamedTemporaryFile(prefix='', suffix=('.' + fmt.lower()), dir=tdir, delete=False) as src_file:
prefix='', suffix=('.' + fmt.lower()), dir=tdir) db.copy_format_to(book_id, fmt, src_file)
with os.fdopen(fd, 'wb') as f: with tempfile.NamedTemporaryFile(prefix='', suffix='.jpg', dir=tdir, delete=False) as cover_file:
db.copy_format_to(book_id, fmt, f) cover_copied = db.copy_cover_to(book_id, cover_file)
fd, pathtocover = tempfile.mkstemp(prefix='', suffix=('.jpg'), dir=tdir) cover_path = cover_file.name if cover_copied else None
with os.fdopen(fd, 'wb') as f:
cover_copied = db.copy_cover_to(book_id, f)
cover_path = pathtocover if cover_copied else None
mi = db.get_metadata(book_id) mi = db.get_metadata(book_id)
mi.application_id = mi.uuid mi.application_id = mi.uuid
raw = metadata_to_opf(mi) raw = metadata_to_opf(mi)
fd, opf_path = tempfile.mkstemp(prefix='', suffix=('.opf'), dir=tdir) with tempfile.NamedTemporaryFile(prefix='', suffix='.opf', dir=tdir, delete=False) as opf_file:
with os.fdopen(fd, 'wb') as metadata_file: opf_file.write(raw)
metadata_file.write(raw)
recs = GuiRecommendations() recs = GuiRecommendations()
recs.update(conversion_data['options']) recs.update(conversion_data['options'])
recs['gui_preferred_input_format'] = conversion_data['input_fmt'].lower() recs['gui_preferred_input_format'] = conversion_data['input_fmt'].lower()
@ -149,13 +144,13 @@ def queue_job(ctx, rd, library_id, db, fmt, book_id, conversion_data):
job_id = ctx.start_job( job_id = ctx.start_job(
'Convert book %s (%s)' % (book_id, fmt), 'calibre.srv.convert', 'Convert book %s (%s)' % (book_id, fmt), 'calibre.srv.convert',
'convert_book', args=( 'convert_book', args=(
pathtoebook, opf_path, cover_path, conversion_data['output_fmt'], recs), src_file.name, opf_file.name, cover_path, conversion_data['output_fmt'], recs),
job_done_callback=job_done job_done_callback=job_done
) )
expire_old_jobs() expire_old_jobs()
with cache_lock: with cache_lock:
conversion_jobs[job_id] = JobStatus( conversion_jobs[job_id] = JobStatus(
job_id, book_id, tdir, library_id, pathtoebook, conversion_data) job_id, book_id, tdir, library_id, src_file, conversion_data)
return job_id return job_id
@ -214,7 +209,7 @@ def get_conversion_options(input_fmt, output_fmt, book_id, db):
from calibre.customize.conversion import OptionRecommendation from calibre.customize.conversion import OptionRecommendation
plumber = create_dummy_plumber(input_fmt, output_fmt) plumber = create_dummy_plumber(input_fmt, output_fmt)
specifics = load_specifics(db, book_id) specifics = load_specifics(db, book_id)
ans = {'options': {}, 'disabled': set()} ans = {'options': {}, 'disabled': set(), 'defaults': {}}
def merge_group(group_name, option_names): def merge_group(group_name, option_names):
if not group_name or group_name in ('debug', 'metadata'): if not group_name or group_name in ('debug', 'metadata'):
@ -224,12 +219,14 @@ def get_conversion_options(input_fmt, output_fmt, book_id, db):
plumber.get_option_by_name, OptionRecommendation.LOW, option_names) plumber.get_option_by_name, OptionRecommendation.LOW, option_names)
specifics.merge_recommendations( specifics.merge_recommendations(
plumber.get_option_by_name, OptionRecommendation.HIGH, option_names, only_existing=True) plumber.get_option_by_name, OptionRecommendation.HIGH, option_names, only_existing=True)
defaults = defs.as_dict()
for k in defs: for k in defs:
if k in specifics: if k in specifics:
defs[k] = specifics[k] defs[k] = specifics[k]
defs = defs.as_dict() defs = defs.as_dict()
ans['options'].update(defs['options']) ans['options'].update(defs['options'])
ans['disabled'] |= set(defs['disabled']) ans['disabled'] |= set(defs['disabled'])
ans['defaults'].update(defaults)
for group_name, option_names in OPTIONS['pipe'].iteritems(): for group_name, option_names in OPTIONS['pipe'].iteritems():
merge_group(group_name, option_names) merge_group(group_name, option_names)