Make Events complete unless otherwise specified, misc cleanup

mailpile · Oct 25, 2014 · 28ca79f · 28ca79f
1 parent 846acca
commit 28ca79f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/mailpile/command_cache.py b/mailpile/command_cache.py
@@ -1,6 +1,7 @@
 import time
 
 import mailpile.util
+from mailpile.eventlog import Event
 from mailpile.i18n import gettext as _
 from mailpile.i18n import ngettext as _n
 from mailpile.util import *
@@ -88,4 +89,5 @@ def refresh(self, extend=60, event_log=None):
         if refreshed and event_log:
             event_log.log(message=_('New results are available'),
                           source=self,
-                          data={'cache_ids': refreshed})
+                          data={'cache_ids': refreshed},
+                          flags=Event.COMPLETE)
diff --git a/mailpile/commands.py b/mailpile/commands.py
@@ -487,6 +487,7 @@ def _create_event(self):
     def _make_command_event(self, private_data):
         return Event(source=self,
                      message=self._fmt_msg(self.LOG_STARTING),
+                     flags=Event.INCOMPLETE,
                      data={},
                      private_data=private_data)
 

diff --git a/mailpile/eventlog.py b/mailpile/eventlog.py
@@ -63,7 +63,7 @@ def Parse(cls, json_string):
             return cls()
 
     def __init__(self,
-                 ts=None, event_id=None, flags='C', message='',
+                 ts=None, event_id=None, flags='c', message='',
                  source=None, data=None, private_data=None):
         self._data = [
             '',

diff --git a/mailpile/ui.py b/mailpile/ui.py
@@ -313,7 +313,7 @@ def pop_marks(self, name=None, quiet=True):
         if len(self.time_tracking) > 1:
             if not name or (self.time_tracking[-1][0] == name):
                 self.time_tracking.pop(-1)
-        print '(%s/%d) POP' % (self, len(self.time_tracking))
+#       print '(%s/%d) POP' % (self, len(self.time_tracking))
         return elapsed
 
     # Higher level command-related methods