WebP support (close #263)

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

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)

requirements.txt

@@ -1,5 +1,5 @@
 PyQt5>=5.6.0
-Pillow>=4.0.0
+Pillow>=5.2.0
 psutil>=5.0.0
 python-slugify>=1.2.1
 raven>=6.0.0

setup.py

@@ -93,7 +93,7 @@ setuptools.setup(
     packages=['kindlecomicconverter'],
     install_requires=[
         'PyQt5>=5.6.0',
-        'Pillow>=4.0.0',
+        'Pillow>=5.2.0',
         'psutil>=5.0.0',
         'python-slugify>=1.2.1',
         'raven>=6.0.0',