Skip to content

Commit

Permalink
fix: type hint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
VasigaranAndAngel committed Dec 9, 2024
1 parent 4eca516 commit e9d8912
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tagstudio/src/qt/ts_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ def run_macros(self, name: MacroID, grid_idx: list[int]):

def run_macro(self, name: MacroID, grid_idx: int):
"""Run a specific Macro on an Entry given a Macro name."""
entry: Entry = self.frame_content[grid_idx]
entry: Entry | None = self.frame_content[grid_idx]
assert self.lib.library_dir is not None and entry is not None
full_path = self.lib.library_dir / entry.path
source = "" if entry.path.parent == Path(".") else entry.path.parts[0].lower()
Expand Down
12 changes: 8 additions & 4 deletions tagstudio/tests/test_library.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def test_library_get_alias(library, generate_tag):
alias_names.add("test_alias")
library.update_tag(tag, subtag_ids, alias_names, alias_ids)

alias_ids = library.get_tag(tag.id).alias_ids
_alias_ids = library.get_tag(tag.id).alias_ids

assert library.get_alias(tag.id, alias_ids[0]).name == "test_alias"
assert library.get_alias(tag.id, _alias_ids[0]).name == "test_alias"


def test_library_update_alias(library, generate_tag):
Expand All @@ -52,9 +52,9 @@ def test_library_update_alias(library, generate_tag):
library.update_tag(tag, subtag_ids, alias_names, alias_ids)

tag = library.get_tag(tag.id)
alias_ids = tag.alias_ids
_alias_ids = tag.alias_ids

assert library.get_alias(tag.id, alias_ids[0]).name == "test_alias"
assert library.get_alias(tag.id, _alias_ids[0]).name == "test_alias"

alias_names.remove("test_alias")
alias_names.add("alias_update")
Expand Down Expand Up @@ -191,6 +191,7 @@ def test_add_field_tag(library: Library, entry_full, generate_tag):

# Then
result = library.get_entry_full(entry_full.id)
assert result is not None
tag_field = result.tag_box_fields[0]
assert [x.name for x in tag_field.tags if x.name == tag_name]

Expand Down Expand Up @@ -320,6 +321,7 @@ def test_update_entry_with_multiple_identical_fields(library, entry_full):


def test_mirror_entry_fields(library: Library, entry_full):
assert library.folder is not None
# new entry
target_entry = Entry(
folder=library.folder,
Expand All @@ -338,12 +340,14 @@ def test_mirror_entry_fields(library: Library, entry_full):

# get new entry from library
new_entry = library.get_entry_full(entry_id)
assert new_entry is not None

# mirror fields onto new entry
library.mirror_entry_fields(new_entry, entry_full)

# get new entry from library again
entry = library.get_entry_full(entry_id)
assert entry is not None

# make sure fields are there after getting it from the library again
assert len(entry.fields) == 4
Expand Down

0 comments on commit e9d8912

Please sign in to comment.