allow filenames with only .zip, .gz, etc suffix

Author: valgur

hatanaka/general_compression.py

@@ -130,7 +130,9 @@ def get_decompressed_path(path: Union[Path, str]) -> Path:
     if parts[-1].lower() in ['z', 'gz', 'bz2', 'zip']:
         parts.pop()
     suffix = parts[-1]
-    if re.fullmatch(r'\d\dd', suffix):
+    if len(parts) == 1:
+        return path.parent / (parts[0] + '.rnx')
+    elif re.fullmatch(r'\d\dd', suffix):
         suffix = suffix[:2] + 'o'
     elif re.fullmatch(r'\d\dD', suffix):
         suffix = suffix[:2] + 'O'

hatanaka/test/conftest.py

@@ -13,6 +13,9 @@ def get_data_path(fname):
     for x in ['.21d', '.crx']:
         fname = fname.replace(x.lower(), '.crx')
         fname = fname.replace(x.upper(), '.crx')
+    m = re.fullmatch(r'sample\.(zip|gz|bz2)', fname)
+    if m:
+        fname = 'sample.crx.' + m.group(1)
     return files(hatanaka.test.data) / fname
 
 

hatanaka/test/test_general_compression.py

@@ -27,6 +27,9 @@
     ('.rnx.bz2', '.rnx'),
     ('.21o', '.21o'),
     ('.21o.gz', '.21o'),
+    ('.zip', '.rnx'),
+    ('.gz', '.rnx'),
+    ('.bz2', '.rnx'),
 ]
 
 
@@ -60,6 +63,7 @@ def test_decompress_on_disk(tmp_path, crx_sample, rnx_bytes, input_suffix, expec
     out_path = decompress_on_disk(sample_path)
     # check
     assert out_path.exists()
+    print(list(tmp_path.glob('*')))
     assert out_path == tmp_path / ('sample' + expected_suffix)
     assert clean(out_path.read_bytes()) == clean(rnx_bytes)