Merge pull request #13 from TaskarCenterAtUW/feature-directory-issue-fix

Fixes the issue with folder inside extracted zip

Author: susrisha

CHANGELOG.md

@@ -1,23 +1,8 @@
 # Change log
 
-### 0.0.1
-- Initial version of python_osw_validation package.
-
-### 0.0.2
-- Updated package Unit test cases.
-- Updated README file
-
-### 0.0.3
-- Added schema file to package
-
-### 0.0.4
-- Points are not required for a valid OSW dataset
-
-### 0.0.5
-- Support for multi-level geojson file
-- Now handles the following two folder structures when unzipped abc.zip
-  1. abc\{nodes, edges, points}.geojson
-  2. {nodes, edges, points}.geojson
+### 0.2.1
+- Updated zipfile_handler
+- Fixed "No .geojson files found in the specified directory or its subdirectories." issue
 
 ### 0.2.0
 - Updated schema file to OSW 0.2
@@ -26,4 +11,23 @@
 - Added additional validation steps based on the OSW network properties
 - Add external extensions to ExtractedDataValidator
 - Validate external extensions against basic Open Geospatial Consortium (OGC) standards
-- Aggregate schema errors and data integrity errors separately before returning errors to user
+- Aggregate schema errors and data integrity errors separately before returning errors to user
+
+### 0.0.5
+- Support for multi-level geojson file
+- Now handles the following two folder structures when unzipped abc.zip
+  1. abc\{nodes, edges, points}.geojson
+  2. {nodes, edges, points}.geojson
+  
+### 0.0.4
+- Points are not required for a valid OSW dataset
+
+### 0.0.3
+- Added schema file to package
+
+### 0.0.2
+- Updated package Unit test cases.
+- Updated README file
+
+### 0.0.1
+- Initial version of python_osw_validation package.

src/python_osw_validation/version.py

@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '0.2.1'

src/python_osw_validation/zipfile_handler.py

@@ -50,11 +50,20 @@ def extract_zip(self) -> Optional[str]:
             if len(zip_ref.namelist()) == 0:
                 raise Exception('ZIP file is empty')
 
-            first_item = zip_ref.namelist()[0]
-
-            return f'{self.extracted_dir}/{first_item}'
+            internal_folder_name = self.find_internal_folder(zip_ref)
+            return os.path.join(self.extracted_dir,internal_folder_name)
         except Exception as e:
             self.error = f'Error extracting ZIP file: {e}'
+    
+    # finds the first folder available in the extracted folder. 
+    # returns empty if there are no folders inside
+    def find_internal_folder(self, zip_ref: zipfile.ZipFile)-> str:
+        for filename in zip_ref.namelist():
+            path = os.path.join(self.extracted_dir,filename)
+            if(os.path.isdir(path)):
+                return filename
+        return ''
+
 
     def remove_extracted_files(self) -> None:
         if self.extracted_dir and os.path.exists(self.extracted_dir):