Removed unzipwalk - now its own package!

haukex · May 22, 2024 · 8683c44 · 8683c44
1 parent c5fdd84
commit 8683c44
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 280 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -11,3 +11,4 @@ pandas
 jschon
 rfc3986==1.5.0  # this is just to prevent a depencency issue in one of the packages (httpx?) and can maybe be removed in the future
 python-dateutil
+unzipwalk == 1.0.0
diff --git a/safe_filenames_check.py b/safe_filenames_check.py
@@ -42,7 +42,8 @@ def list_problems(paths :AnyPaths, *, ignore_compressed :bool = False, ignore_sy
     allowed = _base_allowed_chars
     if allowed_chars: allowed |= allowed_chars
     collections :dict[tuple[PurePath, ...], set[str]] = defaultdict(set)
-    for fns,bfh,fty in unzipwalk(paths, onlyfiles=False):
+    for result in unzipwalk(paths):
+        fns, fty = result.names, result.typ
         thefn = fns[-1]
         # ##### ##### Type Check ##### #####
         if len(fns)==1:  # a physical file in the filesystem that we can stat

diff --git a/tests/test_logger_importer.py b/tests/test_logger_importer.py
@@ -103,7 +103,7 @@ def test_decide_filetype(self):
                 list( read_records(source=simple_file_source(td/'empty.dat'), metadatas=self.metad) )
 
     def test_read_records_toa5(self):
-        filesrc = ( x[0:2] for x in unzipwalk(Path(__file__).parent/'toa5') )
+        filesrc = ( (r.names,r.hnd) for r in unzipwalk(Path(__file__).parent/'toa5') if r.hnd is not None )
         got = { "Daily": [], "Hourly": [] }
         for rec in read_records(source=filesrc, metadatas=self.metad):
             self.assertIsInstance(rec, Toa5Record)

diff --git a/tests/test_unzipwalk.py b/tests/test_unzipwalk.py
diff --git a/unzipwalk.py b/unzipwalk.py