diff options
| author | Madhur Garg <madhurgarg96@gmail.com> | 2019-06-18 01:59:59 +0530 |
|---|---|---|
| committer | Madhur Garg <madhurgarg96@gmail.com> | 2019-06-18 01:59:59 +0530 |
| commit | b881bfad964c69b0a2fdea560d7b59fd5c825709 (patch) | |
| tree | 121ef7def819dcf41cc7a036e1985d3e2ab4b6df | |
| parent | d528a2ff557a5c01f5d9cab6c67034c9237497f3 (diff) | |
| parent | d35256ccc9cd205aa72a5599ab25db7cd7263527 (diff) | |
| download | poezio-b881bfad964c69b0a2fdea560d7b59fd5c825709.tar.gz poezio-b881bfad964c69b0a2fdea560d7b59fd5c825709.tar.bz2 poezio-b881bfad964c69b0a2fdea560d7b59fd5c825709.tar.xz poezio-b881bfad964c69b0a2fdea560d7b59fd5c825709.zip | |
Merge https://lab.louiz.org/poezio/poezio
| -rw-r--r-- | plugins/figlet.py | 22 | ||||
| -rw-r--r-- | plugins/lastlog.py | 3 | ||||
| -rw-r--r-- | poezio/windows/image.py | 2 |
3 files changed, 24 insertions, 3 deletions
diff --git a/plugins/figlet.py b/plugins/figlet.py index b8fcb813..4d4c7577 100644 --- a/plugins/figlet.py +++ b/plugins/figlet.py @@ -11,15 +11,35 @@ Say something in a Chat tab. .. note:: Can create fun things when used with :ref:`The rainbow plugin <rainbow-plugin>`. """ -from poezio.plugin import BasePlugin + import subprocess +from poezio.plugin import BasePlugin + + +def is_figlet() -> bool: + """Ensure figlet exists""" + process = subprocess.Popen( + ['which', 'figlet'], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + return process.wait() == 0 class Plugin(BasePlugin): def init(self): + if not is_figlet(): + self.api.information( + 'Couldn\'t find the figlet program. ' + 'Please install it and reload the plugin.', + 'Error', + ) + return None + self.api.add_event_handler('muc_say', self.figletize) self.api.add_event_handler('conversation_say', self.figletize) self.api.add_event_handler('private_say', self.figletize) + return None def figletize(self, msg, tab): process = subprocess.Popen( diff --git a/plugins/lastlog.py b/plugins/lastlog.py index 5198527e..fd500e08 100644 --- a/plugins/lastlog.py +++ b/plugins/lastlog.py @@ -2,7 +2,8 @@ # -*- coding: utf-8 -*- # vim:fenc=utf-8 # -# Copyright © 2018 Maxime “pep” Buquet <pep@bouah.net> +# Copyright © 2018 Maxime “pep” Buquet +# Copyright © 2019 Madhur Garg # # Distributed under terms of the zlib license. See the COPYING file. diff --git a/poezio/windows/image.py b/poezio/windows/image.py index dfd2eae2..ebecb5ad 100644 --- a/poezio/windows/image.py +++ b/poezio/windows/image.py @@ -20,7 +20,7 @@ try: from gi.repository import Rsvg import cairo HAS_RSVG = True -except (ImportError, ValueError): +except (ImportError, ValueError, AttributeError): HAS_RSVG = False from poezio.windows.base_wins import Win |