Skip to content

Commit

Permalink
fix: gdl sidecar files load properly
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
2 people authored and CarterPillow committed Sep 7, 2024
1 parent ba0aecd commit 0bf7511
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tagstudio/src/core/library.py
Original file line number Diff line number Diff line change
Expand Up @@ -2024,7 +2024,7 @@ def add_generic_data_to_entry(self, data, entry_id: int):
# 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"
)
Expand Down
2 changes: 1 addition & 1 deletion tagstudio/src/core/ts_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def get_gdl_sidecar(self, filepath: str | Path, source: str = "") -> dict:
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.
Expand Down
2 changes: 1 addition & 1 deletion tagstudio/src/qt/ts_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ def run_macro(self, name: str, entry_id: int):
"""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
Expand Down

0 comments on commit 0bf7511

Please sign in to comment.