diff --git a/lib/cli/context.dart b/lib/cli/context.dart index 13576fd..1e2be08 100644 --- a/lib/cli/context.dart +++ b/lib/cli/context.dart @@ -2,7 +2,6 @@ import "dart:async"; import "dart:io"; import "package:discloud/cli/disposable.dart"; -import "package:discloud/cli/printer/console_printer.dart"; import "package:discloud/cli/printer/iprinter.dart"; import "package:discloud/extensions/duration.dart"; import "package:discloud/extensions/list.dart"; @@ -29,7 +28,7 @@ class CliContext implements Disposable { api: .new(), arguments: arguments, debug: debug, - printer: ConsolePrinter(isDebug: debug), + printer: IPrinter.console(isDebug: debug), stopwatch: .new()..start(), store: .json(_cliConfigFilePath), subscriptions: [], diff --git a/lib/cli/printer/console_printer.dart b/lib/cli/printer/console_printer.dart index 3ca916c..e52d98b 100644 --- a/lib/cli/printer/console_printer.dart +++ b/lib/cli/printer/console_printer.dart @@ -1,7 +1,6 @@ import "dart:io"; import "package:discloud/cli/printer/iprinter.dart"; -import "package:discloud/cli/spin/cli_spin.dart"; import "package:discloud/cli/spin/ispin.dart"; part "debug_console_printer.dart"; @@ -22,7 +21,7 @@ class ConsolePrinter implements IPrinter { @override ISpin spin({String? text, bool start = true, bool showDuration = true}) { - final spin = _spin ??= CLISpin(text: text, showDuration: showDuration); + final spin = _spin ??= ISpin.cli(text: text, showDuration: showDuration); if (start) spin.start(); return spin; } diff --git a/lib/cli/spin/cli_spin.dart b/lib/cli/spin/cli_spin.dart index 9e7e953..0805dba 100644 --- a/lib/cli/spin/cli_spin.dart +++ b/lib/cli/spin/cli_spin.dart @@ -11,8 +11,10 @@ part "timer_cli_spin.dart"; void _noop() {} class CLISpin implements ISpin { + factory _timer({String? text}) => _TimerCLISpin._(text: text); + factory({String? text, bool showDuration = false}) => - showDuration ? _TimerCLISpin._(text: text) : ._(.new(text: text)); + showDuration ? ._timer(text: text) : ._(.new(text: text)); const new _(this._spin);