From ab3b1f2f1720e3f4282b40195a0d841bca4a9c9b Mon Sep 17 00:00:00 2001 From: Jann Stute Date: Sun, 12 Jul 2026 13:11:44 +0200 Subject: [PATCH] fix: remove folder param from all uses of Entry constructor --- src/tagstudio/core/library/refresh.py | 2 -- tests/conftest.py | 8 -------- .../.TagStudio/ts_library.sqlite | Bin 114688 -> 122880 bytes tests/macros/test_dupe_files.py | 4 ---- tests/test_library.py | 11 +---------- 5 files changed, 1 insertion(+), 24 deletions(-) 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 c8489518ac94c6381e9cde53fc96c7e3b9602f30..2c7c2f0ef07bdec9f3fcee03159a72210b2f319c 100644 GIT binary patch delta 1405 zcmaKpS!^3c7{_Ov%^tJswKr{Z_(;ZSn>dgLstVDEa=48PuI-vcwjdyA-R`znBq1qA zz*8;6^+Jg|NN!a`0|G<^C7~-~B8r5Nk~(o3KOhi-2G`;NDghDdLpcg%>~$8K2X^<{ z(fq#ucg>_yTqEkqkdbc&9ciC4^ZHqMyXCg^ znaQ&dXMgzsHbKiak=$u>>0e1PNPB>a?y*~;zT?Ks1k7izz5-=?xAX-N*;ybBN**ze zW`rQ$z@6f5VrS)7WsNB^k1$&rMl7Fay_4_~L*qY!+1YoXgDvMfPWQ*4WlJZyRqWl~ z{%pd-wK$#d`JQC_z_6x`CXXbvC#s8k*P!1Q_2Z~-XULB`tF#k)QD)){?8p?~g)%c1 zPd=I{(k=O0Y|Z@j2DBbk<4JAb!6O=7RNPN9L<3=eFTyoXMKbcZnmCmBe@$FfYX$gF zVptoEk7zjRe;|tYMySO?A>8lZ?Tdw?xVyU--Ca`$-!~Wt`v!+_&_9H|3ALxbjo9A6 zK+KQ5fbBfJ>Mr>k`IsEAUboIz6IQ2mQF=kTOZ-hdC#qsI zDxehFF8m~%76t?huk$Luft%-^;`%v-EzuJ{$=dq5c+jy90H0MG8B0DxR_8oTTQ~Dy zbA>%Qnv5Sltf^((wsq5gabNQ3B>jjo=Ro0&Jb1VgL{jrE^21yY3U}6_)89(uu|+ou zdup(kd^%4Nu0byH`omkb+A3o#d)gkU&n*sza{f40=YWZMkbdTlMAR1A1 zDRr**@`%=`y6knX$P!C$&0R?tvY9Oyb0}t1NUn2DEh%QLpw&D+CFdgNzeD7fi?ng6 zrg5iPBPiCX#UdgrRK1JkLBJSuJm(5y=$V1*VQJQu_U}8wDD8 k5HsS_#ZBan0!5Y@3pkHCcuSAc?SjH{8%@53#2UwqJK0~@Br6%N8s0Iq=~vQL>9W4cy_sXU`udFwvrB$= zC^6y~8VqX>^!5x`D|a*_Zf;g_axmc!hvkrJ(3)vzt=!S{C`=qn&>n;&xC!CmZZ(n~ zp9UNKWE!@TVB@;Cwez*%zbdP$fZYiIrVvjjUM>CDzFq5a{t4HBEg9 z`dLLcR5Vblq7JRD)G}1i^Gjf)t+PPbnBvFgshGj?y)~%4?*omhK`I~KdUQMM85GrI~3)%k^qTWq;R6!r+5Fxjbfl5ThbzR6n zImN|E`YI5;W-UbhnE{^S(n7pXA}TIZ>*j?y;Pc&R2kL#|QLQX*?3#xr`rq z_G-gGwX>O90!|-4>K~%18F*UkZtv{qD=#f(33!8ce??MRiR8;-#kjPPKB)v@i!84W z)rcI8#@<)wu1?G3711p24NW5-A5QueSsTJTS-cIe<#E>PJZaW*^Xi?M(JH>P6Z0Uk zVMUe)eXDi#2xt`bZqcB+gZ5A;>kui~s&)Y+!>WWwX(Rhs6!z2=t_$bGqzgoow0992 ziN}DrFdh|D9UtOb>+9{IF#UW1N5!Lmj7I-nzdO*%ymsn|viY*ap{U;YMC9e!pA=V8QQ@p;P$i^tL?+!4MZ zhlzvxjPs;Eyq>xiP48LhWzS~spGt2w-87~j{&Vj%WG4SQ4Hl^d!!7I-BkC+!^G)+P z;YVS=U?qP3Yi_SeXB;y=!%i7)8?H>+EHDk*lT#B=&C=y@XkL34*f4Po Gq<;YlILN&K 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)], )