diff --git a/src/tagstudio/core/library/refresh.py b/src/tagstudio/core/library/refresh.py index 824cae52..e0267b29 100644 --- a/src/tagstudio/core/library/refresh.py +++ b/src/tagstudio/core/library/refresh.py @@ -16,7 +16,6 @@ from tagstudio.core.library.alchemy.library import Library from tagstudio.core.library.alchemy.models import Entry from tagstudio.core.library.ignore import PATH_GLOB_FLAGS, Ignore, ignore_to_glob from tagstudio.core.utils.silent_subprocess import silent_run # pyright: ignore -from tagstudio.core.utils.types import unwrap logger = structlog.get_logger(__name__) @@ -41,7 +40,6 @@ class RefreshTracker: entries = [ Entry( path=entry_path, - folder=unwrap(self.library.folder), fields=[], date_added=dt.now(), ) diff --git a/tests/conftest.py b/tests/conftest.py index 28b1d577..6a7a3070 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -20,7 +20,6 @@ sys.path.insert(0, str(CWD.parent)) from tagstudio.core.constants import THUMB_CACHE_NAME, TS_FOLDER_NAME from tagstudio.core.library.alchemy.library import Library from tagstudio.core.library.alchemy.models import Entry, Tag -from tagstudio.core.utils.types import unwrap from tagstudio.qt.thumb_grid_layout import ThumbGridLayout from tagstudio.qt.ts_qt import QtDriver @@ -36,22 +35,18 @@ def file_mediatypes_library(): status = lib.open_library(Path(""), in_memory=True) assert status.success - folder = unwrap(lib.folder) entry1 = Entry( - folder=folder, path=Path("foo.png"), fields=[TextField(name="Title", value="I'm a Test Title")], ) entry2 = Entry( - folder=folder, path=Path("bar.png"), fields=[TextField(name="Title", value="I'm a Test Title")], ) entry3 = Entry( - folder=folder, path=Path("baz.apng"), fields=[TextField(name="Title", value="I'm a Test Title")], ) @@ -87,7 +82,6 @@ def library(request, library_dir: Path): # pyright: ignore lib = Library() status = lib.open_library(library_path, in_memory=True) assert status.success - folder = unwrap(lib.folder) tag = Tag( name="foo", @@ -116,7 +110,6 @@ def library(request, library_dir: Path): # pyright: ignore # default item with deterministic name entry = Entry( id=1, - folder=folder, path=Path("foo.txt"), fields=[TextField(name="Title", value="I'm a Test Title")], ) @@ -124,7 +117,6 @@ def library(request, library_dir: Path): # pyright: ignore entry2 = Entry( id=2, - folder=folder, path=Path("one/two/bar.md"), fields=[TextField(name="Title", value="I'm a Test Title")], ) diff --git a/tests/fixtures/search_library/.TagStudio/ts_library.sqlite b/tests/fixtures/search_library/.TagStudio/ts_library.sqlite index c8489518..2c7c2f0e 100644 Binary files a/tests/fixtures/search_library/.TagStudio/ts_library.sqlite and b/tests/fixtures/search_library/.TagStudio/ts_library.sqlite differ diff --git a/tests/macros/test_dupe_files.py b/tests/macros/test_dupe_files.py index cd296e16..bc8b926f 100644 --- a/tests/macros/test_dupe_files.py +++ b/tests/macros/test_dupe_files.py @@ -8,25 +8,21 @@ from tagstudio.core.library.alchemy.fields import BaseField, TextField from tagstudio.core.library.alchemy.library import Library from tagstudio.core.library.alchemy.models import Entry from tagstudio.core.library.alchemy.registries.dupe_files_registry import DupeFilesRegistry -from tagstudio.core.utils.types import unwrap CWD = Path(__file__).parent def test_refresh_dupe_files(library: Library): library.library_dir = Path("/tmp/") - folder = unwrap(library.folder) fields: list[BaseField] = [TextField(name="Title", value="I'm a Test Title")] entry = Entry( - folder=folder, path=Path("bar/foo.txt"), fields=fields, ) entry2 = Entry( - folder=folder, path=Path("foo/foo.txt"), fields=fields, ) diff --git a/tests/test_library.py b/tests/test_library.py index 13b99dd5..e260225a 100644 --- a/tests/test_library.py +++ b/tests/test_library.py @@ -77,7 +77,6 @@ def test_library_add_file(library: Library): """Check Entry.path handling for insert vs lookup""" entry = Entry( path=Path("bar.txt"), - folder=unwrap(library.folder), fields=[TextField(name="Title", value="I'm a Test Title")], ) @@ -139,8 +138,7 @@ def test_get_entry(library: Library, entry_min: Entry): def test_entries_count(library: Library): - folder = unwrap(library.folder) - entries = [Entry(path=Path(f"{x}.txt"), folder=folder, fields=[]) for x in range(10)] + entries = [Entry(path=Path(f"{x}.txt"), fields=[]) for x in range(10)] new_ids = library.add_entries(entries) assert len(new_ids) == 10 @@ -254,7 +252,6 @@ def test_update_entry_with_multiple_identical_text_fields(library: Library, entr def test_mirror_entry_fields(library: Library): # Create and add entries with fields entry_a = Entry( - folder=unwrap(library.folder), path=Path("title_and_date.txt"), fields=[ TextField(name="Title", value="I'm a Test Title"), @@ -262,7 +259,6 @@ def test_mirror_entry_fields(library: Library): ], ) entry_b = Entry( - folder=unwrap(library.folder), path=Path("notes.txt"), fields=[ TextField(name="Notes", value="These are my notes.\nNo peeking!", is_multiline=True), @@ -270,7 +266,6 @@ def test_mirror_entry_fields(library: Library): ], ) entry_c = Entry( - folder=unwrap(library.folder), path=Path("date_published.txt"), fields=[ DatetimeField(name="Date Published", value="2000-01-01 12:00:00"), @@ -319,14 +314,11 @@ def test_mirror_entry_fields(library: Library): def test_merge_entries(library: Library): - folder = unwrap(library.folder) - tag_0: Tag = unwrap(library.add_tag(Tag(id=1010, name="tag_0"))) tag_1: Tag = unwrap(library.add_tag(Tag(id=1011, name="tag_1"))) tag_2: Tag = unwrap(library.add_tag(Tag(id=1012, name="tag_2"))) entry_a = Entry( - folder=folder, path=Path("a"), fields=[ TextField(name="Author", value="Author McAuthorson"), @@ -334,7 +326,6 @@ def test_merge_entries(library: Library): ], ) entry_b = Entry( - folder=folder, path=Path("b"), fields=[TextField(name="Notes", value="test note", is_multiline=True)], )