From ef35885797e654d740dfc5cf70e9befac71155f3 Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 19 Feb 2024 16:35:07 -0700 Subject: [PATCH] Adding FileGroup for files that have been tagged and exist, but do not yet have a FileGroup when importing tag config. --- wrolpi/files/lib.py | 2 +- wrolpi/tags.py | 8 ++++++++ wrolpi/test/test_tags.py | 26 ++++++++++++++++++++------ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/wrolpi/files/lib.py b/wrolpi/files/lib.py index d4024fb8..faadb87d 100644 --- a/wrolpi/files/lib.py +++ b/wrolpi/files/lib.py @@ -47,7 +47,7 @@ logger = logger.getChild(__name__) __all__ = ['list_directories_contents', 'delete', 'split_path_stem_and_suffix', 'refresh_files', 'search_files', 'get_mimetype', 'split_file_name_words', 'get_primary_file', 'get_file_statistics', - 'search_file_suggestion_count', + 'search_file_suggestion_count', 'glob_shared_stem', 'move', 'rename', 'delete_directory', 'handle_file_group_search_results'] diff --git a/wrolpi/tags.py b/wrolpi/tags.py index d84d9352..ffc9fa38 100644 --- a/wrolpi/tags.py +++ b/wrolpi/tags.py @@ -284,6 +284,7 @@ def import_tags_config(session: Session = None): """Reads the Tags and TagFiles from the config file, upserts them in the DB.""" from modules.zim import lib as zim_lib from modules.zim.models import Zim, TagZimEntry + from wrolpi.files.lib import glob_shared_stem if PYTEST and not TEST_TAGS_CONFIG: logger.warning('Refusing to import tags without test tags config. ' @@ -340,6 +341,13 @@ def import_tags_config(session: Session = None): # Paths are absolute in the DB, relative in config. absolute_path = media_directory / primary_path file_group: FileGroup = file_groups_by_primary_path.get(absolute_path) + if not file_group and absolute_path.is_file(): + # File exists, but is not yet in DB. + files = glob_shared_stem(absolute_path) + file_group = FileGroup.from_paths(session, *files) + session.add(file_group) + session.flush([file_group, ]) + if tag and file_group: tag_file: TagFile = tag_files.get((tag.id, file_group.id)) if not tag_file: diff --git a/wrolpi/test/test_tags.py b/wrolpi/test/test_tags.py index 1374e34e..ec3da763 100644 --- a/wrolpi/test/test_tags.py +++ b/wrolpi/test/test_tags.py @@ -219,13 +219,27 @@ async def test_import_tags_config(test_session, test_directory, test_tags_config file_group: FileGroup = test_session.query(FileGroup).one() assert file_group.tag_files, 'File was not tagged during import.' - # Importing again does not change count. - await files_lib.refresh_files() + +@pytest.mark.asyncio() +async def test_import_tags_config_missing_file(test_session, test_directory, test_tags_config, example_singlefile): + """A FileGroup should be created (and tagged) when a file exists, but does not yet have a FileGroup.""" + with test_tags_config.open('wt') as fh: + data = dict( + # Tag names can contain Unicode characters. + tags={'🦄': {'color': '#654321'}}, + tag_files=[ + ('🦄', str(example_singlefile.relative_to(test_directory)), '2000-01-01 01:01:01'), + ], + ) + yaml.dump(data, fh) + + # Re-initialize config with the data we just saved. + tags.get_tags_config().initialize() + tags.import_tags_config(test_session) - assert test_session.query(tags.Tag).count() == 1 - assert test_session.query(tags.TagFile).count() == 1 - # Example file, and the config file. - assert test_session.query(FileGroup).count() == 2 + + file_group: FileGroup = test_session.query(FileGroup).one() + assert file_group.tag_files, 'File was not tagged during import.' @pytest.mark.asyncio