@@ -26,13 +26,11 @@ class RunDir:
26
26
"""
27
27
A class for representing a run directory.
28
28
"""
29
- # The run directory name passed by set_global_run_dir
30
- # is the run directory name to parse.
31
- # If it is None, the latest run directory will be parsed.
32
- g_run_dir_name = None
33
-
34
-
35
29
30
+ # The run directory name passed by set_global_run_dir
31
+ # is the run directory name to parse.
32
+ # If it is None, the latest run directory will be parsed.
33
+ g_run_dir_name = None
36
34
37
35
38
36
class RawDefaultHelpFormatter (
@@ -547,10 +545,11 @@ def get_latest_run_dir(base_dir):
547
545
"""
548
546
latest_run_dir_name = get_latest_run_dir_name (base_dir )
549
547
548
+ run_dir = None
550
549
if latest_run_dir_name :
551
- return str (PurePath (base_dir ) / latest_run_dir_name )
552
- else :
553
- return None
550
+ run_dir = str (PurePath (base_dir ) / latest_run_dir_name )
551
+
552
+ return run_dir
554
553
555
554
556
555
def get_existing_run_dir (base_dir : str , run_dir : str ) -> str :
@@ -571,35 +570,35 @@ def get_next_run_number(base_dir):
571
570
"""
572
571
latest_run_dir_name = get_latest_run_dir_name (base_dir )
573
572
match = re .match (r"^run(\d{3})$" , latest_run_dir_name )
573
+ next_run_number = 1
574
574
if match :
575
575
latest_run_number = int (match .group (1 ))
576
576
next_run_number = latest_run_number + 1
577
- return next_run_number
578
- else :
579
- return 1
577
+
578
+ return next_run_number
580
579
581
580
582
581
def get_latest_run_dir_name (base_dir ):
583
582
"""
584
583
Returns the highest run number of all run directories with in base_dir
585
584
"""
585
+ latest_run_dir_name = ""
586
586
if RunDir .g_run_dir_name is not None :
587
- return RunDir .g_run_dir_name
587
+ latest_run_dir_name = RunDir .g_run_dir_name
588
588
else :
589
589
run_number = 1
590
590
run_dir = Path (base_dir ) / run_dir_name (run_number )
591
591
592
- if not run_dir .exists ():
593
- # No existing run directories
594
- return ""
592
+ if run_dir .exists ():
593
+ while run_dir .exists ():
594
+ run_number += 1
595
+ run_dir = Path (base_dir ) / run_dir_name (run_number )
595
596
596
- while run_dir . exists ():
597
- run_number += 1
598
- run_dir = Path ( base_dir ) / run_dir_name (run_number )
597
+ # Currently one-past the last existing run dir,
598
+ # to get latest existing, subtract one
599
+ latest_run_dir_name = run_dir_name (run_number - 1 )
599
600
600
- # Currently one-past the last existing run dir,
601
- # to get latest existing, subtract one
602
- return run_dir_name (run_number - 1 )
601
+ return latest_run_dir_name
603
602
604
603
605
604
def run_dir_name (run_num ):
0 commit comments