changeset bd8a559a09db in /home/hg/repos/gajim-plugins

author: hg branches: details:gajim-plugins?cmd=changeset;node=bd8a559a09db description: Fixed behaviour for special texts not resembling correct urls like abc:def or 11:34

diffstat:

url_image_preview/manifest.ini | 3 ++- url_image_preview/url_image_preview.py | 11 ++++++++--- 2 Dateien ver?ndert, 10 Zeilen hinzugef?gt(+), 4 Zeilen entfernt(-)

Unterschiede (53 Zeilen):

diff -r fdc7548539b7 -r bd8a559a09db url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Sep 24 20:01:20 2015 +0200 +++ b/url_image_preview/manifest.ini Sun Sep 27 14:13:34 2015 +0200 @@ -1,12 +1,13 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.6.0 +version: 0.6.1 description: Url image preview in chatbox.<br/> Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin fominde@gmail.com Yann Leboulanger asterix@lagaule.org Anders Sandblad runeson@gmail.com + Thilo Molitor thilo@eightysoft.de homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin min_gajim_version: 0.16 max_gajim_version: 0.16.9 diff -r fdc7548539b7 -r bd8a559a09db url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 24 20:01:20 2015 +0200 +++ b/url_image_preview/url_image_preview.py Sun Sep 27 14:13:34 2015 +0200 @@ -5,6 +5,7 @@ import os import urllib2 import base64 +from urlparse import urlparse

from common import gajim from common import helpers @@ -67,8 +68,6 @@

def print_special_text(self, special_text, other_tags, graphics=True, iter_=None): - if not gajim.interface.basic_pattern_re.match(special_text): - return # remove qip bbcode special_text = special_text.rsplit('[/img]')[0]

@@ -76,7 +75,13 @@ special_text = 'http://' + special_text if special_text.startswith('ftp.'): special_text = 'ftp://' + special_text - + + parts = urlparse(special_text) + if not parts.scheme in ["https", "http", "ftp", "ftps"] or \ + not parts.netloc: + log.info("Not accepting URL for image preview: %s" % special_text) + return + buffer_ = self.textview.tv.get_buffer() if not iter_: iter_ = buffer_.get_end_iter()