From 63128ccdb5eebbe0b8cda379ea67d1b89b56db55 Mon Sep 17 00:00:00 2001
From: Sam Washko <sam@protectai.com>
Date: Mon, 12 Feb 2024 12:15:01 -0800
Subject: [PATCH] rearrange since keras are zips

---
 modelscan/modelscan.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/modelscan/modelscan.py b/modelscan/modelscan.py
index a65654b..2ee877c 100644
--- a/modelscan/modelscan.py
+++ b/modelscan/modelscan.py
@@ -127,20 +127,18 @@ def _scan_zip(
                 file_names = zip.namelist()
                 for file_name in file_names:
                     with zip.open(file_name, "r") as file_io:
-                        if _is_zipfile(file_name, data=file_io):
-                            scanned = False
-                            self._errors.append(
-                                ModelScanError(
-                                    "ModelScan",
-                                    f"{source}:{file_name} is a zip file. ModelScan does not support nested zip files.",
-                                )
-                            )
-                        else:
-                            scanned = self._scan_source(
-                                source=f"{source}:{file_name}",
-                                data=file_io,
-                            )
+                        scanned = self._scan_source(
+                            source=f"{source}:{file_name}",
+                            data=file_io,
+                        )
                         if not scanned:
+                            if _is_zipfile(file_name, data=file_io):
+                                self._errors.append(
+                                    ModelScanError(
+                                        "ModelScan",
+                                        f"{source}:{file_name} is a zip file. ModelScan does not support nested zip files.",
+                                    )
+                                )
                             self._skipped.append(f"{source}:{file_name}")
         except zipfile.BadZipFile as e:
             logger.debug(f"Skipping zip file {source}, due to error", e, exc_info=True)