filter name displayed for executables to reduce visible nonoise

Author: mattip

codespeed/tests/test_views_data.py

@@ -86,24 +86,24 @@ def test_get_comparisonexes_master_default_branch(self):
         self.assertEqual(executables[self.project][0]['key'],
                          '1:L:master')
         self.assertEqual(executables[self.project][0]['name'],
-                         'TestExecutable1 latest')
+                         'Executable1 latest')
         self.assertEqual(executables[self.project][0]['revision'],
                          self.revision_1_master)
 
         self.assertEqual(executables[self.project][1]['key'],
                          '2:L:master')
         self.assertEqual(executables[self.project][1]['name'],
-                         'TestExecutable2 latest')
+                         'Executable2 latest')
 
         self.assertEqual(executables[self.project][2]['key'],
                          '1:L:custom')
         self.assertEqual(executables[self.project][2]['name'],
-                         'TestExecutable1 latest in branch \'custom\'')
+                         'Executable1 latest in branch \'custom\'')
 
         self.assertEqual(executables[self.project][3]['key'],
                          '2:L:custom')
         self.assertEqual(executables[self.project][3]['name'],
-                         'TestExecutable2 latest in branch \'custom\'')
+                         'Executable2 latest in branch \'custom\'')
 
         self.assertEqual(exe_keys[0], '1:L:master')
         self.assertEqual(exe_keys[1], '2:L:master')
@@ -125,24 +125,24 @@ def test_get_comparisonexes_custom_default_branch(self):
         self.assertEqual(executables[self.project][0]['key'],
                          '1:L:master')
         self.assertEqual(executables[self.project][0]['name'],
-                         'TestExecutable1 latest in branch \'master\'')
+                         'Executable1 latest in branch \'master\'')
         self.assertEqual(executables[self.project][0]['revision'],
                          self.revision_1_master)
 
         self.assertEqual(executables[self.project][1]['key'],
                          '2:L:master')
         self.assertEqual(executables[self.project][1]['name'],
-                         'TestExecutable2 latest in branch \'master\'')
+                         'Executable2 latest in branch \'master\'')
 
         self.assertEqual(executables[self.project][2]['key'],
                          '1:L:custom')
         self.assertEqual(executables[self.project][2]['name'],
-                         'TestExecutable1 latest')
+                         'Executable1 latest')
 
         self.assertEqual(executables[self.project][3]['key'],
                          '2:L:custom')
         self.assertEqual(executables[self.project][3]['name'],
-                         'TestExecutable2 latest')
+                         'Executable2 latest')
 
         self.assertEqual(exe_keys[0], '1:L:master')
         self.assertEqual(exe_keys[1], '2:L:master')

codespeed/views_data.py

@@ -130,11 +130,31 @@ def getcomparisonexes():
     for proj in Project.objects.all():
         executables = []
         executablekeys = []
+        proj_name_lower = str(proj).lower()
+        proj_name_len = len(proj_name_lower)
+
+        def short_exestring(exe):
+            s = get_sanitized_executable_name_for_comparison_view(exe)
+            if s.endswith('-64'):
+                s = s[:-3]
+            return s
+
+        def strip_proj_prefix(name):
+            if name.lower().startswith(proj_name_lower):
+                rest = name[proj_name_len:]
+                if rest and rest[0] in (' ', '-'):
+                    rest = rest[1:]
+                if rest:
+                    return rest
+            return name
+
         # add all tagged revs for any project
         for exe in baselines:
             if exe['key'] != "none" and exe['executable'].project == proj:
+                name = strip_proj_prefix(
+                    short_exestring(exe['executable']) + " " + exe['revision'].tag)
                 executablekeys.append(exe['key'])
-                executables.append(exe)
+                executables.append(dict(exe, name=name))
 
         # add latest revs of the project
         branches = Branch.objects.filter(project=proj, display_on_comparison_page=True)
@@ -147,8 +167,7 @@ def getcomparisonexes():
             # because we already added tagged revisions
             if rev.tag == "":
                 for exe in Executable.objects.filter(project=proj):
-                    exestring = get_sanitized_executable_name_for_comparison_view(exe)
-                    name = exestring + " latest"
+                    name = short_exestring(exe) + " latest"
                     if branch.name != proj.default_branch:
                         name += " in branch '" + branch.name + "'"
                     key = str(exe.id) + ":L:" + branch.name
@@ -157,7 +176,7 @@ def getcomparisonexes():
                         'key': key,
                         'executable': exe,
                         'revision': rev,
-                        'name': name,
+                        'name': strip_proj_prefix(name),
                     })
         all_executables[proj] = executables
         exekeys += executablekeys