Changeset 4177

Timestamp:

08/24/08 20:56:26 (5 months ago)

Author:

coderanger

Message:

Checkpoint, doing things stupidly.

Files:

• masterticketsplugin/0.11/mastertickets/util.py (modified) (2 diffs)
• masterticketsplugin/0.11/mastertickets/web_ui.py (modified) (4 diffs)

masterticketsplugin/0.11/mastertickets/util.py

@@ -1 +1 @@
-from trac.ticket.model import Ticket
-from trac.resource import ResourceNotFound
-
+
-from genshi.builder import tag
-
@@ -16 +16 @@
-        del data[-1] # Remove the last comma if needed
-    return tag.span(*data)
+
+def diff_lists(a, b):
+    """Return two sets containing the numbers added and removed between the
+    two lists.
+    """
+    a = set([int(n) for n in a])
+    b = set([int(n) for n in b])
+    return a - b, b - a
+

masterticketsplugin/0.11/mastertickets/web_ui.py

@@ -2 +2 @@
-
-from pkg_resources import resource_filename
-
+, START, END, TEXT
-from genshi.builder import tag
-from genshi.filters.transform import Transformer
@@ -34 +34 @@
-    
-    FIELD_XPATH = 'div[@id="ticket"]/table[@class="properties"]/td[@headers="h_%s"]/text()'
+    fields = set(['blocking', 'blockedby'])
-    
-    # IRequestFilter methods
@@ -67 +68 @@
-            for field, value in data['mastertickets']['field_values'].iteritems():
-                stream |= Transformer(self.FIELD_XPATH % field).replace(value)
+        if req.path_info.startswith('/ticket'):
+            pass
+            #stream |= Transformer('//ul[@class="changes"]/li').apply(self._change_filter())
-        return stream
-        
@@ -166 +170 @@
-        
-        return g
+    
+    def _change_filter(self):
+        flag = [0]
+        name = []
+        buf = []
+        def _inner(stream):
+            for mark, (kind, data, pos) in stream:
+                if mark:
+                    if flag[0] == 0 and kind is START and data[0].localname == 'strong':
+                        flag[0] = 1
+                    elif flag[0] == 1 and kind is TEXT:
+                        if data.strip() in self.fields:
+                            name.append(data.strip())
+                            flag[0] = 2
+                        else:
+                            flag[0] = 0
+                    elif flag[0] == 2 and kind is START and data[0].localname == 'em':
+                        flag[0] = 3
+                    elif flag[0] == 3 and kind is TEXT:
+                        buf.append(data)
+                        if len(data) >= 2:
+                            flag[0] = 4
+                        else:
+                            flag[0] = 2
+                    elif kind is END and data.localname == 'li':
+                        flag[0] = 5
+                    
+                    if flag[0] == 0:
+                        yield True, (kind, data, pos)
+                    elif flag[0] == 5:
+                        if len(buf) == 0:
+                            add, sub = None, True
+                        elif len(buf) == 1:
+                            add, sub = buf[0], False
+                        else:
+                            add, sub = diff_lists(*buf)
+                        del buf[:]
+                        elms = tag(tag.strong(name[0]))
+                        
+                        if add and not sub:
+                            elms.append()
+                        elif add:
+                            elms.append(
+                                tag.em(u', '.join([unicode(n) for n in sorted(add)]))
+                            )
+                            elms.append(u' added')
+                        if add and sub:
+                            elms.append(u'; ')
+                        if sub:
+                            elms.append(
+                                tag.em(u', '.join([unicode(n) for n in sorted(sub)]))
+                            )
+                            elms.append(u' removed')
+                        for x in elms.generate():
+                            yield True, x
+                        yield True, (kind, data, pos)
+                        
+                else:
+                    yield False, (kind, data, pos)
+        return _inner