File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2020 r"(?P<date>\d\d\d\d-\d\d-\d\d)" ,
2121 r"(?P<time>" + r"\d{5}" + ")" ,
2222 r"(?P<plan>\w*)" ,
23- r"(?P<name>[\s\w\d.-=+-]*)" , # not great...
23+ r"(?P<name>[\s\w\d.-=+-]*)" , # not great...just trying to include all valid characters
2424 r"(?P<uid>\w{8})" ,
2525]
2626__folder_seed__ = " " .join (__folder_parts__ )
2727__datetime_seed__ = re .compile (" " .join (__folder_parts__ [:3 ]))
28- __fmtseed__ = "{date} {time} {plan} {name} {uid}"
28+ __fmtseed__ = "{date} {time:05d } {plan} {name} {uid}"
2929
3030
3131class BlueskyFolder :
@@ -49,7 +49,7 @@ def primary(self):
4949 """open procedure based on plan"""
5050 if self ._primary is None :
5151 # TODO: open procedure based on plan
52- if self .info .plan == "gridscan_wp " :
52+ if self .info .plan == "grid_scan_wp " :
5353 self ._primary = wt5_open (self .path / "primary.wt5" )
5454 else :
5555 raise NotImplementedError (f"plan { self .info .plan } " )
@@ -160,7 +160,7 @@ class FolderInfo(NamedTuple):
160160 uid : str
161161
162162 @property
163- def folder (self ):
163+ def strf (self ) -> str :
164164 return __fmtseed__ .format (
165165 date = self .date .strftime ("%Y-%m-%d" ),
166166 time = int (
You can’t perform that action at this time.
0 commit comments