Plugin cleanups and bugfixes (issue #383, issue #547)

mailpile/plugins/__init__.py

@@ -52,6 +52,14 @@ class PluginManager(object):
 
     def __init__(self, plugin_name=None, builtin=False, deprecated=False,
                  config=None, session=None):
+        if builtin and isinstance(builtin, (str, unicode)):
+            builtin = os.path.basename(builtin)
+            for ignore in ('.py', '.pyo', '.pyc'):
+                if builtin.endswith(ignore):
+                    builtin = builtin[:-len(ignore)]
+            if builtin not in self.LOADED:
+                self.LOADED.append(builtin)
+
         self.loading_plugin = plugin_name
         self.loading_builtin = plugin_name and builtin
         self.builtin = builtin
@@ -162,7 +170,8 @@ def _load(self, plugin_name, process_manifest=False, config=None):
             print 'What what what?? %s' % plugin_name
             return self
 
-        self.LOADED.append(plugin_name)
+        if plugin_name not in self.LOADED:
+            self.LOADED.append(plugin_name)
         return self
 
     def load(self, *args, **kwargs):
@@ -438,7 +447,6 @@ def register_filter_hook_post(self, name, hook):
     VCARD_CONTEXT_PROVIDERS = {}
 
     def _reg_vcard_plugin(self, what, cfg_sect, plugin_classes, cls, dct):
-        self._compat_check()
         for plugin_class in plugin_classes:
             if not plugin_class.SHORT_NAME or not plugin_class.FORMAT_NAME:
                 raise PluginError("Please set SHORT_NAME "

mailpile/plugins/autotag.py

@@ -10,18 +10,21 @@
 from gettext import gettext as _
 
 import mailpile.config
-import mailpile.plugins
+from mailpile.plugins import PluginManager
 from mailpile.commands import Command
 from mailpile.mailutils import Email
 from mailpile.util import *
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 ##[ Configuration ]###########################################################
 
 TAGGERS = {}
 TRAINERS = {}
 
-mailpile.plugins.register_config_section(
+_plugins.register_config_section(
     'prefs', 'autotag', ["Auto-tagging", {
         'match_tag': ['Tag we are adding to automatically', str, ''],
         'unsure_tag': ['If unsure, add to this tag', str, ''],
@@ -314,7 +317,7 @@ def command(self):
         return tag
 
 
-mailpile.plugins.register_commands(Retrain, Classify, AutoTag)
+_plugins.register_commands(Retrain, Classify, AutoTag)
 
 
 ##[ Cron jobs ]###############################################################
@@ -355,4 +358,4 @@ def filter_hook(session, msg_mid, msg, keywords, is_new=True):
 # We add a filter pre-hook with a high (late) priority.  Late priority to
 # maximize the amount of data we are feeding to the classifier, but a
 # pre-hook so normal filter rules will override the autotagging.
-mailpile.plugins.register_filter_hook_pre('90-autotag', filter_hook)
+_plugins.register_filter_hook_pre('90-autotag', filter_hook)

mailpile/plugins/compose.py

@@ -21,7 +21,7 @@
 from mailpile.plugins.search import Search, SearchResults, View
 
 
-_plugins = PluginManager(builtin=True)
+_plugins = PluginManager(builtin=__file__)
 
 
 class EditableSearchResults(SearchResults):

mailpile/plugins/contacts.py

@@ -7,7 +7,7 @@
 from mailpile.util import *
 
 
-_plugins = PluginManager(builtin=True)
+_plugins = PluginManager(builtin=__file__)
 
 
 ##[ VCards ]########################################

mailpile/plugins/crypto_utils.py

@@ -3,12 +3,16 @@
 import time
 from gettext import gettext as _
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
 from mailpile.commands import Command
 
 from mailpile.crypto.gpgi import GnuPG
 from mailpile.crypto.nicknym import Nicknym
 
+
+_plugins = PluginManager(builtin=__file__)
+
+
 class GPGKeySearch(Command):
     """Search for a GPG Key."""
     ORDER = ('', 0)
@@ -107,8 +111,8 @@ def command(self):
         n.refresh_keys()
         return True
 
-mailpile.plugins.register_commands(GPGKeySearch)
-mailpile.plugins.register_commands(GPGKeyReceive)
-mailpile.plugins.register_commands(GPGKeyImport)
-mailpile.plugins.register_commands(NicknymGetKey)
-mailpile.plugins.register_commands(NicknymRefreshKeys)
+_plugins.register_commands(GPGKeySearch)
+_plugins.register_commands(GPGKeyReceive)
+_plugins.register_commands(GPGKeyImport)
+_plugins.register_commands(NicknymGetKey)
+_plugins.register_commands(NicknymRefreshKeys)

mailpile/plugins/cryptostate.py

@@ -1,6 +1,9 @@
 from gettext import gettext as _
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
+
+
+_plugins = PluginManager(builtin=__file__)
 
 
 ##[ Keywords ]################################################################
@@ -38,8 +41,8 @@ def meta_kw_extractor(index, msg_mid, msg, msg_size, msg_ts):
 
     return list(kw)
 
-mailpile.plugins.register_text_kw_extractor('crypto_tkwe', text_kw_extractor)
-mailpile.plugins.register_meta_kw_extractor('crypto_mkwe', meta_kw_extractor)
+_plugins.register_text_kw_extractor('crypto_tkwe', text_kw_extractor)
+_plugins.register_meta_kw_extractor('crypto_mkwe', meta_kw_extractor)
 
 
 ##[ Search helpers ]##########################################################
@@ -51,5 +54,5 @@ def search(config, idx, term, hits):
     #
     return []
 
-mailpile.plugins.register_search_term('crypto', search)
-mailpile.plugins.register_search_term('pgp', search)
+_plugins.register_search_term('crypto', search)
+_plugins.register_search_term('pgp', search)

mailpile/plugins/dates.py

@@ -2,7 +2,10 @@
 import datetime
 from gettext import gettext as _
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
+
+
+_plugins = PluginManager(builtin=__name__)
 
 
 ##[ Keywords ]################################################################
@@ -18,7 +21,7 @@ def meta_kw_extractor(index, msg_mid, msg, msg_size, msg_ts):
     ]
     return keywords
 
-mailpile.plugins.register_meta_kw_extractor('dates', meta_kw_extractor)
+_plugins.register_meta_kw_extractor('dates', meta_kw_extractor)
 
 
 ##[ Search terms ]############################################################
@@ -99,5 +102,5 @@ def search(config, idx, term, hits):
         raise ValueError('Invalid date range: %s' % term)
 
 
-mailpile.plugins.register_search_term('dates', search)
-mailpile.plugins.register_search_term('date', search)
+_plugins.register_search_term('dates', search)
+_plugins.register_search_term('date', search)

mailpile/plugins/eventlog.py

@@ -1,11 +1,14 @@
 import time
 from gettext import gettext as _
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
 from mailpile.commands import Command
 from mailpile.util import *
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 class Events(Command):
     """Display events from the event log"""
     SYNOPSIS = (None, 'eventlog', 'eventlog',
@@ -93,4 +96,4 @@ def fset(arg, val):
 
 
 
-mailpile.plugins.register_commands(Events)
+_plugins.register_commands(Events)

mailpile/plugins/exporters.py

@@ -10,7 +10,7 @@
 from mailpile.mailutils import Email
 
 
-_plugins = PluginManager(builtin=True)
+_plugins = PluginManager(builtin=os.path.basename(__file__)[:-3])
 
 
 ##[ Configuration ]###########################################################

mailpile/plugins/groups.py

@@ -1,12 +1,15 @@
 from gettext import gettext as _
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
 from mailpile.commands import Command
 
 from mailpile.plugins.tags import AddTag, DeleteTag, Filter
 from mailpile.plugins.contacts import *
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 ##[ Search terms ]############################################################
 
 def search(config, idx, term, hits):
@@ -24,8 +27,8 @@ def search(config, idx, term, hits):
         rt.extend(hits('%s:%s' % (email, fromto)))
     return rt
 
-mailpile.plugins.register_search_term('group', search)
-mailpile.plugins.register_search_term('togroup', search)
+_plugins.register_search_term('group', search)
+_plugins.register_search_term('togroup', search)
 
 
 ##[ Commands ]################################################################
@@ -84,5 +87,5 @@ class ListGroups(GroupVCard(ListVCards)):
     """Find groups"""
 
 
-mailpile.plugins.register_commands(Group, AddGroup, GroupAddLines,
-                                   RemoveGroup, ListGroups)
+_plugins.register_commands(Group, AddGroup, GroupAddLines,
+                           RemoveGroup, ListGroups)

mailpile/plugins/hacks.py

@@ -1,13 +1,16 @@
 from gettext import gettext as _
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
 from mailpile.commands import Command
 from mailpile.mailutils import *
 from mailpile.search import *
 from mailpile.util import *
 from mailpile.vcard import *
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 class Hacks(Command):
     """Various hacks ..."""
     SYNOPSIS = (None, 'hacks', None, None)
@@ -112,4 +115,4 @@ def command(self):
         return [self._explain(i) for i in self._choose_messages(self.args)]
 
 
-mailpile.plugins.register_commands(Hacks, FixIndex, PyCLI, ViewMetadata)
+_plugins.register_commands(Hacks, FixIndex, PyCLI, ViewMetadata)

mailpile/plugins/html_magic.py

@@ -3,13 +3,16 @@
 #
 from gettext import gettext as _
 
-import mailpile.plugins
 import mailpile.config
+from mailpile.plugins import PluginManager
 from mailpile.commands import Command
 from mailpile.urlmap import UrlMap
 from mailpile.util import *
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 ##[ Configuration ]###########################################################
 
 #mailpile.plugins.register_config_section('tags', ["Tags", {
@@ -77,4 +80,4 @@ def command(self, save=True, auto=False):
         return res
 
 
-mailpile.plugins.register_commands(JsApi)
+_plugins.register_commands(JsApi)

mailpile/plugins/plugins.py

@@ -1,9 +1,13 @@
+import os
 from gettext import gettext as _
 
 import mailpile.commands
 from mailpile.plugins import PluginManager
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 class Plugins(mailpile.commands.Command):
     """List the currently available plugins."""
     SYNOPSIS = (None, 'plugins', 'plugins', '[<plugins>]')
@@ -79,5 +83,4 @@ def command(self):
                              {'disabled': self.args})
 
 
-PluginManager(builtin=True
-              ).register_commands(Plugins, LoadPlugin, DisablePlugin)
+_plugins.register_commands(Plugins, LoadPlugin, DisablePlugin)

mailpile/plugins/search.py

@@ -13,7 +13,7 @@
 from mailpile.ui import SuppressHtmlOutput
 
 
-_plugin_manager = PluginManager(builtin=True)
+_plugins = PluginManager(builtin=__file__)
 
 
 ##[ Commands ]################################################################
@@ -318,8 +318,7 @@ def command(self):
         return results
 
 
-_plugin_manager.register_commands(Extract, Next, Order, Previous,
-                                  Search, View)
+_plugins.register_commands(Extract, Next, Order, Previous, Search, View)
 
 
 ##[ Search terms ]############################################################
@@ -340,4 +339,4 @@ def mailbox_search(config, idx, term, hits):
     return rt
 
 
-_plugin_manager.register_search_term('mailbox', mailbox_search)
+_plugins.register_search_term('mailbox', mailbox_search)

mailpile/plugins/setup_magic.py

@@ -2,7 +2,7 @@
 from gettext import gettext as _
 from datetime import date 
 
-import mailpile.plugins
+from mailpile.plugins import PluginManager
 from mailpile.plugins import __all__ as PLUGINS
 from mailpile.commands import Command
 from mailpile.crypto.gpgi import GnuPG, SignatureInfo, EncryptionInfo
@@ -11,6 +11,9 @@
 from mailpile.plugins.tags import AddTag, Filter
 
 
+_plugins = PluginManager(builtin=__file__)
+
+
 ##[ Commands ]################################################################
 
 class Setup(Command):
@@ -84,8 +87,7 @@ def command(self):
         session = self.session
 
         if session.config.sys.lockdown:
-            session.ui.warning(_('In lockdown, doing nothing.'))
-            return False
+            return self._error(_('In lockdown, doing nothing.'))
 
         # Create local mailboxes
         session.config.open_local_mailbox(session)
@@ -206,7 +208,7 @@ def command(self):
                                 'indexing of encrypted e-mail. '))
 
         session.config.save()
-        return True
+        return self._success(_('Performed initial Mailpile setup'))
 
 
-mailpile.plugins.register_commands(Setup)
+_plugins.register_commands(Setup)