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

More work on conversion in server

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-26 08:58:55 +05:30
parent 6b01ddeaa3
commit 0fd8a9aee9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ from __future__ import absolute_import, division, print_function, unicode_litera
import os import os
import shutil import shutil
import tempfile import tempfile
from functools import partial
from threading import Lock from threading import Lock
from calibre.srv.errors import BookNotFound, HTTPNotFound from calibre.srv.errors import BookNotFound, HTTPNotFound
@ -78,15 +77,40 @@ def job_done(job):
safe_delete_file(job_status.pathtoebook) safe_delete_file(job_status.pathtoebook)
def queue_job(ctx, rd, library_id, copy_format_to, fmt, book_id, conversion_data): def convert_book(path_to_ebook, opf_path, cover_path, output_fmt, recs):
pass
def queue_job(ctx, rd, library_id, db, fmt, book_id, conversion_data):
from calibre.ebooks.metadata.opf2 import metadata_to_opf
from calibre.ebooks.conversion.config import GuiRecommendations, save_specifics
from calibre.customize.conversion import OptionRecommendation
tdir = tempfile.mkdtemp(dir=rd.tdir) tdir = tempfile.mkdtemp(dir=rd.tdir)
fd, pathtoebook = tempfile.mkstemp(prefix='', suffix=('.' + fmt.lower()), dir=tdir) fd, pathtoebook = tempfile.mkstemp(prefix='', suffix=('.' + fmt.lower()), dir=tdir)
with os.fdopen(fd, 'wb') as f: with os.fdopen(fd, 'wb') as f:
copy_format_to(f) db.copy_format_to(book_id, fmt, f)
fd, pathtocover = tempfile.mkstemp(prefix='', suffix=('.jpg'), dir=tdir)
with os.fdopen(fd, 'wb') as f:
cover_copied = db.copy_cover_to(book_id, f)
cover_path = f.name if cover_copied else None
mi = db.get_metadata(book_id)
mi.application_id = mi.uuid
raw = metadata_to_opf(mi)
fd, pathtocover = tempfile.mkstemp(prefix='', suffix=('.opf'), dir=tdir)
with os.fdopen(fd, 'wb') as metadata_file:
metadata_file.write(raw)
recs = GuiRecommendations()
recs.update(conversion_data['options'])
recs['gui_preferred_input_format'] = conversion_data.input_fmt.lower()
save_specifics(db, book_id, recs)
recs = [(k, v, OptionRecommendation.HIGH) for k, v in recs.iteritems()]
job_id = ctx.start_job( job_id = ctx.start_job(
'Convert book %s (%s)' % (book_id, fmt), 'calibre.srv.convert_book', 'Convert book %s (%s)' % (book_id, fmt), 'calibre.srv.convert_book',
'convert_book', args=(pathtoebook, conversion_data), 'convert_book', args=(
job_done_callback=job_done pathtoebook, metadata_file.name, cover_path, conversion_data['output_fmt'], recs),
job_done_callback=job_done
) )
expire_old_jobs() expire_old_jobs()
with cache_lock: with cache_lock:
@ -101,7 +125,7 @@ def start_conversion(ctx, rd, book_id):
raise BookNotFound(book_id, db) raise BookNotFound(book_id, db)
data = json.loads(rd.request_body_file.read()) data = json.loads(rd.request_body_file.read())
input_fmt = data['input_fmt'] input_fmt = data['input_fmt']
job_id = queue_job(ctx, rd, library_id, partial(db.copy_format_to, book_id, input_fmt), input_fmt, book_id, data) job_id = queue_job(ctx, rd, library_id, db, input_fmt, book_id, data)
return job_id return job_id