Reapply fixes

Author: riodelphino

vit/config_parser.py

@@ -277,14 +277,27 @@ def get_projects(self):
         else:
             raise RuntimeError('Error parsing task projects: %s' % stderr)
 
-    def get_uda_values(self, uda_name):
-        uda_values = self.subtree(f'uda.{uda_name}.values')
-        if uda_values:
-            return uda_values.split(',')
-        return None
-
     def get_priority_values(self):
-        return self.get_uda_values('priority')
+        return self.subtree('uda.priority.values').split(',')
+
+    def is_string_uda(self, uda_data):
+        return 'type' in uda_data and uda_data['type'].strip() == 'string'
+
+    def parse_uda_string_values(self, uda_data):
+        if 'values' in uda_data:
+            values_list = uda_data['values'].split(',')
+            values_index = {v: i for i, v in enumerate(values_list)}
+            return values_list, values_index
+        return None, None
+
+    def get_uda_config(self):
+        uda_config = self.subtree('uda.')
+        for uda_data in uda_config.values():
+            if self.is_string_uda(uda_data):
+                values_list, values_index = self.parse_uda_string_values(uda_data)
+                uda_data['values_list'] = values_list
+                uda_data['values_index'] = values_index
+        return uda_config
 
     def is_string_uda(self, uda_data):
         return 'type' in uda_data and uda_data['type'].strip() == 'string'

vit/task_list.py

@@ -13,7 +13,6 @@
 from vit.base_list_box import BaseListBox
 from vit.list_batcher import ListBatcher
 from vit.formatter.project import Project as ProjectFormatter
-from vit.config_parser import TaskParser
 from vit.util import unicode_len
 
 
@@ -177,43 +176,30 @@ def flash_focus(self, repeat_times=None, pause_seconds=None):
 
     def sort(self):
         if 'sort' in self.report:
-            self.task_parser = TaskParser(self.config)
-            uda_config = self.task_parser.subtree('uda.')
-            DEFAULT_COLUMNS = {'depends', 'description', 'due', 'end', 'entry', 'id', 'imask', 'last', 'mask', 'modified', 'parent', 'project', 'recur', 'rtype', 'scheduled', 'start', 'status', 'tags', 'template', 'until', 'urgency', 'uuid', 'wait'}
-            # except 'priority' as UDA
-
-            def default_comparator(first, second):
-                if first[column] is not None and second[column] is not None:
-                    return -1 if first[column] < second[column] else 1 if first[column] > second[column] else 0
-                elif first[column] is None and second[column] is None:
-                    return 0
-                elif first[column] is not None and second[column] is None:
-                    return -1
-                elif first[column] is None and second[column] is not None:
-                    return 1
-
-            def string_comparator(uda_index, first, second):
-                a, b = first[column], second[column]
-                a_index = uda_index.get(a or '', len(uda_index))
-                b_index = uda_index.get(b or '', len(uda_index))
-                return (a_index > b_index) - (a_index < b_index)
-
             for column, order, collate in reversed(self.report['sort']):
-                if column.strip() in DEFAULT_COLUMNS:
-                    comparator = default_comparator
-                else:  # UDA, priority
-                    uda_values = uda_config[column].get('values')
-                    uda_type = uda_config[column].get('type')
-                    if uda_type.strip() == 'string':
-                        if uda_values:  # has .values
-                            uda_values_list = uda_values.rstrip(',').split(',')
-                            uda_index = {v: i for i, v in enumerate(uda_values_list)}
-                            comparator = partial(string_comparator, uda_index)
-                        else:  # has no .values
-                            comparator = default_comparator
-                    else:  # numeric, date, duration
-                        comparator = default_comparator
-
+                def comparator_default(first, second):
+                    if first[column] is not None and second[column] is not None:
+                        return -1 if first[column] < second[column] else 1 if first[column] > second[column] else 0
+                    elif first[column] is None and second[column] is None:
+                        return 0
+                    elif first[column] is not None and second[column] is None:
+                        return -1
+                    elif first[column] is None and second[column] is not None:
+                        return 1
+
+                def comparator_uda_string(values_index, first, second):
+                    a, b = first[column], second[column]
+                    default_index = len(values_index)
+                    a_index = values_index.get(a or '', default_index)
+                    b_index = values_index.get(b or '', default_index)
+                    return (a_index > b_index) - (a_index < b_index)
+
+                uda = self.task_config.uda_config.get(column)
+                if uda != None and uda.get('type') == 'string':
+                    values_index = uda.get('values_index')
+                    comparator = partial(comparator_uda_string, values_index)
+                else:
+                    comparator = comparator_default
                 if order and order == 'descending':
                     self.tasks = sorted(self.tasks, key=cmp_to_key(comparator), reverse=True)
                 else: