Merge remote-tracking branch 'gitlab/master' into crop_view

labels/lepiforum_version_7/Provider.py

@@ -49,7 +49,7 @@ class Provider(LabelProvider):
             # add hierarchy
             for level, level_name in hierarchy_levels:
                 if entry[level] is not None:
-                    reference, name = entry[level].lower(), entry[level]
+                    reference, name = f'{level}_{entry[level].lower()}', entry[level]
                     result.append(self.create_label(reference, name, parent_reference, level_name))
 
                     parent_reference = reference
@@ -60,7 +60,7 @@ class Provider(LabelProvider):
                 reference = entry['kr_number']
             else:
                 name = f'{entry["genus"]} {entry["species"]}'
-                reference = name.lower()
+                reference = f'_{name.lower()}'
 
             result.append(self.create_label(reference, name, parent_reference))
 

test/test_database.py

@@ -23,10 +23,10 @@ class TestDatabase(unittest.TestCase):
 
                 # label providers
                 cursor.execute('''
-                    INSERT INTO label_providers (name, description, root_folder)
+                    INSERT INTO label_providers (name, description, root_folder, configuration_file)
                     VALUES
-                        ('Label Provider 1', 'Description for Label Provider 1', 'labeldir1'),
-                        ('Label Provider 2', 'Description for Label Provider 2', 'labeldir2')
+                        ('Label Provider 1', 'Description for Label Provider 1', 'labeldir1', 'file1'),
+                        ('Label Provider 2', 'Description for Label Provider 2', 'labeldir2', 'file2')
                 ''')
 
                 # projects
@@ -79,6 +79,7 @@ class TestDatabase(unittest.TestCase):
             self.assertEqual(label_providers[i].name, f'Label Provider {i + 1}')
             self.assertEqual(label_providers[i].description, f'Description for Label Provider {i + 1}')
             self.assertEqual(label_providers[i].root_folder, f'labeldir{i + 1}')
+            self.assertEqual(label_providers[i].configuration_file, f'file{i + 1}')
 
     def test_projects(self):
         models = list(self.database.models())