exit-after/exit-after-secs -> exit-after-close/exit-after-timeout.

Author: john-michaelburke

console_backend/src/cli_options.rs

@@ -169,11 +169,11 @@ pub struct CliOptions {
 
     /// Exit when file connection closes.
     #[clap(long)]
-    pub exit_after: bool,
+    pub exit_after_close: bool,
 
     /// Set the number of seconds after which the app automatically quits.
     #[clap(long)]
-    pub exit_after_secs: Option<f64>,
+    pub exit_after_timeout: Option<f64>,
 
     /// Start console from specific tab.
     #[clap(long)]
@@ -352,7 +352,7 @@ pub fn handle_cli(
         };
     } else if let Some(file) = opt.file.file {
         let filename = file.display().to_string();
-        conn_manager.connect_to_file(filename, RealtimeDelay::On, opt.exit_after);
+        conn_manager.connect_to_file(filename, RealtimeDelay::On, opt.exit_after_close);
     }
     if let Some(ref path) = opt.settings_yaml {
         sbp_settings::setting::load_from_path(path).expect("failed to load settings");

swiftnav_console/main.py

@@ -225,7 +225,7 @@
 
 
 class BackendMessageReceiver(QObject):
-    def __init__(self, app, backend, messages, exit_after_secs: Optional[int] = None):
+    def __init__(self, app, backend, messages, exit_after_timeout: Optional[int] = None):
         super().__init__()
         self._app = app
         self._backend = backend
@@ -234,7 +234,7 @@ def __init__(self, app, backend, messages, exit_after_secs: Optional[int] = None
         self._thread.started.connect(self._handle_started)  # pylint: disable=no-member
         self.moveToThread(self._thread)
         self.start_time = None
-        self.exit_after_secs = exit_after_secs
+        self.exit_after_timeout = exit_after_timeout
 
     def _handle_started(self):
         QTimer.singleShot(0, self.receive_messages)
@@ -254,7 +254,7 @@ def receive_messages(self):
             QTimer.singleShot(0, self.receive_messages)
 
     def _receive_messages(self):
-        if self.exit_after_secs is not None and time.time() - self.start_time > self.exit_after_secs:
+        if self.exit_after_timeout is not None and time.time() - self.start_time > self.exit_after_timeout:
             self._app.quit()
         buffer = self._backend.fetch_message()
         if not buffer:
@@ -581,8 +581,8 @@ def handle_cli_arguments(args: argparse.Namespace, globals_: QObject):
 
 
 def main(passed_args: Optional[Tuple[str, ...]] = None) -> int:
-    parser = argparse.ArgumentParser(add_help=False, usage=argparse.SUPPRESS, allow_abbrev=False)
-    parser.add_argument("--exit-after-secs", type=int, default=None)
+    parser = argparse.ArgumentParser(add_help=False, usage=argparse.SUPPRESS)
+    parser.add_argument("--exit-after-timeout", type=int, default=None)
     parser.add_argument("--show-fileio", action="store_true")
     parser.add_argument("--show-file-connection", action="store_true")
     parser.add_argument("--no-prompts", action="store_true")
@@ -721,7 +721,7 @@ def handle_qml_load_errors(obj, _url):
         app,
         backend_main,
         messages_main,
-        exit_after_secs=args_main.exit_after_secs,
+        exit_after_timeout=args_main.exit_after_timeout,
     )
     backend_msg_receiver.start()
 

utils/bench_runner.py

@@ -114,7 +114,7 @@
 
 # Frontend CPU Benchmarks.
 DEFAULT_JSON_FILEPATH = "fileout.json"
-BENCHMARK_COMMAND_ARGS = lambda file_path: f" --exit-after --file {file_path}"
+BENCHMARK_COMMAND_ARGS = lambda file_path: f" --exit-after-close --file {file_path}"
 HYPERFINE_COMMAND = (
     lambda file_out: f'hyperfine --warmup 1 --runs 5 --cleanup "sleep 1" --show-output --export-json {file_out} '
 )