Re-enabling the cache
[doneit] / src / rtm_view.py
index d6a563d..8fab412 100644 (file)
@@ -1,6 +1,16 @@
 """
 @todo Add an agenda view to the task list
        Tree of days, with each successive 7 days dropping the visibility of further lower priority items
+@todo Add a map view
+       Using new api widgets people are developing)
+       Integrate GPS w/ fallback to default location
+       Use locations for mapping
+@todo Add a quick search (OR within a property type, and between property types) view
+       Drop down for multi selecting priority
+       Drop down for multi selecting tags
+       Drop down for multi selecting locations
+       Calendar selector for choosing due date range
+@todo Remove blocking operations from UI thread
 """
 
 import webbrowser
@@ -11,9 +21,11 @@ import base64
 import gobject
 import gtk
 
+import coroutines
 import toolbox
 import gtk_toolbox
 import rtm_backend
+import cache_backend
 import rtm_api
 
 
@@ -62,10 +74,26 @@ def get_token(username, apiKey, secret):
 
 def get_credentials(credentialsDialog):
        username, password = credentialsDialog.request_credentials()
-       token = get_token(username, rtm_backend.RtMilkManager.API_KEY, rtm_backend.RtMilkManager.SECRET)
+       token = get_token(username, rtm_backend.RtmBackend.API_KEY, rtm_backend.RtmBackend.SECRET)
        return username, password, token
 
 
