Skip to content

Support '-w' flag in common_args #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 2, 2020
Merged

Support '-w' flag in common_args #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da6d084
exiftool.py: support the case where '-w' is in common_args
ickc Dec 28, 2019
13c69a9
exiftool.py: print to stdout when '-w' is specified
ickc Dec 28, 2019
9a79c50
exiftool.py: decode before printing
ickc Dec 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions exiftool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ def __init__(self, executable_=None, common_args=None, win_shell=True):
else:
raise TypeError("common_args not a list of strings")

self.no_output = '-w' in common_args


def start(self):
"""Start an ``exiftool`` process in batch mode for this instance.
Expand Down Expand Up @@ -507,10 +509,19 @@ def execute_json(self, *params):
# Try utf-8 and fallback to latin.
# http://stackoverflow.com/a/5552623/1318758
# https://github.com/jmathai/elodie/issues/127
res = self.execute(b"-j", *params)
try:
return json.loads(self.execute(b"-j", *params).decode("utf-8"))
except UnicodeDecodeError as e:
return json.loads(self.execute(b"-j", *params).decode("latin-1"))
res_decoded = res.decode("utf-8")
except UnicodeDecodeError:
res_decoded = res.decode("latin-1")
# res_decoded can be invalid json if `-w` flag is specified in common_args
# which will return something like
# image files read
# output files created
if self.no_output:
print(res_decoded)
else:
return json.loads(res_decoded)

# allows adding additional checks (#11)
def get_metadata_batch_wrapper(self, filenames, params=None):
Expand Down