From: Ed Page Date: Thu, 16 Apr 2009 04:37:33 +0000 (-0500) Subject: Making the code more composable X-Git-Url: http://git.maemo.org/git/?p=doneit;a=commitdiff_plain;h=c3b6584f546ecda80771c49ede012bc419cae03b Making the code more composable --- diff --git a/src/rtm_view.py b/src/rtm_view.py index aec21a6..d6a563d 100644 --- a/src/rtm_view.py +++ b/src/rtm_view.py @@ -101,8 +101,8 @@ def item_in_agenda(item): return isVisible -def item_agenda_sort_by_date_then_priority(items): - sortedTasks = list(item for item in items if item_in_agenda(item)) +def item_sort_by_fuzzydate_then_priority(items): + sortedTasks = list(items) def advanced_key(taskDetails): dueDate = taskDetails["dueDate"].get_nothrow(datetime.datetime.max) @@ -231,9 +231,10 @@ class ItemListView(object): for taskDetails in rawTasks if self._showCompleted and taskDetails["isCompleted"] or self._showIncomplete and not taskDetails["isCompleted"] ) + # filteredTasks = (taskDetails for taskDetails in filteredTasks if item_in_agenda(taskDetails)) sortedTasks = item_sort_by_priority_then_date(filteredTasks) # sortedTasks = item_sort_by_date_then_priority(filteredTasks) - # sortedTasks = item_agenda_sort_by_date_then_priority(filteredTasks) + # sortedTasks = item_sort_by_fuzzydate_then_priority(filteredTasks) for taskDetails in sortedTasks: id = taskDetails["id"] isCompleted = taskDetails["isCompleted"]