regex: attempt failed due to slight diff in files

Author: joshmoore

zarr/n5.py

@@ -1,6 +1,7 @@
 """This module contains a storage class and codec to support the N5 format.
 """
 import os
+import re
 import struct
 import sys
 import warnings
@@ -11,7 +12,7 @@
 from numcodecs.registry import get_codec, register_codec
 
 from .meta import ZARR_FORMAT, json_dumps, json_loads
-from .storage import NestedDirectoryStore, _prog_ckey, _prog_number, normalize_storage_path
+from .storage import NestedDirectoryStore, _prog_number, normalize_storage_path
 from .storage import array_meta_key as zarr_array_meta_key
 from .storage import attrs_key as zarr_attrs_key
 from .storage import group_meta_key as zarr_group_meta_key
@@ -25,6 +26,9 @@
 n5_attrs_key = 'attributes.json'
 n5_keywords = ['n5', 'dataType', 'dimensions', 'blockSize', 'compression']
 
+potential_key = re.compile(r'(.*?)/((\d+)(\/\d+)+)$')
+
+
 
 class N5Store(NestedDirectoryStore):
     """Storage class using directories and files on a standard file system,
@@ -143,6 +147,7 @@ def __setitem__(self, key, value):
 
             key = invert_chunk_coords(key)
 
+        print(key, value)
         super().__setitem__(key, value)
 
     def __delitem__(self, key):
@@ -538,22 +543,17 @@ def _contains_attrs(self, path):
             return len(attrs) > 0
 
     def is_chunk_key(key):
-        segments = list(key.split('/'))
-        if segments:
-            last_segment = segments[-1]
-            return _prog_ckey.match(last_segment)
-        return False  # pragma: no cover
+        return potential_key.match(key)
 
     def invert_chunk_coords(key):
-        segments = list(key.split('/'))
-        if segments:
-            last_segment = segments[-1]
-            if _prog_ckey.match(last_segment):
-                coords = list(last_segment.split('.'))
-                last_segment = '.'.join(coords[::-1])
-                segments = segments[:-1] + [last_segment]
-                key = '/'.join(segments)
-        return key
+
+        m = is_chunk_key(key)
+        if m is None:
+            return key
+
+        first = m.group(1)
+        last = "/".join(m.group(2).split("/"))[::-1]  # Reverse
+        return f"{first}/{last}"
 
     def group_metadata_to_n5(group_metadata):
         '''Convert group metadata from zarr to N5 format.'''

zarr/storage.py

@@ -1248,7 +1248,7 @@ def __init__(self, suffix='', prefix='zarr', dir=None, normalize_keys=False,
         super().__init__(path, normalize_keys=normalize_keys)
 
 
-_prog_ckey = re.compile(r'^(\d+)(\.\d+)+$')
+_prog_ckey = re.compile(r'.*?/((\d+)(\/\d+)+)$')
 _prog_number = re.compile(r'^\d+$')