Skip to content

Fix experimental class #101

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix experimental class #101

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f397e4
fix: wrong function call
pvbernhard Nov 24, 2024
278ca40
fix: function expects unpacked list
pvbernhard Nov 24, 2024
653628f
fix: paths may differ by slashes on windows
pvbernhard Nov 24, 2024
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
6 changes: 3 additions & 3 deletions exiftool/experimental.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def execute_json_wrapper(self, filenames, params=None, retry_on_error=True):
execute_params.extend(params)
execute_params.extend(filenames)

result = self.execute_json(execute_params)
result = self.execute_json(*execute_params)

if result:
try:
Expand All @@ -145,7 +145,7 @@ def execute_json_wrapper(self, filenames, params=None, retry_on_error=True):
self.run()

if retry_on_error:
result = self.execute_json_filenames(filenames, params, retry_on_error=False)
result = self.execute_json_wrapper(filenames, params, retry_on_error=False)
else:
raise error
else:
Expand Down Expand Up @@ -322,7 +322,7 @@ def _check_result_filelist(file_paths, result):
returned_source_file = result[i].get('SourceFile')
requested_file = file_paths[i]

if returned_source_file != requested_file:
if Path(returned_source_file) != Path(requested_file):
raise IOError(f"exiftool returned data for file {returned_source_file}, but expected was {requested_file}")

# ----------------------------------------------------------------------------------------------------------------------