hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[preview] Make pillow a required dependency

Browse Source 
Fixes #367
This commit is contained in:
Philipp Hörist
2018-12-09 11:39:35 +01:00
parent f61f8d3d67
commit 003f21034f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
url_image_preview/url_image_preview.py
View File

@@ -41,7 +41,6 @@ from gajim.plugins.plugins_i18n import _
from url_image_preview.http_functions import get_http_head, get_http_file from url_image_preview.http_functions import get_http_head, get_http_file
from url_image_preview.config_dialog import UrlImagePreviewConfigDialog from url_image_preview.config_dialog import UrlImagePreviewConfigDialog
from url_image_preview.resize_gif import resize_gif
from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.filechoosers import FileSaveDialog
from gajim.gtk.util import get_cursor from gajim.gtk.util import get_cursor
@@ -49,12 +48,13 @@ from gajim.gtk.util import get_cursor
log = logging.getLogger('gajim.plugin_system.preview') log = logging.getLogger('gajim.plugin_system.preview')
PILLOW_AVAILABLE = True ERROR_MSG = None
try: try:
from PIL import Image from PIL import Image
from url_image_preview.resize_gif import resize_gif
except: except:
log.debug('Pillow not available') log.debug('Pillow not available')
PILLOW_AVAILABLE = False ERROR_MSG = 'Please install python-pillow'
try: try:
if os.name == 'nt': if os.name == 'nt':
@@ -79,6 +79,12 @@ ACCEPTED_MIME_TYPES = ('image/png', 'image/jpeg', 'image/gif', 'image/raw',
class UrlImagePreviewPlugin(GajimPlugin): class UrlImagePreviewPlugin(GajimPlugin):
@log_calls('UrlImagePreviewPlugin') @log_calls('UrlImagePreviewPlugin')
def init(self): def init(self):
if ERROR_MSG:
self.activatable = False
self.available_text = ERROR_MSG
self.config_dialog = None
return
if not decryption_available: if not decryption_available:
self.available_text = DEP_MSG self.available_text = DEP_MSG
self.config_dialog = partial(UrlImagePreviewConfigDialog, self) self.config_dialog = partial(UrlImagePreviewConfigDialog, self)
@@ -361,9 +367,6 @@ class Base(object):
log.info('Failed to load image using Gdk.Pixbuf') log.info('Failed to load image using Gdk.Pixbuf')
log.debug(error) log.debug(error)
if not PILLOW_AVAILABLE:
log.info('Pillow not available')
return
# Try Pillow # Try Pillow
image = Image.open(BytesIO(mem)).convert("RGBA") image = Image.open(BytesIO(mem)).convert("RGBA")
array = GLib.Bytes.new(image.tobytes()) array = GLib.Bytes.new(image.tobytes())