Skip to content

Commit d5c9e27

Browse files
committed
minor changes
1 parent 73ae6cb commit d5c9e27

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

scripts/aoc.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ class AocProject:
6767
def pass_thru(self, tool: str, args: list, cwd=None):
6868

6969
if not Path(os.getcwd()).is_relative_to(self.aoc_root):
70-
raise click.ClickException("not in AoC project")
70+
if Path(__file__).is_symlink():
71+
cwd = Path(__file__).resolve().parent.parent
72+
73+
else:
74+
raise click.ClickException("not in AoC project")
7175

7276
cmd = [self.scripts_dir / tool]
7377
cmd.extend(args)

scripts/runall.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def load_data(filter_year, filter_user, filter_yearday, with_answers):
333333
elif filter_user == "mine":
334334
if not user.isdigit():
335335
continue
336-
elif filter_user and user != filter_user and user[: 4 + len(filter_user)] != f"tmp-{filter_user}":
336+
elif filter_user and user != filter_user and user[-1 - len(filter_user) :] != f"-{filter_user}":
337337
continue
338338

339339
year = int(input.parent.name)
@@ -390,7 +390,10 @@ def run_day(
390390
name_max_len = 16 - len(day_suffix)
391391

392392
for crc, file in sorted(day_inputs.items(), key=itemgetter(1)):
393-
input_name = file.parent.parent.name.removeprefix("tmp-")[:16]
393+
input_name = file.parent.parent.name
394+
input_name = input_name.removeprefix("tmp-")[:16]
395+
input_name = input_name.removeprefix("ok-")[:17]
396+
input_name = input_name.removeprefix("other-")[:14]
394397
prefix = f"[{year}-{day:02d}{day_suffix}] {input_name[:name_max_len]:<{name_max_len}}"
395398

396399
if day % 2 == 1:
@@ -461,7 +464,8 @@ def run_day(
461464
f" {status_color}{e['status']:7}{RESET}"
462465
f" {WHITE}{e['elapsed']/1e9:7.3f}s"
463466
f" {GRAY}{'☽' if in_cache else ' '}"
464-
f" {status_color}{str(answers):<40}{RESET}"
467+
f" {status_color}{str(answers):<50}{RESET}"
468+
f" {FEINT}{file}{RESET}"
465469
)
466470
if TERMINAL_COLS >= 130:
467471
print(line, info)
@@ -529,7 +533,10 @@ def lookup(interpreter: str) -> str:
529533
if isinstance(interpreter, str):
530534
interpreter = lookup(interpreter)
531535
elif isinstance(interpreter, (tuple, list)):
532-
interpreter = next(filter(None, map(lookup, interpreter)))
536+
try:
537+
interpreter = next(filter(None, map(lookup, interpreter)))
538+
except StopIteration:
539+
interpreter = None # none of them available
533540

534541
if interpreter:
535542
languages[lang2] = (v, interpreter)

0 commit comments

Comments
 (0)