From ef4a91e44d03506e24e6255e09540226b33d5791 Mon Sep 17 00:00:00 2001 From: Paweł Jastrzębski Date: Sun, 8 Jul 2018 08:42:34 +0200 Subject: WebP support (close #263) --- kindlecomicconverter/comic2ebook.py | 3 ++- kindlecomicconverter/shared.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'kindlecomicconverter') diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index b560825..e118b7e 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -790,7 +790,8 @@ def splitDirectory(path): level = -1 for root, _, files in os.walk(os.path.join(path, 'OEBPS', 'Images')): for f in files: - if f.endswith('.jpg') or f.endswith('.jpeg') or f.endswith('.png') or f.endswith('.gif'): + if f.endswith('.jpg') or f.endswith('.jpeg') or f.endswith('.png') or f.endswith('.gif') or \ + f.endswith('.webp'): newLevel = os.path.join(root, f).replace(os.path.join(path, 'OEBPS', 'Images'), '').count(os.sep) if level != -1 and level != newLevel: level = 0 diff --git a/kindlecomicconverter/shared.py b/kindlecomicconverter/shared.py index 39c3613..bdfd3e7 100644 --- a/kindlecomicconverter/shared.py +++ b/kindlecomicconverter/shared.py @@ -50,7 +50,8 @@ class HTMLStripper(HTMLParser): def getImageFileName(imgfile): name, ext = os.path.splitext(imgfile) ext = ext.lower() - if name.startswith('.') or (ext != '.png' and ext != '.jpg' and ext != '.jpeg' and ext != '.gif'): + if name.startswith('.') or (ext != '.png' and ext != '.jpg' and ext != '.jpeg' and ext != '.gif' and + ext != '.webp'): return None return [name, ext] @@ -146,10 +147,10 @@ def dependencyCheck(level): missing.append('python-slugify 1.2.1+') try: from PIL import __version__ as pillowVersion - if StrictVersion('4.0.0') > StrictVersion(pillowVersion): - missing.append('Pillow 4.0.0+') + if StrictVersion('5.2.0') > StrictVersion(pillowVersion): + missing.append('Pillow 5.2.0+') except ImportError: - missing.append('Pillow 4.0.0+') + missing.append('Pillow 5.2.0+') if len(missing) > 0: print('ERROR: ' + ', '.join(missing) + ' is not installed!') exit(1) -- cgit 1.4.1