Fix redundant "Ignore and refresh" prompt from init (#798)

insanum · Oct 2, 2024 · e6d4521 · e6d4521
1 parent bf57778
commit e6d4521
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 v4.5.1
  * Fix bizarre SSL recursion errors by moving truststore init earlier
+ * Fix redundant "Ignore and refresh" prompt from `init`
  * Adjust "when" value parsing to handle YYYY-MM-DD consistently
 
 v4.5.0

diff --git a/gcalcli/cli.py b/gcalcli/cli.py
@@ -236,6 +236,8 @@ def main():
  cal_names=cal_names,
  printer=printer,
  userless_mode=userless_mode,
+ # TODO: Avoid heavy unnecessary setup in general, remove override.
+ do_eager_init=parsed_args.command != 'init',
  **vars(parsed_args),
  )
 

diff --git a/gcalcli/gcal.py b/gcalcli/gcal.py
@@ -68,7 +68,12 @@ class GoogleCalendarInterface:
  UNIWIDTH = {'W': 2, 'F': 2, 'N': 1, 'Na': 1, 'H': 1, 'A': 1}
 
  def __init__(
- self, cal_names=(), printer=PRINTER, userless_mode=False, **options
+ self,
+ cal_names=(),
+ printer=PRINTER,
+ userless_mode=False,
+ do_eager_init=True,
+ **options,
  ):
  self.cals = []
  self.printer = printer
@@ -83,7 +88,7 @@ def __init__(
  "Running in GCALCLI_USERLESS_MODE. Most operations will fail!",
  file=sys.stderr,
  )
- else:
+ elif do_eager_init:
  self._get_cached()
 
  self._select_cals(cal_names)