Merge lp:~moogman/gtg/fix_get_tasks_list into lp:~gtg/gtg/old-trunk

[Kris Marsh]

Remove dependency to removed function get_tasks_list. rtm_sync, evolution_sync, task_reaper plugins should work as intended again.

The fix pretty much does as suggested on bug 529256. I've been able to test the RTM and evolution plugin but not the task_reaper plugin (so let me know if you'd like me to remove the fix for that plugin).

There's only one remaining call to get_tasks_list() - in api.py. It looks like it should possibly be just removed completely, but I wasn't entirely sure.

$ grep get_tasks_list * -nR
Binary file GTG/core/plugins/api.pyc matches
GTG/core/plugins/api.py:385: return self.__requester.get_tasks_list()
Binary file GTG/plugins/rtm_sync/syncEngine.pyc matches
Binary file GTG/plugins/rtm_sync/genericProxy.pyc matches
GTG/plugins/rtm_sync/rtmProxy.py:136: def get_tasks_list(self):
GTG/plugins/rtm_sync/syncEngine.py:88: remote_tasks = self.remote_proxy.get_tasks_list()
GTG/plugins/rtm_sync/syncEngine.py:89: local_tasks = self.local_proxy.get_tasks_list()
GTG/plugins/rtm_sync/genericProxy.py:23: def get_tasks_list(self):
Binary file GTG/plugins/rtm_sync/rtmProxy.pyc matches
Binary file GTG/plugins/evolution_sync/syncEngine.pyc matches
Binary file GTG/plugins/evolution_sync/genericProxy.pyc matches
GTG/plugins/evolution_sync/syncEngine.py:65: remote_tasks = self.remote_proxy.get_tasks_list()
GTG/plugins/evolution_sync/syncEngine.py:66: local_tasks = self.local_proxy.get_tasks_list()
GTG/plugins/evolution_sync/genericProxy.py:23: def get_tasks_list(self):

[Luca Invernizzi (invernizzi)]

Hi there. This patch is very nice, but we're rewriting the plugin engine as a result of a major rewrite of GTG internals, so I'll wait for that to land before committing your patch.

You seem to have grasped perfectly how the code works :)
Thanks for this!

review: Approve

[Kris Marsh (moogman)]

Do you have a timeline on when that'll be merged? Looks like the RTM plugin has fallen buggy, probably because of the mass rewrites you guys are in the process of doing :-) I'd like to chip off some of the bugs, but I'd keep it in a separate branch so will hold off until this is merged. Thanks!

[Luca Invernizzi (invernizzi)]

No, I don't have a timeline as there is just a few people working on this.
The RTM plugin is being superseded by a RTM "backend" (see http://live.gnome.org/SummerOfCode2010/gtg-backends for an explanation).
The backend is already 99% ready, it just need some polishing. You can have a try using this branch (https://code.edge.launchpad.net/~gtg-user/gtg/multi-backends__invernizzi_gsoc/), but it's still under development, so take care and backup everything before trying.
If you're willing to test it, go to Edit/backends to start (also, you're free to fix bugs :D).

[Luca Invernizzi (invernizzi)]

I've finished fixing the plugin engine and the plugins, but since we've changed the way tasks are stored internally in GTG, this branch cannot be merged anymore. Well, at least we have plugins working again (and I hope we will release in a short time).
Anyway, thanks a lot for your work, you're very welcome to fix stuff in the future :D

review: Disapprove

Unmerged revisions

869. By Kris Marsh on 2010-08-14

Rewrite get_tasks_list where it's still needed. Also includes fix for bug 529256

=== modified file 'GTG/plugins/evolution_sync/gtgProxy.py'
--- GTG/plugins/evolution_sync/gtgProxy.py	2010-03-16 02:16:14 +0000
+++ GTG/plugins/evolution_sync/gtgProxy.py	2010-08-14 21:24:45 +0000
@@ -31,7 +31,7 @@
         requester = self.plugin_api.get_requester()
         statuses = [Task.STA_ACTIVE, Task.STA_DISMISSED, Task.STA_DONE]
         tasks = map(self.plugin_api.get_task, \
-                     requester.get_tasks_list(status = statuses))
+                     requester.get_custom_tasks_tree().displayed_nodes)
         map(lambda task: self._tasks_list.append(GtgTask(task, \
                                         self.plugin_api, self)), tasks)
 
 
=== modified file 'GTG/plugins/notification_area/notification_area.py'
--- GTG/plugins/notification_area/notification_area.py	2010-03-22 05:07:37 +0000
+++ GTG/plugins/notification_area/notification_area.py	2010-08-14 21:24:45 +0000
@@ -108,7 +108,10 @@
         self.requester.connect("task-modified", self.on_task_modified)
         #initial menu populate, just in case the plugin is not activated at GTG
         # startup time
-        task_list = self.requester.get_active_tasks_list(workable = True)
+        customtree = self.requester.get_custom_tasks_tree()
+        customtree.apply_filter("workview")
+        customtree.apply_filter("no_disabled_tag")
+        task_list = customtree.displayed_nodes
         map(lambda tid: self.on_task_added(self.requester, tid), task_list)
         #realizing the menu
         self.menu.show_all()
@@ -118,8 +121,9 @@
         in the notification menu - currently only if it's in the
         workview"""
         task = self.plugin_api.get_requester().get_task(tid)
-        return task.is_workable() and task.is_started()\
-                        and task.get_status() == "Active"
+        return self.requester.filters.workview(task) and \
+                self.requester.filters.no_disabled_tag(task)
+
             
 
 
 
=== modified file 'GTG/plugins/rtm_sync/gtgProxy.py'
--- GTG/plugins/rtm_sync/gtgProxy.py	2010-03-21 18:06:10 +0000
+++ GTG/plugins/rtm_sync/gtgProxy.py	2010-08-14 21:24:45 +0000
@@ -33,8 +33,7 @@
         requester = self.plugin_api.get_requester()
         statuses = [Task.STA_ACTIVE, Task.STA_DISMISSED, Task.STA_DONE]
         tasks = map(self.plugin_api.get_task, \
-                     requester.get_tasks_list(status = statuses, \
-                                              started_only = False))
+                     requester.get_custom_tasks_tree().displayed_nodes)
         map(lambda task: self._tasks_list.append(GtgTask(task, \
                                         self.plugin_api, self)), tasks)
 
 
=== modified file 'GTG/plugins/task_reaper/reaper.py'
--- GTG/plugins/task_reaper/reaper.py	2010-05-12 00:52:05 +0000
+++ GTG/plugins/task_reaper/reaper.py	2010-08-14 21:24:45 +0000
@@ -116,8 +116,10 @@
         self.__log("Starting deletion of old tasks")
         today = datetime.datetime.now().date()
         requester = self.plugin_api.get_requester()
-        closed_tids = requester.get_tasks_list(status = [Task.STA_DISMISSED,
-                                                  Task.STA_DONE])
+        customtree = self.requester.get_custom_tasks_tree()
+        customtree.apply_filter(Task.STA_DISMISSED)
+        customtree.apply_filter(Task.STA_DONE)
+        closed_tids = customtree.displayed_nodes
         closed_tasks = [requester.get_task(tid) for tid in closed_tids]
         #print [t.get_title() for t in closed_tasks]
         delta = datetime.timedelta(days = self.preferences["max_days"])