moggie show mostly works now

mailpile · Sep 30, 2022 · 48bbd69 · 48bbd69
1 parent 95111c6
commit 48bbd69
Show file tree

Hide file tree

Showing 10 changed files with 311 additions and 51 deletions.
diff --git a/moggie/app/cli/__init__.py b/moggie/app/cli/__init__.py
@@ -4,7 +4,7 @@
 from .admin import CommandGrant, CommandContext
 from .admin import CommandUnlock, CommandEnableEncryption
 from .admin import CommandImport, CommandExport
-from .notmuch import CommandSearch, CommandAddress, CommandCount, CommandTag
+from .notmuch import CommandSearch, CommandAddress, CommandShow, CommandCount, CommandTag
 from .notmuch import CommandConfig
 from .help import TOPICS
 
@@ -102,6 +102,7 @@ def _wrap(line, prefix=''):
     CommandContext.NAME: CommandContext,
     CommandAddress.NAME: CommandAddress,
     CommandSearch.NAME: CommandSearch,
+    CommandShow.NAME: CommandShow,
     CommandCount.NAME: CommandCount,
     CommandTag.NAME: CommandTag,
     CommandExport.NAME: CommandExport,

diff --git a/moggie/app/cli/admin.py b/moggie/app/cli/admin.py
@@ -478,7 +478,7 @@ async def get_roles(self, want_context=True):
                     key=lambda i: -int(i[0]))
                 urls = []
                 if with_tokens and tokens:
-                    urls.extend((tokens[0][0], '%s/%s' % (u, tokens[0][1]))
+                    urls.extend((int(tokens[0][0]), '%s/%s' % (u, tokens[0][1]))
                         for u in cfg['config']['urls'])
 
                 if ctxs:

diff --git a/moggie/app/cli/command.py b/moggie/app/cli/command.py
@@ -68,7 +68,7 @@ def __init__(self, wd, args, access=None, appworker=None, connect=True):
         self.messages = []
         self.workdir = wd
 
-        if access is not True and not access:
+        if access is not True and not access and self.ROLES:
             raise PermissionError('Access denied')
         self.access = access
         if self.ROLES and '--context=' not in self.options: