gtg team mailing list archive
-
gtg team
-
Mailing list archive
-
Message #03048
[Merge] lp:~moogman/gtg/fix_get_tasks_list into lp:gtg
Kris Marsh has proposed merging lp:~moogman/gtg/fix_get_tasks_list into lp:gtg.
Requested reviews:
Gtg developers (gtg)
Related bugs:
#615159 notification plugin crash "no attribute 'get_active_tasks_list'" (with fix)
https://bugs.launchpad.net/bugs/615159
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):
--
https://code.launchpad.net/~moogman/gtg/fix_get_tasks_list/+merge/32682
Your team Gtg developers is requested to review the proposed merge of lp:~moogman/gtg/fix_get_tasks_list into lp:gtg.
=== 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"])