Merge branch 'ls-format/tests' into ls-format/master

test/test_list_format.py

@@ -216,7 +216,7 @@ just now | in 2 days | in a day |
         self.assertEqual(self.output, result)
 
     def test_list_format12(self):
-        config(p_overrides={('ls', 'list_format'): '|%I| %%'})
+        config(p_overrides={('ls', 'list_format'): '|%I| \%'})
         command = ListCommand(["-x"], self.todolist, self.out, self.error)
         command.execute()
 
@@ -477,6 +477,124 @@ x 2014-12-12
 
 
 x 11 months ago
+"""
+        self.assertEqual(self.output, result)
+
+    def test_list_format32(self):
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%{{}p{}}"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""{C}
+{C}
+{D}
+{Z}
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    def test_list_format33(self):
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%{\%p}p{\%p}"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""%pC%p
+%pC%p
+%pD%p
+%pZ%p
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    def test_list_format34(self):
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%p%p"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""CC
+CC
+DD
+ZZ
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    @mock.patch('topydo.lib.PrettyPrinterFilter.get_terminal_size')
+    def test_list_format35(self, mock_terminal_size):
+        mock_terminal_size.return_value = self.terminal_size(5, 25)
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%p{ }	%{ }p"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""C  C
+C  C
+D  D
+Z  Z
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    @mock.patch('topydo.lib.PrettyPrinterFilter.get_terminal_size')
+    def test_list_format36(self, mock_terminal_size):
+        """Tab expands to 1 character."""
+        mock_terminal_size.return_value = self.terminal_size(6, 25)
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%p{ }	%{ }p"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""C   C
+C   C
+D   D
+Z   Z
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    @mock.patch('topydo.lib.PrettyPrinterFilter.get_terminal_size')
+    def test_list_format37(self, mock_terminal_size):
+        mock_terminal_size.return_value = self.terminal_size(5, 25)
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "	%{ }p"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""   C
+   C
+   D
+   Z
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    def test_list_format38(self):
+        """
+        Invalid placeholders should expand to an empty string.
+        """
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%&"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""
+
+
+
+
+
+"""
+        self.assertEqual(self.output, result)
+
+    def test_list_format39(self):
+        """
+        Invalid placeholders without a character should expand to an empty
+        string.
+        """
+        command = ListCommand(["-x", "-s", "desc:priority", "-F", "%"], self.todolist, self.out, self.error)
+        command.execute()
+
+        result = u"""
+
+
+
+
+
 """
         self.assertEqual(self.output, result)
 

topydo/lib/ListFormat.py

@@ -68,20 +68,9 @@ def strip_placeholder_braces(p_matchobj):
     into:
         (%B)
     """
-    try:
-        before = p_matchobj.group('before').strip('{}')
-    except AttributeError:
-        before = ''
-
+    before = p_matchobj.group('before') or ''
     placeholder = p_matchobj.group('placeholder')
-
-    try:
-        after = p_matchobj.group('after').strip('{}')
-    except AttributeError:
-        after = ''
-
+    after = p_matchobj.group('after') or ''
     whitespace = p_matchobj.group('whitespace') or ''
-    start = p_matchobj.group('start') or ''
-    end = p_matchobj.group('end') or ''
 
-    return start + before + '%' + placeholder + after + whitespace + end
+    return before + '%' + placeholder + after + whitespace

topydo/lib/PrettyPrinterFilter.py

@@ -174,39 +174,51 @@ class PrettyPrinterFormatFilter(PrettyPrinterFilter):
         # relative completion date
         placeholders['X'] = lambda t: 'x ' + humanize_date(t.completion_date()) if t.is_completed() else ''
 
-        # literal %
-        placeholders['%'] = lambda _: '%'
-
         # text (truncated if necessary)
         placeholders['S'] = lambda t: t.text()
 
-
-        p_todo_str = self.format
-
-        for placeholder, getter in placeholders.items():
-            repl = getter(p_todo)
-            pattern = (r'(?P<start>.*)'
-                       r'%(?P<before>{{.+?}})?'
-                       r'(?P<placeholder>{ph}|\[{ph}\])'
-                       r'(?P<after>{{.+?}})?'
-                       r'(?P<whitespace> *)'
-                       r'(?P<end>.*)').format(ph=placeholder)
-            match = re.match(pattern, p_todo_str)
-            if match:
-                if repl == '':
-                    p_todo_str = re.sub(pattern, match.group('start') + match.group('end'), p_todo_str)
-                else:
-
-                    p_todo_str = re.sub(pattern, strip_placeholder_braces, p_todo_str)
-                    p_todo_str = re.sub(r'%({ph}|\[{ph}\])'.format(ph=placeholder), repl, p_todo_str)
-                    p_todo_str = p_todo_str.rstrip()
-
-                    if placeholder == 'S':
-                        p_todo_str = re.sub(' *\t *', '\t', p_todo_str)
-                        line_width = get_terminal_size().columns
-                        if len(p_todo_str) >= line_width:
-                            text_lim = line_width - len(p_todo_str) - 4
-                            p_todo_str = re.sub(re.escape(repl), repl[:text_lim] + '...', p_todo_str)
+        p_todo_str = re.sub(r'\\t', '\t', self.format)
+        p_todo_str_list = re.split(r'(?<!\\)%', p_todo_str)
+        main_pattern = (r'^({{(?P<before>.+?)}})?'
+                        r'(?P<placeholder>{ph}|\[{ph}\])'
+                        r'({{(?P<after>.+?)}})?'
+                        r'(?P<whitespace> *)')
+        truncate = False
+
+        for index, substr in enumerate(p_todo_str_list):
+            if index == 0:
+                continue    # first item in p_todo_str_list is surely not a placeholder
+            if not re.match(main_pattern.format(ph='['+''.join(placeholders.keys()) + ']'), substr):
+                substr = re.sub(main_pattern.format(ph='.'), '', substr) # remove nonexistent placeholder
+                p_todo_str_list[index] = substr
+                continue
+            for placeholder, getter in placeholders.items():
+                repl = getter(p_todo)
+                pattern = main_pattern.format(ph=placeholder)
+                match = re.match(pattern, substr)
+                if match:
+                    if repl == '':
+                        substr = re.sub(pattern, '', substr)
+                    else:
+                        substr = re.sub(pattern, strip_placeholder_braces, substr)
+                        substr = re.sub(r'(?<!\\)%({ph}|\[{ph}\])'.format(ph=placeholder), repl, substr)
+
+                        if placeholder == 'S':
+                            truncate = True
+                            repl_S = repl # copy for truncating final p_todo_str
+
+                    p_todo_str_list[index] = substr
+                    break
+
+        p_todo_str = ''.join(p_todo_str_list)
+        p_todo_str = re.sub(r'\\%', '%', p_todo_str)
+        p_todo_str = re.sub(' *\t *', '\t', p_todo_str)
+
+        if truncate:
+            line_width = get_terminal_size().columns
+            if len(p_todo_str) >= line_width:
+                text_lim = line_width - len(p_todo_str) - 4
+                p_todo_str = re.sub(re.escape(repl_S), repl_S[:text_lim] + '...', p_todo_str)
 
         # cut trailing space left when last placeholder in p_todo_str is empty and its predecessor is not
         return p_todo_str.rstrip()