Commit fcd68c8a authored by Devon Carew's avatar Devon Carew

Support route (#4470)

* support --route in flutter run --resident

* also for the daemon app.start command
parent 3e0e6b99
...@@ -285,8 +285,7 @@ class AppDomain extends Domain { ...@@ -285,8 +285,7 @@ class AppDomain extends Domain {
String deviceId = _getStringArg(args, 'deviceId', required: true); String deviceId = _getStringArg(args, 'deviceId', required: true);
String projectDirectory = _getStringArg(args, 'projectDirectory', required: true); String projectDirectory = _getStringArg(args, 'projectDirectory', required: true);
bool startPaused = _getBoolArg(args, 'startPaused'); bool startPaused = _getBoolArg(args, 'startPaused');
// TODO(devoncarew): Use the route param. String route = _getStringArg(args, 'route');
String route = _getStringArg(args, 'route'); // ignore: unused_local_variable
String mode = _getStringArg(args, 'mode'); String mode = _getStringArg(args, 'mode');
String target = _getStringArg(args, 'target'); String target = _getStringArg(args, 'target');
...@@ -340,7 +339,7 @@ class AppDomain extends Domain { ...@@ -340,7 +339,7 @@ class AppDomain extends Domain {
} }
app._runInZone(this, () { app._runInZone(this, () {
runner.run(observatoryPortCompleter: observatoryPortCompleter).then((_) { runner.run(observatoryPortCompleter: observatoryPortCompleter, route: route).then((_) {
_sendAppEvent(app, 'stop'); _sendAppEvent(app, 'stop');
}).catchError((dynamic error) { }).catchError((dynamic error) {
_sendAppEvent(app, 'stop', <String, dynamic>{ 'error' : error.toString() }); _sendAppEvent(app, 'stop', <String, dynamic>{ 'error' : error.toString() });
......
...@@ -116,7 +116,11 @@ class RunCommand extends RunCommandBase { ...@@ -116,7 +116,11 @@ class RunCommand extends RunCommandBase {
debuggingOptions: options debuggingOptions: options
); );
return runner.run(traceStartup: traceStartup, benchmark: argResults['benchmark']); return runner.run(
traceStartup: traceStartup,
benchmark: argResults['benchmark'],
route: route
);
} else { } else {
// TODO(devoncarew): Remove this path and support the `--no-resident` option // TODO(devoncarew): Remove this path and support the `--no-resident` option
// using the `RunAndStayResident` class. // using the `RunAndStayResident` class.
......
...@@ -56,14 +56,16 @@ class RunAndStayResident { ...@@ -56,14 +56,16 @@ class RunAndStayResident {
Future<int> run({ Future<int> run({
bool traceStartup: false, bool traceStartup: false,
bool benchmark: false, bool benchmark: false,
Completer<int> observatoryPortCompleter Completer<int> observatoryPortCompleter,
String route
}) { }) {
// Don't let uncaught errors kill the process. // Don't let uncaught errors kill the process.
return runZoned(() { return runZoned(() {
return _run( return _run(
traceStartup: traceStartup, traceStartup: traceStartup,
benchmark: benchmark, benchmark: benchmark,
observatoryPortCompleter: observatoryPortCompleter observatoryPortCompleter: observatoryPortCompleter,
route: route
); );
}, onError: (dynamic error, StackTrace stackTrace) { }, onError: (dynamic error, StackTrace stackTrace) {
printError('Exception from flutter run: $error', stackTrace); printError('Exception from flutter run: $error', stackTrace);
...@@ -107,7 +109,8 @@ class RunAndStayResident { ...@@ -107,7 +109,8 @@ class RunAndStayResident {
Future<int> _run({ Future<int> _run({
bool traceStartup: false, bool traceStartup: false,
bool benchmark: false, bool benchmark: false,
Completer<int> observatoryPortCompleter Completer<int> observatoryPortCompleter,
String route
}) async { }) async {
_mainPath = findMainDartFile(target); _mainPath = findMainDartFile(target);
if (!FileSystemEntity.isFileSync(_mainPath)) { if (!FileSystemEntity.isFileSync(_mainPath)) {
...@@ -178,7 +181,8 @@ class RunAndStayResident { ...@@ -178,7 +181,8 @@ class RunAndStayResident {
debuggingOptions.buildMode, debuggingOptions.buildMode,
mainPath: _mainPath, mainPath: _mainPath,
debuggingOptions: debuggingOptions, debuggingOptions: debuggingOptions,
platformArgs: platformArgs platformArgs: platformArgs,
route: route
); );
if (!_result.started) { if (!_result.started) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment