apply suggestions from code review.

Author: jverswijver

datajoint/external.py

@@ -304,9 +304,15 @@ def download_filepath(self, filepath_hash):
         :return: hash (UUID) of the contents of the downloaded file or Nones
         """
 
-        def _need_checksum(local_filepath):
+        def _need_checksum(local_filepath, expected_size):
             limit = config.get("filepath_checksum_size_limit")
-            return limit is None or Path(local_filepath).stat().st_size < limit
+            actual_size = Path(local_filepath).stat().st_size
+            if expected_size != actual_size:
+                # this should never happen without outside interference
+                raise DataJointError(
+                    f"'{local_filepath}' downloaded but size did not match."
+                )
+            return limit is None or actual_size < limit
 
         if filepath_hash is not None:
             relative_filepath, contents_hash, size = (
@@ -316,27 +322,24 @@ def _need_checksum(local_filepath):
             local_filepath = Path(self.spec["stage"]).absolute() / relative_filepath
 
             file_exists = Path(local_filepath).is_file() and (
-                not _need_checksum(local_filepath)
+                not _need_checksum(local_filepath, size)
                 or uuid_from_file(local_filepath) == contents_hash
             )
 
             if not file_exists:
                 self._download_file(external_path, local_filepath)
-                if _need_checksum(local_filepath):
-                    if uuid_from_file(local_filepath) != contents_hash:
-                        # this should never happen without outside interference
-                        raise DataJointError(
-                            f"'{local_filepath}' downloaded but did not pass checksum."
-                        )
-            if not _need_checksum(local_filepath):
-                logger.warning(
-                    f"Skipped checksum for file with hash: {contents_hash}, and path: {local_filepath}"
-                )
-                if size != Path(local_filepath).stat().st_size:
+                if (
+                    _need_checksum(local_filepath, size)
+                    and uuid_from_file(local_filepath) != contents_hash
+                ):
                     # this should never happen without outside interference
                     raise DataJointError(
-                        f"'{local_filepath}' downloaded but size is not the same (skipped checksum due to config)."
+                        f"'{local_filepath}' downloaded but did not pass checksum."
                     )
+            if not _need_checksum(local_filepath, size):
+                logger.warning(
+                    f"Skipped checksum for file with hash: {contents_hash}, and path: {local_filepath}"
+                )
             return str(local_filepath), contents_hash
 
     # --- UTILITIES ---

docs-parts/intro/Releases_lang1.rst

@@ -1,4 +1,4 @@
-### 0.13.6 -- Jun 13, 2022
+0.13.6 -- Jun 13, 2022
 ----------------------
 * Add - Config option to set threshold for when to stop using checksums for filepath stores. PR #1025
 * Add - Unified package level logger for package (#667) PR #1031