Ticket #1038: milestone_sort_dsu.diff

trac/ticket/roadmap.py

@@ -2 +2 @@
 #
 # Copyright (C) 2004-2005 Edgewall Software
 # Copyright (C) 2004-2005 Christopher Lenz <cmlenz@gmx.de>
+# Copyright (C) 2006 Matthew Good <trac@matt-good.net>
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -13 +14 @@
 # history and logs, available at http://projects.edgewall.com/trac/.
 #
 # Author: Christopher Lenz <cmlenz@gmx.de>
+#         Matthew Good <trac@matt-good.net>
 
 import re
+import sys
 from time import localtime, strftime, time
 
 from trac import __version__
 from trac.core import *
 from trac.perm import IPermissionRequestor
 from trac.util import escape, format_date, format_datetime, parse_date, \
-                      pretty_timedelta, shorten_line, unescape, CRLF, Markup
+                      pretty_timedelta, shorten_line, unescape, CRLF, Markup, \
+                      embedded_numbers, sorted
 from trac.ticket import Milestone, Ticket, TicketSystem
 from trac.Timeline import ITimelineEventProvider
 from trac.web import IRequestHandler
@@ -150 +154 @@
         req.hdf['roadmap.showall'] = showall
 
         db = self.env.get_db_cnx()
-        milestones = []
-        for idx, milestone in enumerate(Milestone.select(self.env, showall)):
-            hdf = milestone_to_hdf(self.env, db, req, milestone)
-            milestones.append(hdf)
+        def milestone_order(m):
+            return (m.completed or sys.maxint,
+                    m.due or sys.maxint,
+                    embedded_numbers(m.name))
+        milestones = sorted(Milestone.select(self.env, showall),
+                            key=milestone_order)
+        milestones = [milestone_to_hdf(self.env, db, req, m)
+                      for m in milestones]
         req.hdf['roadmap.milestones'] = milestones
 
         for idx,milestone in enumerate(milestones):

trac/util.py

@@ -2 +2 @@
 #
 # Copyright (C) 2003-2004 Edgewall Software
 # Copyright (C) 2003-2004 Jonas Borgstr�jonas@edgewall.com>
+# Copyright (C) 2006 Matthew Good <trac@matt-good.net>
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -13 +14 @@
 # history and logs, available at http://projects.edgewall.com/trac/.
 #
 # Author: Jonas Borgstr�jonas@edgewall.com>
+#         Matthew Good <trac@matt-good.net>
 
 import cgi
 import md5
@@ -28 +30 @@
 
 CRLF = '\r\n'
 
+try:
+    sorted
+except NameError:
+    def sorted(iterable, key):
+        """Partial implementation of the "sorted" function from Python 2.4"""
+        lst = [(key(i), i) for i in iterable]
+        lst.sort()
+        return [i for __, i in lst]
 
 class Markup(str):
     """Marks a string as being safe for inclusion in XML output without needing
@@ -260 +270 @@
             shortline = text[:i]+' ...'
     return shortline
 
+DIGITS = re.compile(r'(\d+)')
+def embedded_numbers(s):
+    """Comparison function for natural order sorting based on
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/214202."""
+    pieces = DIGITS.split(s)
+    pieces[1::2] = map(int, pieces[1::2])
+    return pieces
+
 def hex_entropy(bytes=32):
     import md5
     import random