restage 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

restage/mcpl.py

@@ -4,20 +4,26 @@ from pathlib import Path
 def mcpl_real_filename(filename: Path) -> Path:
     """MCPL_output from McCode instruments has the bad habit of changing the output file name silently.
     Find the _real_ output file name by looking for the expected variants"""
-    if filename.exists() and filename.is_file():
-        return filename
-    if filename.with_suffix('.mcpl').exists() and filename.with_suffix('.mcpl').is_file():
-        return filename.with_suffix('.mcpl')
-    if filename.with_suffix('.mcpl.gz').exists() and filename.with_suffix('.mcpl.gz').is_file():
-        return filename.with_suffix('.mcpl.gz')
+    base, ext = filename.parent / filename.stem, filename.suffix
+    if ext in ('.gz',):
+        ext = base.suffix + ext
+        base = base.parent / base.stem
+    extensions = {'.mcpl.gz', '.mcpl', ''}
+    if ext not in extensions:
+        ValueError(f'Unsupported file extension: {ext}')
+    for ext in extensions:
+        check = base.with_suffix(ext)
+        if check.exists() and check.is_file():
+            return check
+        print(f'{base} -> {check} not found')
     raise FileNotFoundError(f'Could not find MCPL file {filename}')
 
 
-# def mcpl_particle_count(filename):
-    # from mcpl import MCPLFile
-    # with MCPLFile(mcpl_real_filename(filename)) as f:
-    #     n = f.nparticles
-    # return n
+def mcpl_real_extension(filename: Path) -> str:
+    for ext in ('.mcpl.gz', '.mcpl'):
+        if str(filename).endswith(ext):
+            return ext
+    return ''
 
 
 def mcpl_particle_count(filename):
@@ -52,11 +58,7 @@ def mcpl_merge_files(files: list[Path], filepath: Path, keep_originals: bool = F
     from subprocess import run
     real_filenames = [mcpl_real_filename(f) for f in files]
     # if the real filenames have .mcpl or .mcpl.gz, the merged filename should too
-    ext = ''
-    if real_filenames[0].name.endswith('.mcpl.gz'):
-        ext = '.mcpl.gz'
-    elif real_filenames[0].name.endswith('.mcpl'):
-        ext = '.mcpl'
+    ext = mcpl_real_extension(real_filenames[0])
     filename = filepath.with_suffix(ext).as_posix()
 
     command = ['mcpltool', '--merge', filename] + [str(f) for f in real_filenames]
@@ -69,13 +71,8 @@ def mcpl_merge_files(files: list[Path], filepath: Path, keep_originals: bool = F
 
 
 def mcpl_rename_file(source: Path, dest: Path, strict: bool = False):
-    filepath = mcpl_real_filename(source)
-    filename = filepath.name  # this could be '{name}', '{name}.mcpl', or '{name}.mcpl.gz'
-    ext = ''
-    if filepath.name.endswith('.mcpl.gz'):
-        ext = '.mcpl.gz'
-    elif filepath.name.endswith('.mcpl'):
-        ext = '.mcpl'
+    filepath = mcpl_real_filename(source) # this could be '{name}', '{name}.mcpl', or '{name}.mcpl.gz'
+    ext = mcpl_real_extension(filepath)
 
     if not dest.name.endswith(ext):
         if strict:

{restage-0.5.0.dist-info → restage-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.5.0
+Version: 0.5.1
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
@@ -17,7 +17,7 @@ Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: confuse
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: mccode-antlr[hdf5]>=0.10.2
+Requires-Dist: mccode-antlr[hdf5]>=0.12.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.5.0.dist-info → restage-0.5.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ restage/database.py,sha256=anyOby31fUN7rGAVNsnWDUhAISV0vQ7en8aQwVS5ZwA,11051
 restage/emulate.py,sha256=VrhfZJIbECdbDS-MHklqRuAIy9cRkjZkwPBTKQSQoe0,6164
 restage/energy.py,sha256=w78GUIWcHxANvBl2DTu73FQFawCXfzlK6L32TBQNt4g,3371
 restage/instr.py,sha256=A0ShtXkswt_f7o-cIDtsVbG03_tGELe1aS3WzLxzkJM,2494
-restage/mcpl.py,sha256=BZYxBytughjc8slR6gUaBy3D7gzo7Yl3ACXrXhWgagI,3403
+restage/mcpl.py,sha256=MKVY-2TYk5p8hW1lXJib5mxdbnILq4GoYiyAUgOBJmA,3269
 restage/range.py,sha256=TjOf4DSKfgoAIcrWQvv6MrtksQpnGJHdsEjVI5K-UfI,8116
 restage/run.py,sha256=nk8d7cIyIqSt-5pyGm68Zak5H1a-fbo_z2_36eN-08E,1481
 restage/scan.py,sha256=Yx8OQSBG6I2_64sW0LIDb0glVKwWoxUQQznASXgDZFQ,1432
@@ -14,8 +14,8 @@ restage/splitrun.py,sha256=W_pTeiMjc9hhu-zaE6fdetVLG6MGEpnaTOdgmgVkS1g,26061
 restage/tables.py,sha256=mL1SrCbgwfWzG-ezd_R3CxOSIZLNZRoC2r7ht59jGMA,16371
 restage/config/__init__.py,sha256=zFRT9QXgpUJpBncELCQ6by1-kjYp8Li1yJDfqxkHxAA,965
 restage/config/default.yaml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-restage-0.5.0.dist-info/METADATA,sha256=5MHru2wvnMp3OATaVEEHYBWI8fP16npDpXnXwXjlteo,6769
-restage-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-restage-0.5.0.dist-info/entry_points.txt,sha256=gghocSxC2gHHxUCalAibCN1mtkh3trNmAfH5Qwx0KYg,149
-restage-0.5.0.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
-restage-0.5.0.dist-info/RECORD,,
+restage-0.5.1.dist-info/METADATA,sha256=r51j8rWD3Iwc9y8D-ZWZL46JERjcgEkch-88CYeOt4w,6769
+restage-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+restage-0.5.1.dist-info/entry_points.txt,sha256=gghocSxC2gHHxUCalAibCN1mtkh3trNmAfH5Qwx0KYg,149
+restage-0.5.1.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
+restage-0.5.1.dist-info/RECORD,,