Ticket #1038: natural_order_sort_for_milestones.2.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 Christian Boos <cboos@neuf.fr>
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -15 +16 @@
 # Author: Christopher Lenz <cmlenz@gmx.de>
 
 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, \
+                      natural_order
 from trac.ticket import Milestone, Ticket, TicketSystem
 from trac.Timeline import ITimelineEventProvider
 from trac.web import IRequestHandler
@@ -150 +153 @@
         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)
-        req.hdf['roadmap.milestones'] = milestones
+        milestones = [m for m in Milestone.select(self.env, showall)]
+        milestones.sort(lambda a, b:
+                        cmp(a.completed or sys.maxint,
+                            b.completed or sys.maxint) or \
+                        cmp(a.due or sys.maxint, b.due or sys.maxint) or \
+                        natural_order(a.name, b.name))
+        milestones = [milestone_to_hdf(self.env, db, req, m)
+                      for m in milestones]
+        req.hdf['roadmap.milestones'] = milestones        
 
         for idx,milestone in enumerate(milestones):
             milestone_name = unescape(milestone['name']) # Kludge

trac/versioncontrol/web_ui/browser.py

@@ -31 +31 @@
 
 CHUNK_SIZE = 4096
 
-DIGITS = re.compile(r'[0-9]+')
-def _natural_order(x, y):
-    """Comparison function for natural order sorting based on
-    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/214202."""
-    nx = ny = 0
-    while True:
-        a = DIGITS.search(x, nx)
-        b = DIGITS.search(y, ny)
-        if None in (a, b):
-            return cmp(x[nx:], y[ny:])
-        r = (cmp(x[nx:a.start()], y[ny:b.start()]) or
-             cmp(int(x[a.start():a.end()]), int(y[b.start():b.end()])))
-        if r:
-            return r
-        nx, ny = a.end(), b.end()
 
-
 class BrowserModule(Component):
 
     implements(INavigationContributor, IPermissionRequestor, IRequestHandler,
@@ -157 +141 @@
             elif order == 'size':
                 return neg * cmp(a['content_length'], b['content_length'])
             else:
-                return neg * _natural_order(a['name'].lower(),
-                                            b['name'].lower())
+                return neg * util.natural_order(a['name'].lower(),
+                                                b['name'].lower())
         info.sort(cmp_func)
 
         req.hdf['browser.items'] = info

trac/util.py

@@ -260 +260 @@
             shortline = text[:i]+' ...'
     return shortline
 
+DIGITS = re.compile(r'[0-9]+')
+def natural_order(x, y):
+    """Comparison function for natural order sorting based on
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/214202."""
+    nx = ny = 0
+    while True:
+        a = DIGITS.search(x, nx)
+        b = DIGITS.search(y, ny)
+        if None in (a, b):
+            return cmp(x[nx:], y[ny:])
+        r = (cmp(x[nx:a.start()], y[ny:b.start()]) or
+             cmp(int(x[a.start():a.end()]), int(y[b.start():b.end()])))
+        if r:
+            return r
+        nx, ny = a.end(), b.end()
+
 def hex_entropy(bytes=32):
     import md5
     import random