Skip to content

Commit 48f51a5

Browse files
committed
port fixes from json branch
1 parent 20f9371 commit 48f51a5

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

tagstudio/src/core/ts_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def get_gdl_sidecar(cls, filepath: Path, source: str = "") -> dict:
2424
Return a formatted object with notable values or an empty object if none is found.
2525
"""
2626
info = {}
27-
_filepath = filepath.parent / (filepath.stem + ".json")
27+
_filepath = filepath.parent / (filepath.name + ".json")
2828

2929
# NOTE: This fixes an unknown (recent?) bug in Gallery-DL where Instagram sidecar
3030
# files may be downloaded with indices starting at 1 rather than 0, unlike the posts.

tagstudio/src/qt/ts_qt.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
SearchMode,
7373
)
7474
from src.core.library.alchemy.fields import _FieldID
75-
from src.core.library.alchemy.library import LibraryStatus
75+
from src.core.library.alchemy.library import Entry, Library, LibraryStatus
7676
from src.core.media_types import MediaCategories
7777
from src.core.ts_core import TagStudioCore
7878
from src.core.utils.refresh_dir import RefreshDirTracker
@@ -129,6 +129,7 @@ class QtDriver(DriverMixin, QObject):
129129
SIGTERM = Signal()
130130

131131
preview_panel: PreviewPanel
132+
lib: Library
132133

133134
def __init__(self, backend, args):
134135
super().__init__()
@@ -786,9 +787,9 @@ def run_macros(self, name: MacroID, grid_idx: list[int]):
786787

787788
def run_macro(self, name: MacroID, grid_idx: int):
788789
"""Run a specific Macro on an Entry given a Macro name."""
789-
entry = self.frame_content[grid_idx]
790-
ful_path = self.lib.library_dir / entry.path
791-
source = entry.path.parts[0]
790+
entry: Entry = self.frame_content[grid_idx]
791+
full_path = self.lib.library_dir / entry.path
792+
source = "" if entry.path.parent == Path(".") else entry.path.parts[0].lower()
792793

793794
logger.info(
794795
"running macro",
@@ -805,7 +806,7 @@ def run_macro(self, name: MacroID, grid_idx: int):
805806
self.run_macro(macro_id, entry.id)
806807

807808
elif name == MacroID.SIDECAR:
808-
parsed_items = TagStudioCore.get_gdl_sidecar(ful_path, source)
809+
parsed_items = TagStudioCore.get_gdl_sidecar(full_path, source)
809810
for field_id, value in parsed_items.items():
810811
self.lib.add_entry_field_type(
811812
entry.id,
@@ -814,7 +815,7 @@ def run_macro(self, name: MacroID, grid_idx: int):
814815
)
815816

816817
elif name == MacroID.BUILD_URL:
817-
url = TagStudioCore.build_url(entry.id, source)
818+
url = TagStudioCore.build_url(entry, source)
818819
self.lib.add_entry_field_type(entry.id, field_id=_FieldID.SOURCE, value=url)
819820
elif name == MacroID.MATCH:
820821
TagStudioCore.match_conditions(self.lib, entry.id)

0 commit comments

Comments
 (0)