Fixed --exiftool-path bug, issue #308

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.38.21](https://github.com/RhetTbull/osxphotos/compare/v0.38.20...v0.38.21)
+
+> 29 December 2020
+
+- Fixed --exiftool-path to work with --exiftool-merge-keywords/persons [`3872e7a`](https://github.com/RhetTbull/osxphotos/commit/3872e7ae649f42d849de472a7dbf78a241d54407)
+
+#### [v0.38.20](https://github.com/RhetTbull/osxphotos/compare/v0.38.19...v0.38.20)
+
+> 29 December 2020
+
+- Added --exiftool-path to CLI [`4897fc4`](https://github.com/RhetTbull/osxphotos/commit/4897fc4b05cc7a3bea314f9cce8a2163bf3922b2)
+
 #### [v0.38.19](https://github.com/RhetTbull/osxphotos/compare/v0.38.18...v0.38.19)
 
 > 29 December 2020

osxphotos/__main__.py

@@ -1822,7 +1822,6 @@ def export(
         ("exiftool_option", ("exiftool")),
         ("exiftool_merge_keywords", ("exiftool", "sidecar")),
         ("exiftool_merge_persons", ("exiftool", "sidecar")),
-        ("exiftool_path", ("exiftool")),
     ]
     try:
         cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True)
@@ -1892,7 +1891,7 @@ def export(
     ]
 
     # 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:
             exiftool_path = get_exiftool_path()
         except FileNotFoundError:
@@ -1906,7 +1905,7 @@ def export(
             )
             ctx.exit(2)
 
-    if exiftool:
+    if any([exiftool, exiftool_path, exiftool_merge_keywords, exiftool_merge_persons]):
         verbose_(f"exiftool path: {exiftool_path}")
 
     isphoto = ismovie = True  # default searches for everything

osxphotos/_version.py

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

osxphotos/exiftool.py

@@ -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}"