Changeset 63ca54f8c7e93cd7200aa325197a73ce5c76a40d

Timestamp:

05/08/08 00:34:18 (8 months ago)

Author:

Paul Jimenez <pj@zachs.org>

git-committer:

Paul Jimenez <pj@zachs.org> 1210224858 -0500

git-parent:

[6deed5dae128d1e9a541de01f356fd922dafc832]

git-author:

Paul Jimenez <pj@zachs.org> 1210224858 -0500

Message:

added pager support
and mark-read support
and folder prefix support
and fixed some bugs

Files:

• mhi.py (modified) (12 diffs)

mhi.py

@@ -6 +6 @@
-#                     debug, refile, show, next, prev
-#
-
+, mr
-#
-# * sort should just store a sort order to apply to output instead of
@@ -12 +12 @@
-#   anything that takes a msgset as well as scan, next, prev, and pick
-#
-
-
+
+
+
+
+
-#
-# minor bits of code taken from http://www.w3.org/2000/04/maillog2rdf/imap_sort.py
@@ -24 +27 @@
-import time
-import string
+import os.path
-import imaplib
-import StringIO
-from configobj import ConfigObj
-
-=
+ = 
-config = ConfigObj(infile="%s/.mhirc" % cfgdir, create_empty=True)
-state = ConfigObj(infile="%s/.mhistate" % cfgdir, create_empty=True)
@@ -191 +195 @@
-    if folder is None:
-        folder = default
+    else:
+        prefix = config.get('folder_prefix','')
+        folder = prefix + folder
-    return folder, outargs
-
@@ -236 +243 @@
-def _fixupMsgset(msgset):
-    # s/cur/$cur/, s/last/$last/, s/prev/$prev/, s/next/$next/
-    msgset = msgset.replace('-', ':')
-    msgset = msgset.replace(' ', ',')
-    cur = state.get(state['folder']+'.cur', None)
-    if cur == 'None': cur = None
@@ -248 +253 @@
-        msgset = msgset.replace('prev', str(int(cur)-1))
-    else:
-
-
-
+
+
+
+
+
+
+
+
-    msgset = msgset.replace('last', "*")
-    msgset = msgset.replace('$', "*")
@@ -359 +369 @@
-    return data
-
+def folder_name(folder):
+    prefix = config.get('folder_prefix',None)
+    if prefix and folder.startswith(prefix):
+        return folder[len(prefix):]
+    return folder
+
-def folder(args):
-    '''Usage: folder [+<foldername>]
@@ -374 +390 @@
-    # inbox+ has 64 messages  (1-64); cur=63; (others).
-    cur = state.get(folder+'.cur', 'unset')
-
+_name(folder)
-
-def folders(args):
@@ -404 +420 @@
-        messages, recent, unseen = foo[1], foo[3], foo[5]
-        cur = state.get(folder+'.cur', ['-', 'CUR'][ folder == HEADER ])
-
+_name(folder)
-        if folder != HEADER:
-            totalmsgs += int(messages)
@@ -530 +546 @@
-    first = data[0].split()[0]
-    state[folder+'.cur'] = first
+
+def mr(args):
+    '''Usage: mr [+folder] <messageset>
+
+    Mark the specified messages (or the current message if unspecified)
+    from the specified folder (or the current folder if unspecified) as read.
+    '''
+    folder, arglist = _argFolder(args, state['folder'])
+    state['folder'] = folder
+    msgset = _fixupMsgset(' '.join(arglist))
+    if not msgset:
+        try:
+            msgset = state[folder+'.cur']
+        except KeyError:
+            print "Error: No current message selected."
+            raise UsageError()
+    _checkMsgset(msgset)
+    S = _connect()
+    do_or_die(S.select(folder), "Problem changing folders:")
+    data = do_or_die(S.search(None, msgset), "Problem with search:")
+    do_or_die(S.store(msgset, '+FLAGS', '\\Seen'), "Problem setting read flag: ")
+    S.close()
+    S.logout()
+    first = data[0].split()[0]
+    state[folder+'.cur'] = first
+
+
-
-def _show(folder, msgset):
@@ -705 +748 @@
-             'repl': repl,
-             'help': help,
+             'mr': mr
-           }
-
@@ -741 +785 @@
-
-if __name__ == '__main__':
+    if sys.stdout.isatty():
+       pager = os.environ.get('PAGER', None)
+       if pager is None:
+           for p in [ '/usr/bin/less', '/bin/more' ]:
+               if os.path.exists(p):
+                   pager = p
+                   break
+       if pager is not None:
+           sys.stdout = os.popen(pager, 'w')
-    try:
-        _dispatch(sys.argv)