+def project_sort_by_type(projects):
+       sortedProjects = list(projects)
+       def advanced_key(proj):
+               if proj["name"] == "Inbox":
+                       type = 0
+               elif proj["name"] == "Sent":
+                       type = 1
+               elif not proj["isMeta"]:
+                       type = 2
+               else:
+                       type = 3
+               return type, proj["name"]
+       sortedProjects.sort(key=advanced_key)
+       return sortedProjects
+
+
 def item_sort_by_priority_then_date(items):
        sortedTasks = list(items)
        sortedTasks.sort(
@@ -127,13 +155,15 @@ class ItemListView(object):
        LINK_IDX = 6
        NOTES_IDX = 7
 
-       def __init__(self, widgetTree):
+       def __init__(self, widgetTree, errorDisplay):
+               self._errorDisplay = errorDisplay
                self._manager = None
                self._projId = None
                self._showCompleted = False
                self._showIncomplete = True
 
                self._editDialog = gtk_toolbox.EditTaskDialog(widgetTree)
+               self._notesDialog = gtk_toolbox.NotesDialog(widgetTree)
 
                self._itemList = gtk.ListStore(
                        gobject.TYPE_STRING, # id
@@ -159,6 +189,7 @@ class ItemListView(object):
                self._nameCell = gtk.CellRendererText()
                self._nameColumn.pack_start(self._nameCell, True)
                self._nameColumn.set_attributes(self._nameCell, text=self.NAME_IDX)
+               self._nameColumn.set_expand(True)
                self._dueColumn = gtk.TreeViewColumn('Due')
                self._dueCell = gtk.CellRendererText()
                self._dueColumn.pack_start(self._nameCell, False)
@@ -167,7 +198,7 @@ class ItemListView(object):
                self._linkCell = gtk.CellRendererText()
                self._linkColumn.pack_start(self._nameCell, False)
                self._linkColumn.set_attributes(self._nameCell, text=self.LINK_IDX)
-               self._notesColumn = gtk.TreeViewColumn('') # Notes
+               self._notesColumn = gtk.TreeViewColumn('Notes') # Notes
                self._notesCell = gtk.CellRendererText()
                self._notesColumn.pack_start(self._nameCell, False)
                self._notesColumn.set_attributes(self._nameCell, text=self.NOTES_IDX)
@@ -176,9 +207,18 @@ class ItemListView(object):
                self._todoItemScroll = gtk.ScrolledWindow()
                self._todoItemScroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
                self._todoItemTree = gtk.TreeView()
+               self._todoItemTree.set_headers_visible(True)
+               self._todoItemTree.set_rules_hint(True)
+               self._todoItemTree.set_search_column(self.NAME_IDX)
+               self._todoItemTree.set_enable_search(True)
+               self._todoItemTree.append_column(self._completionColumn)
+               self._todoItemTree.append_column(self._priorityColumn)
+               self._todoItemTree.append_column(self._nameColumn)
+               self._todoItemTree.append_column(self._dueColumn)
+               self._todoItemTree.append_column(self._linkColumn)
+               self._todoItemTree.append_column(self._notesColumn)
+               self._todoItemTree.connect("row-activated", self._on_item_select)
                self._todoItemScroll.add(self._todoItemTree)
-               self._onItemSelectId = 0
-
 
        def enable(self, manager, projId):
                self._manager = manager
@@ -188,18 +228,10 @@ class ItemListView(object):
                self._todoItemScroll.show_all()
 
                self._itemList.clear()
-               self._todoItemTree.append_column(self._completionColumn)
-               self._todoItemTree.append_column(self._priorityColumn)
-               self._todoItemTree.append_column(self._nameColumn)
-               self._todoItemTree.append_column(self._dueColumn)
-               self._todoItemTree.append_column(self._linkColumn)
-               self._todoItemTree.append_column(self._notesColumn)
-               self.reset_task_list(self._projId)
-
-               self._todoItemTree.set_headers_visible(False)
-               self._nameColumn.set_expand(True)
-
-               self._onItemSelectId = self._todoItemTree.connect("row-activated", self._on_item_select)
+               try:
+                       self.reset_task_list(self._projId)
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
        def disable(self):
                self._manager = None
@@ -207,16 +239,9 @@ class ItemListView(object):
 
                self._todoBox.remove(self._todoItemScroll)
                self._todoItemScroll.hide_all()
-               self._todoItemTree.disconnect(self._onItemSelectId)
-
-               self._todoItemTree.remove_column(self._completionColumn)
-               self._todoItemTree.remove_column(self._priorityColumn)
-               self._todoItemTree.remove_column(self._nameColumn)
-               self._todoItemTree.remove_column(self._dueColumn)
-               self._todoItemTree.remove_column(self._linkColumn)
-               self._todoItemTree.remove_column(self._notesColumn)
+
                self._itemList.clear()
-               self._itemList.set_model(None)
+               self._todoItemTree.set_model(None)
 
        def reset_task_list(self, projId):
                self._projId = projId
@@ -259,68 +284,69 @@ class ItemListView(object):
                self._todoItemTree.set_model(self._itemList)
 
        def _on_item_select(self, treeView, path, viewColumn):
-               # @todo See if there is a way to use the new gtk_toolbox.ContextHandler
-               taskId = self._itemList[path[0]][self.ID_IDX]
-
-               if viewColumn is self._priorityColumn:
-                       pass
-               elif viewColumn is self._nameColumn:
-                       self._editDialog.enable(self._manager)
-                       try:
-                               self._editDialog.request_task(self._manager, taskId)
-                       finally:
-                               self._editDialog.disable()
-                       self.reset_task_list(self._projId)
-               elif viewColumn is self._dueColumn:
-                       self._editDialog.enable(self._manager)
-                       try:
-                               self._editDialog.request_task(self._manager, taskId)
-                       finally:
-                               self._editDialog.disable()
-                       self.reset_task_list(self._projId)
-               elif viewColumn is self._linkColumn:
-                       webbrowser.open(self._manager.get_task_details(taskId)["url"])
-               elif viewColumn is self._notesColumn:
-                       pass
+               try:
+                       # @todo See if there is a way to use the new gtk_toolbox.ContextHandler
+                       taskId = self._itemList[path[0]][self.ID_IDX]
+
+                       if viewColumn is self._priorityColumn:
+                               pass
+                       elif viewColumn is self._nameColumn:
+                               self._editDialog.enable(self._manager)
+                               try:
+                                       self._editDialog.request_task(self._manager, taskId)
+                               finally:
+                                       self._editDialog.disable()
+                               self.reset_task_list(self._projId)
+                       elif viewColumn is self._dueColumn:
+                               due = self._manager.get_task_details(taskId)["dueDate"]
+                               if due.is_good():
+                                       calendar = gtk_toolbox.PopupCalendar(None, due.get(), "Due Date")
+                                       calendar.run()
+                       elif viewColumn is self._linkColumn:
+                               webbrowser.open(self._manager.get_task_details(taskId)["url"])
+                       elif viewColumn is self._notesColumn:
+                               self._notesDialog.enable()
+                               try:
+                                       self._notesDialog.run(self._manager, taskId)
+                               finally:
+                                       self._notesDialog.disable()
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
        def _on_completion_change(self, cell, path):
-               taskId = self._itemList[path[0]][self.ID_IDX]
-               self._manager.complete_task(taskId)
-               self.reset_task_list(self._projId)
-
-
-class ItemAgendaView(object):
-       pass
+               try:
+                       taskId = self._itemList[path[0]][self.ID_IDX]
+                       self._manager.complete_task(taskId)
+                       self.reset_task_list(self._projId)
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
 
 class GtkRtMilk(object):
 
-       def __init__(self, widgetTree):
+       def __init__(self, widgetTree, errorDisplay):
                """
                @note Thread agnostic
                """
+               self._errorDisplay = errorDisplay
                self._manager = None
                self._credentials = "", "", ""
 
-               self._clipboard = gtk.clipboard_get()
                self._editDialog = gtk_toolbox.EditTaskDialog(widgetTree)
-
+               self._projDialog = gtk_toolbox.ProjectsDialog(widgetTree)
                self._projectsList = gtk.ListStore(gobject.TYPE_STRING)
                self._projectsCombo = widgetTree.get_widget("projectsCombo")
+               self._projectCell = gtk.CellRendererText()
                self._onListActivateId = 0
 
-               self._taskNameEntry = widgetTree.get_widget("add-taskNameEntry")
-               self._addTaskButton = widgetTree.get_widget("add-addTaskButton")
-               self._pasteTaskNameButton = widgetTree.get_widget("add-pasteTaskNameButton")
-               self._clearTaskNameButton = widgetTree.get_widget("add-clearTaskNameButton")
-               self._onAddId = None
-               self._onAddClickedId = None
-               self._onAddReleasedId = None
-               self._addToEditTimerId = None
-               self._onClearId = None
-               self._onPasteId = None
-
-               self._itemView = ItemListView(widgetTree)
+               self._projectMenuItem = widgetTree.get_widget("projectMenuItem")
+               self._onProjectMenuItemActivated = 0
+
+               self._itemView = ItemListView(widgetTree, self._errorDisplay)
+               addSink = coroutines.CoSwitch(["add", "add-edit"])
+               addSink.register_sink("add", coroutines.func_sink(self._on_add))
+               addSink.register_sink("add-edit", coroutines.func_sink(self._on_add_edit))
+               self._addView = gtk_toolbox.QuickAddView(widgetTree, self._errorDisplay, addSink, "add")
                self._credentialsDialog = gtk_toolbox.LoginWindow(widgetTree)
 
        @staticmethod
@@ -360,7 +386,8 @@ class GtkRtMilk(object):
                credentials = self._credentials
                while True:
                        try:
-                               self._manager = rtm_backend.RtMilkManager(*credentials)
+                               self._manager = rtm_backend.RtmBackend(*credentials)
+                               self._manager = cache_backend.LazyCacheBackend(self._manager)
                                self._credentials = credentials
                                return # Login succeeded
                        except rtm_api.AuthStateMachine.NoData:
@@ -380,105 +407,85 @@ class GtkRtMilk(object):
                """
                self._projectsList.clear()
                self._populate_projects()
+               cell = self._projectCell
+               self._projectsCombo.pack_start(cell, True)
+               self._projectsCombo.add_attribute(cell, 'text', 0)
 
                currentProject = self._get_project()
                projId = self._manager.lookup_project(currentProject)["id"]
+               self._addView.enable(self._manager)
                self._itemView.enable(self._manager, projId)
 
                self._onListActivateId = self._projectsCombo.connect("changed", self._on_list_activate)
-               self._onAddId = self._addTaskButton.connect("clicked", self._on_add)
-               self._onAddClickedId = self._addTaskButton.connect("pressed", self._on_add_pressed)
-               self._onAddReleasedId = self._addTaskButton.connect("released", self._on_add_released)
-               self._onPasteId = self._pasteTaskNameButton.connect("clicked", self._on_paste)
-               self._onClearId = self._clearTaskNameButton.connect("clicked", self._on_clear)
+               self._onProjectMenuItemActivated = self._projectMenuItem.connect("activate", self._on_proj_activate)
 
        def disable(self):
                """
                @note UI Thread
                """
                self._projectsCombo.disconnect(self._onListActivateId)
-               self._addTaskButton.disconnect(self._onAddId)
-               self._addTaskButton.disconnect(self._onAddClickedId)
-               self._addTaskButton.disconnect(self._onAddReleasedId)
-               self._pasteTaskNameButton.disconnect(self._onPasteId)
-               self._clearTaskNameButton.disconnect(self._onClearId)
+               self._projectMenuItem.disconnect(self._onProjectMenuItemActivated)
+               self._onListActivateId = 0
 
+               self._addView.disable()
                self._itemView.disable()
 
                self._projectsList.clear()
                self._projectsCombo.set_model(None)
-               self._projectsCombo.disconnect("changed", self._on_list_activate)
-
-               self._manager = None
 
        def _populate_projects(self):
-               for project in self._manager.get_projects():
+               projects = self._manager.get_projects()
+               sortedProjects = project_sort_by_type(projects)
+               for project in sortedProjects:
                        projectName = project["name"]
                        isVisible = project["isVisible"]
                        row = (projectName, )
                        if isVisible:
                                self._projectsList.append(row)
                self._projectsCombo.set_model(self._projectsList)
-               cell = gtk.CellRendererText()
-               self._projectsCombo.pack_start(cell, True)
-               self._projectsCombo.add_attribute(cell, 'text', 0)
                self._projectsCombo.set_active(0)
 
        def _reset_task_list(self):
-               currentProject = self._get_project()
-               projId = self._manager.lookup_project(currentProject)["id"]
+               projectName = self._get_project()
+               projId = self._manager.lookup_project(projectName)["id"]
+               self._itemView.reset_task_list(projId)
+
                isMeta = self._manager.get_project(projId)["isMeta"]
                # @todo RTM handles this by defaulting to a specific list
-               self._addTaskButton.set_sensitive(not isMeta)
-
-               self._itemView.reset_task_list(projId)
+               self._addView.set_addability(not isMeta)
 
        def _get_project(self):
                currentProjectName = self._projectsCombo.get_active_text()
                return currentProjectName
 
        def _on_list_activate(self, *args):
-               self._reset_task_list()
+               try:
+                       self._reset_task_list()
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
-       def _on_add(self, *args):
-               name = self._taskNameEntry.get_text()
+       def _on_add(self, eventData):
+               eventName, taskName, = eventData
+               projectName = self._get_project()
+               projId = self._manager.lookup_project(projectName)["id"]
 
-               currentProject = self._get_project()
-               projId = self._manager.lookup_project(currentProject)["id"]
-               taskId = self._manager.add_task(projId, name)
+               taskId = self._manager.add_task(projId, taskName)
 
-               self._taskNameEntry.set_text("")
-               self._reset_task_list()
+               self._itemView.reset_task_list(projId)
 
-       def _on_add_edit(self, *args):
-               name = self._taskNameEntry.get_text()
+       def _on_add_edit(self, eventData):
+               eventName, taskName, = eventData
+               projectName = self._get_project()
+               projId = self._manager.lookup_project(projectName)["id"]
 
-               currentProject = self._get_project()
-               projId = self._manager.lookup_project(currentProject)["id"]
-               taskId = self._manager.add_task(projId, name)
+               taskId = self._manager.add_task(projId, taskName)
 
+               self._editDialog.enable(self._manager)
                try:
-                       self._editDialog.enable(self._manager)
-                       try:
-                               self._editDialog.request_task(self._manager, taskId)
-                       finally:
-                               self._editDialog.disable()
+                       self._editDialog.request_task(self._manager, taskId)
                finally:
-                       self._taskNameEntry.set_text("")
-                       self._reset_task_list()
-
-       def _on_add_pressed(self, widget):
-               self._addToEditTimerId = gobject.timeout_add(1000, self._on_add_edit)
-
-       def _on_add_released(self, widget):
-               if self._addToEditTimerId is not None:
-                       gobject.source_remove(self._addToEditTimerId)
-               self._addToEditTimerId = None
-
-       def _on_paste(self, *args):
-               entry = self._taskNameEntry.get_text()
-               entry += self._clipboard.wait_for_text()
-               self._taskNameEntry.set_text(entry)
+                       self._editDialog.disable()
+               self._itemView.reset_task_list(projId)
 
-       def _on_clear(self, *args):
-               self._taskNameEntry.set_text("")
+       def _on_proj_activate(self, *args):
+               self._projDialog.enable(self._manager)