fix: gdl sidecar files load properly

* fix: run_macro didn't work for files that aren't in a sub directory

* fix: add_generic_data_to_entry would add a new Content Tags Field if the Content Tags field was the first field

* fix: get_gdl_sidecar used wrong file extension for discovering gdl side car files

* run_macro: ensure that source folder parameter is case insensitive

Co-authored-by: Travis Abendshien <46939827+CyanVoxel@users.noreply.github.com>

---------

Co-authored-by: Travis Abendshien <46939827+CyanVoxel@users.noreply.github.com>
This commit is contained in:
Jann Stute
2024-09-01 02:17:29 +02:00
committed by GitHub
parent 341aa92ecb
commit 85d62e6519
3 changed files with 3 additions and 3 deletions

View File

@@ -2024,7 +2024,7 @@ class Library:
# elif meta_tags_field_indices:
# priority_field_index = meta_tags_field_indices[0]
if priority_field_index > 0:
if priority_field_index >= 0:
self.update_entry_field(
entry_id, priority_field_index, [matching[0]], "append"
)

View File

@@ -31,7 +31,7 @@ class TagStudioCore:
json_dump = {}
info = {}
_filepath: Path = Path(filepath)
_filepath = _filepath.parent / (_filepath.stem + ".json")
_filepath = _filepath.parent / (_filepath.name + ".json")
# NOTE: This fixes an unknown (recent?) bug in Gallery-DL where Instagram sidecar
# files may be downloaded with indices starting at 1 rather than 0, unlike the posts.

View File

@@ -968,7 +968,7 @@ class QtDriver(QObject):
"""Runs a specific Macro on an Entry given a Macro name."""
entry = self.lib.get_entry(entry_id)
path = self.lib.library_dir / entry.path / entry.filename
source = entry.path.parts[0]
source = "" if entry.path == Path(".") else entry.path.parts[0].lower()
if name == "sidecar":
self.lib.add_generic_data_to_entry(
self.core.get_gdl_sidecar(path, source), entry_id