Skip to content

Commit

Permalink
Merge branch 'main' into faster_import_time
Browse files Browse the repository at this point in the history
  • Loading branch information
leouieda committed Oct 3, 2023
2 parents 348ea93 + 8aa2fc3 commit aa32589
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions pooch/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,17 @@ def retrieve(
path = os_cache("pooch")
if fname is None:
fname = unique_file_name(url)
# Create the local data directory if it doesn't already exist and make the
# path absolute.
# Make the path absolute.
path = cache_location(path, env=None, version=None)
make_local_storage(path)

full_path = path.resolve() / fname
action, verb = download_action(full_path, known_hash)

if action in ("download", "update"):
# We need to write data, so create the local data directory if it
# doesn't already exist.
make_local_storage(path)

get_logger().info(
"%s data from '%s' to file '%s'.",
verb,
Expand Down Expand Up @@ -558,9 +560,6 @@ def fetch(self, fname, processor=None, downloader=None, progressbar=False):
"""
self._assert_file_in_registry(fname)

# Create the local data directory if it doesn't already exist
make_local_storage(str(self.abspath))

url = self.get_url(fname)
full_path = self.abspath / fname
known_hash = self.registry[fname]
Expand All @@ -572,6 +571,10 @@ def fetch(self, fname, processor=None, downloader=None, progressbar=False):
)

if action in ("download", "update"):
# We need to write data, so create the local data directory if it
# doesn't already exist.
make_local_storage(str(self.abspath))

get_logger().info(
"%s file '%s' from '%s' to '%s'.",
verb,
Expand Down

0 comments on commit aa32589

Please sign in to comment.