Fixed --exiftool-path bug, issue #308
This commit is contained in:
@@ -1822,7 +1822,6 @@ def export(
|
||||
("exiftool_option", ("exiftool")),
|
||||
("exiftool_merge_keywords", ("exiftool", "sidecar")),
|
||||
("exiftool_merge_persons", ("exiftool", "sidecar")),
|
||||
("exiftool_path", ("exiftool", "exiftool_merge_keywords", "exiftool_merge_persons")),
|
||||
]
|
||||
try:
|
||||
cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True)
|
||||
@@ -1906,7 +1905,7 @@ def export(
|
||||
)
|
||||
ctx.exit(2)
|
||||
|
||||
if exiftool or exiftool_merge_keywords or exiftool_merge_persons:
|
||||
if any([exiftool, exiftool_path, exiftool_merge_keywords, exiftool_merge_persons]):
|
||||
verbose_(f"exiftool path: {exiftool_path}")
|
||||
|
||||
isphoto = ismovie = True # default searches for everything
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
""" version info """
|
||||
|
||||
__version__ = "0.38.21"
|
||||
__version__ = "0.38.22"
|
||||
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ class _ExifToolProc:
|
||||
|
||||
if hasattr(self, "_process_running") and self._process_running:
|
||||
# already running
|
||||
if exiftool != self._exiftool:
|
||||
if exiftool is not None and exiftool != self._exiftool:
|
||||
logging.warning(
|
||||
f"exiftool subprocess already running, "
|
||||
f"ignoring exiftool={exiftool}"
|
||||
|
||||
Reference in New Issue
Block a user