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

Fixed --exiftool-path bug, issue #308

Browse Source
This commit is contained in:
Rhet Turnbull
2020-12-30 07:31:07 -08:00
parent e9134f84df
commit 5dccdf7750
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osxphotos/__main__.py
View File

@@ -1822,7 +1822,6 @@ 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_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)
@@ -1906,7 +1905,7 @@ def export(
) )
ctx.exit(2) 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}") 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.21" __version__ = "0.38.22"

2
osxphotos/exiftool.py
View File

@@ -49,7 +49,7 @@ class _ExifToolProc:
if hasattr(self, "_process_running") and self._process_running: if hasattr(self, "_process_running") and self._process_running:
# already running # already running
if exiftool != self._exiftool: if exiftool is not None and exiftool != self._exiftool:
logging.warning( logging.warning(
f"exiftool subprocess already running, " f"exiftool subprocess already running, "
f"ignoring exiftool={exiftool}" f"ignoring exiftool={exiftool}"