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

[preview] Fix pylint/pep8 errors

Browse Source
This commit is contained in:
Philipp Hörist
2017-11-05 20:46:23 +01:00
parent 4bfcefdea8
commit 359b6a703a
1 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
url_image_preview/url_image_preview.py
View File

@@ -15,28 +15,26 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
## ##
from gi.repository import Gtk, Gdk, GLib, GObject, GdkPixbuf, Gio
import os import os
import hashlib import hashlib
import binascii import binascii
import logging
from urllib.parse import urlparse from urllib.parse import urlparse
from io import BytesIO from io import BytesIO
import shutil import shutil
from functools import partial from functools import partial
import logging from gi.repository import Gtk, Gdk, GLib, GdkPixbuf
import nbxmpp
from gajim.common import app from gajim.common import app
from gajim.common import ged
from gajim.common import helpers from gajim.common import helpers
from gajim.common import configpaths from gajim.common import configpaths
from gajim import dialogs from gajim import dialogs
from gajim.plugins import GajimPlugin from gajim.plugins import GajimPlugin
from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import log_calls
from gajim.plugins.gui import GajimPluginConfigDialog
from gajim.conversation_textview import TextViewImage from gajim.conversation_textview import TextViewImage
from .http_functions import get_http_head, get_http_file from url_image_preview.http_functions import get_http_head, get_http_file
from .config_dialog import UrlImagePreviewConfigDialog from url_image_preview.config_dialog import UrlImagePreviewConfigDialog
log = logging.getLogger('gajim.plugin_system.preview') log = logging.getLogger('gajim.plugin_system.preview')
@@ -54,10 +52,10 @@ try:
from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers import algorithms
from cryptography.hazmat.primitives.ciphers.modes import GCM from cryptography.hazmat.primitives.ciphers.modes import GCM
decryption_available = True decryption_available = True
except Exception as e: except Exception:
DEP_MSG = 'For preview of encrypted images, ' \ DEP_MSG = 'For preview of encrypted images, ' \
'please install python-cryptography!' 'please install python-cryptography!'
log.debug('Cryptography Import Error: ' + str(e)) log.exception('Error')
log.info('Decryption/Encryption disabled due to errors') log.info('Decryption/Encryption disabled due to errors')
decryption_available = False decryption_available = False
@@ -146,7 +144,7 @@ class Base(object):
try: try:
self._create_path(self.directory) self._create_path(self.directory)
self._create_path(self.thumbpath) self._create_path(self.thumbpath)
except Exception as e: except Exception:
log.error("Error creating download and/or thumbnail folder!") log.error("Error creating download and/or thumbnail folder!")
raise raise
@@ -163,8 +161,8 @@ class Base(object):
urlparts = urlparse(real_text) urlparts = urlparse(real_text)
if (urlparts.scheme not in ["https", "aesgcm"] or if (urlparts.scheme not in ["https", "aesgcm"] or
not urlparts.netloc): not urlparts.netloc):
log.info("Not accepting URL scheme '%s' for image preview: %s" % log.info("Not accepting URL scheme '%s' for image preview: %s",
(str(urlparts.scheme), real_text)) urlparts.scheme, real_text)
return return
try: try:
@@ -174,7 +172,7 @@ class Base(object):
# allow aesgcm uris without oob marker (aesgcm uris are always # allow aesgcm uris without oob marker (aesgcm uris are always
# httpupload filetransfers) # httpupload filetransfers)
if (urlparts.scheme != "aesgcm" and real_text != oob_url): if urlparts.scheme != "aesgcm" and real_text != oob_url:
log.info("Not accepting URL for image preview " log.info("Not accepting URL for image preview "
"(wrong or no oob data): %s", real_text) "(wrong or no oob data): %s", real_text)
log.debug("additional_data: %s", additional_data) log.debug("additional_data: %s", additional_data)
@@ -225,7 +223,6 @@ class Base(object):
if os.path.exists(filepath) and not os.path.exists(thumbpath): if os.path.exists(filepath) and not os.path.exists(thumbpath):
with open(filepath, 'rb') as f: with open(filepath, 'rb') as f:
mem = f.read() mem = f.read()
f.closed
app.thread_interface( app.thread_interface(
self._save_thumbnail, [thumbpath, (mem, '')], self._save_thumbnail, [thumbpath, (mem, '')],
self._update_img, [real_text, repl_start, self._update_img, [real_text, repl_start,
@@ -312,13 +309,13 @@ class Base(object):
return (mem, '') return (mem, '')
def _write_file(self, path, data): def _write_file(self, path, data):
log.info("Writing '%s' of size %d..." % (path, len(data))) log.info("Writing '%s' of size %d...", path, len(data))
try: try:
with open(path, "wb") as output_file: with open(path, "wb") as output_file:
output_file.write(data) output_file.write(data)
output_file.closed output_file.closed
except Exception as e: except Exception as e:
log.error("Failed to write file '%s'!" % path) log.error("Failed to write file '%s'!", path)
raise raise
def _update_img(self, tuple_arg, url, repl_start, repl_end, def _update_img(self, tuple_arg, url, repl_start, repl_end,
@@ -342,7 +339,7 @@ class Base(object):
buffer_ = repl_start.get_buffer() buffer_ = repl_start.get_buffer()
iter_ = buffer_.get_iter_at_mark(repl_start) iter_ = buffer_.get_iter_at_mark(repl_start)
#buffer_.insert(iter_, "\n") # buffer_.insert(iter_, "\n")
anchor = buffer_.create_child_anchor(iter_) anchor = buffer_.create_child_anchor(iter_)
# Use url as tooltip for image # Use url as tooltip for image
@@ -357,24 +354,23 @@ class Base(object):
eb.show_all() eb.show_all()
self.textview.tv.add_child_at_anchor(eb, anchor) self.textview.tv.add_child_at_anchor(eb, anchor)
buffer_.delete(iter_, buffer_.delete(iter_,
buffer_.get_iter_at_mark(repl_end)) buffer_.get_iter_at_mark(repl_end))
if at_end: if at_end:
GObject.idle_add(self.textview.scroll_to_end_iter) GLib.idle_add(self.textview.scroll_to_end_iter)
except Exception as ex: except Exception as ex:
log.warn("Exception while loading %s: %s" % (str(url), str(ex))) log.warn("Exception while loading %s: %s", url, ex)
return False return False
# add to mainloop --> make call threadsafe # add to mainloop --> make call threadsafe
GObject.idle_add(add_to_textview) GLib.idle_add(add_to_textview)
except Exception: except Exception:
# URL is already displayed # URL is already displayed
log.error('Could not display image for URL: %s' log.error('Could not display image for URL: %s', url)
% url)
raise raise
else: else:
# If image could not be downloaded, URL is already displayed # If image could not be downloaded, URL is already displayed
log.error('Could not download image for URL: %s -- %s' log.error('Could not download image for URL: %s -- %s',
% (url, alt)) url, alt)
def _check_mime_size(self, tuple_arg, def _check_mime_size(self, tuple_arg,
url, repl_start, repl_end, filepaths, url, repl_start, repl_end, filepaths,
@@ -383,19 +379,19 @@ class Base(object):
# Check if mime type is acceptable # Check if mime type is acceptable
if file_mime == '' and file_size == 0: if file_mime == '' and file_size == 0:
log.info("Failed to load HEAD Request for URL: '%s'" log.info("Failed to load HEAD Request for URL: '%s'"
"(see debug log for more info)" % url) "(see debug log for more info)", url)
# URL is already displayed # URL is already displayed
return return
if file_mime.lower() not in ACCEPTED_MIME_TYPES: if file_mime.lower() not in ACCEPTED_MIME_TYPES:
log.info("Not accepted mime type '%s' for URL: '%s'" log.info("Not accepted mime type '%s' for URL: '%s'",
% (file_mime.lower(), url)) file_mime.lower(), url)
# URL is already displayed # URL is already displayed
return return
# Check if file size is acceptable # Check if file size is acceptable
max_size = int(self.plugin.config['MAX_FILE_SIZE']) max_size = int(self.plugin.config['MAX_FILE_SIZE'])
if file_size > max_size or file_size == 0: if file_size > max_size or file_size == 0:
log.info("File size (%s) too big or unknown (zero) for URL: '%s'" log.info("File size (%s) too big or unknown (zero) for URL: '%s'",
% (str(file_size), url)) file_size, url)
# URL is already displayed # URL is already displayed
return return
@@ -525,6 +521,7 @@ class Base(object):
def on_save_as_menuitem_activate(self, menu, data): def on_save_as_menuitem_activate(self, menu, data):
filepath = data["filepath"] filepath = data["filepath"]
original_filename = data["original_filename"] original_filename = data["original_filename"]
def on_continue(response, target_path): def on_continue(response, target_path):
if response < 0: if response < 0:
return return
@@ -640,8 +637,8 @@ class Base(object):
# right klick # right klick
elif event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: elif event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3:
menu = self.make_rightclick_menu(event, data) menu = self.make_rightclick_menu(event, data)
#menu.attach_to_widget(self.tv, None) # menu.attach_to_widget(self.tv, None)
#menu.popup(None, None, None, event.button, event.time) # menu.popup(None, None, None, event.button, event.time)
menu.popup_at_pointer(event) menu.popup_at_pointer(event)
def disconnect_from_chat_control(self): def disconnect_from_chat_control(self):