Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make PIL optional #885

Browse Source
This commit is contained in:
Ozzieisaacs 2019-04-17 20:45:08 +02:00
parent e1e79a73e8
commit 89516fc2d6
2 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cps/book_formats.py
View File

@ -62,7 +62,11 @@ except ImportError as e:
logger.warning('cannot import fb2, extracting fb2 metadata will not work: %s', e) logger.warning('cannot import fb2, extracting fb2 metadata will not work: %s', e)
use_fb2_meta = False use_fb2_meta = False
from PIL import Image try:
from PIL import Image
use_PIL = True
except ImportError:
use_PIL = False
def process(tmp_file_path, original_file_name, original_file_extension): def process(tmp_file_path, original_file_name, original_file_extension):
@ -133,6 +137,7 @@ def pdf_preview(tmp_file_path, tmp_dir):
if use_generic_pdf_cover: if use_generic_pdf_cover:
return None return None
else: else:
if use_PIL:
try: try:
input1 = PdfFileReader(open(tmp_file_path, 'rb'), strict=False) input1 = PdfFileReader(open(tmp_file_path, 'rb'), strict=False)
page0 = input1.getPage(0) page0 = input1.getPage(0)
@ -173,7 +178,6 @@ def pdf_preview(tmp_file_path, tmp_dir):
# img.save(obj[1:] + ".png") # img.save(obj[1:] + ".png")
except Exception as ex: except Exception as ex:
print(ex) print(ex)
try: try:
cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg" cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg"
with Image(filename=tmp_file_path + "[0]", resolution=150) as img: with Image(filename=tmp_file_path + "[0]", resolution=150) as img:

8
cps/helper.py
View File

@ -35,7 +35,6 @@ from flask_babel import gettext as _
from flask_login import current_user from flask_login import current_user
from babel.dates import format_datetime from babel.dates import format_datetime
from datetime import datetime from datetime import datetime
from PIL import Image
import shutil import shutil
import requests import requests
try: try:
@ -52,6 +51,12 @@ try:
except ImportError: except ImportError:
use_unidecode = False use_unidecode = False
try:
from PIL import Image
use_PIL = True
except ImportError:
use_PIL = False
# Global variables # Global variables
# updater_thread = None # updater_thread = None
global_WorkerThread = worker.WorkerThread() global_WorkerThread = worker.WorkerThread()
@ -481,6 +486,7 @@ def save_cover(img, book_path):
web.app.logger.error("Only jpg/jpeg/png/webp files are supported as coverfile") web.app.logger.error("Only jpg/jpeg/png/webp files are supported as coverfile")
return False return False
if use_PIL:
# convert to jpg because calibre only supports jpg # convert to jpg because calibre only supports jpg
if content_type in ('image/png', 'image/webp'): if content_type in ('image/png', 'image/webp'):
if hasattr(img,'stream'): if hasattr(img,'stream'):