forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed --exiftool-path to work with --exiftool-merge-keywords/persons

Browse Source
This commit is contained in:
Rhet Turnbull
2020-12-29 09:47:03 -08:00
parent b3e86dffc8
commit 3872e7ae64
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osxphotos/__main__.py
View File

@@ -1822,7 +1822,7 @@ def export(
("exiftool_option", ("exiftool")), ("exiftool_option", ("exiftool")),
("exiftool_merge_keywords", ("exiftool", "sidecar")), ("exiftool_merge_keywords", ("exiftool", "sidecar")),
("exiftool_merge_persons", ("exiftool", "sidecar")), ("exiftool_merge_persons", ("exiftool", "sidecar")),
("exiftool_path", ("exiftool")), ("exiftool_path", ("exiftool", "exiftool_merge_keywords", "exiftool_merge_persons")),
] ]
try: try:
cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True) cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True)
@@ -1892,7 +1892,7 @@ def export(
] ]
# verify exiftool installed and in path if path not provided # verify exiftool installed and in path if path not provided
if exiftool and not exiftool_path: if (exiftool or exiftool_merge_keywords or exiftool_merge_persons) and not exiftool_path:
try: try:
exiftool_path = get_exiftool_path() exiftool_path = get_exiftool_path()
except FileNotFoundError: except FileNotFoundError:
@@ -1906,7 +1906,7 @@ def export(
) )
ctx.exit(2) ctx.exit(2)
if exiftool: if exiftool or exiftool_merge_keywords or exiftool_merge_persons:
verbose_(f"exiftool path: {exiftool_path}") verbose_(f"exiftool path: {exiftool_path}")
isphoto = ismovie = True # default searches for everything isphoto = ismovie = True # default searches for everything

2
osxphotos/_version.py
View File

@@ -1,5 +1,5 @@
""" version info """ """ version info """
__version__ = "0.38.20" __version__ = "0.38.21"