Merge pull request #1076 from devoncarew/clear_logs
clear logs on app launch
This commit is contained in:
commit
f72c8f6db7
@ -11,8 +11,8 @@ import 'start.dart';
|
|||||||
|
|
||||||
class ListenCommand extends StartCommandBase {
|
class ListenCommand extends StartCommandBase {
|
||||||
final String name = 'listen';
|
final String name = 'listen';
|
||||||
final String description = 'Listen for changes to files and reload the running app on all connected devices. (Android only.)'
|
final String description = 'Listen for changes to files and reload the running app on all connected devices (Android only).'
|
||||||
'By default, only listens to "./" and "./lib/". To listen to additional directories, list them on the command line.';
|
' By default, only listens to "./" and "./lib/". To listen to additional directories, list them on the command line.';
|
||||||
|
|
||||||
/// Only run once. Used for testing.
|
/// Only run once. Used for testing.
|
||||||
final bool singleRun;
|
final bool singleRun;
|
||||||
|
@ -46,7 +46,12 @@ abstract class StartCommandBase extends FlutterCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<int> startApp({ bool stop: true, bool install: true, bool poke: false }) async {
|
Future<int> startApp({
|
||||||
|
bool stop: true,
|
||||||
|
bool install: true,
|
||||||
|
bool poke: false,
|
||||||
|
bool clearLogs: false
|
||||||
|
}) async {
|
||||||
|
|
||||||
String mainPath = findMainDartFile(argResults['target']);
|
String mainPath = findMainDartFile(argResults['target']);
|
||||||
if (!FileSystemEntity.isFileSync(mainPath)) {
|
if (!FileSystemEntity.isFileSync(mainPath)) {
|
||||||
@ -90,7 +95,8 @@ abstract class StartCommandBase extends FlutterCommand {
|
|||||||
poke: poke,
|
poke: poke,
|
||||||
checked: argResults['checked'],
|
checked: argResults['checked'],
|
||||||
traceStartup: argResults['trace-startup'],
|
traceStartup: argResults['trace-startup'],
|
||||||
route: argResults['route']))
|
route: argResults['route'],
|
||||||
|
clearLogs: clearLogs))
|
||||||
startedSomething = true;
|
startedSomething = true;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -110,12 +116,15 @@ abstract class StartCommandBase extends FlutterCommand {
|
|||||||
|
|
||||||
class StartCommand extends StartCommandBase {
|
class StartCommand extends StartCommandBase {
|
||||||
final String name = 'start';
|
final String name = 'start';
|
||||||
final String description = 'Start your Flutter app on attached devices. (Android only.)';
|
final String description = 'Start your Flutter app on attached devices (Android only).';
|
||||||
|
|
||||||
StartCommand() {
|
StartCommand() {
|
||||||
argParser.addFlag('poke',
|
argParser.addFlag('poke',
|
||||||
negatable: false,
|
negatable: false,
|
||||||
help: 'Restart the connection to the server.');
|
help: 'Restart the connection to the server.');
|
||||||
|
argParser.addFlag('clear-logs',
|
||||||
|
defaultsTo: true,
|
||||||
|
help: 'Clear log history before starting the app.');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -128,9 +137,10 @@ class StartCommand extends StartCommandBase {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
bool poke = argResults['poke'];
|
bool poke = argResults['poke'];
|
||||||
|
bool clearLogs = argResults['clear-logs'];
|
||||||
|
|
||||||
// Only stop and reinstall if the user did not specify a poke
|
// Only stop and reinstall if the user did not specify a poke
|
||||||
int result = await startApp(stop: !poke, install: !poke, poke: poke);
|
int result = await startApp(stop: !poke, install: !poke, poke: poke, clearLogs: clearLogs);
|
||||||
|
|
||||||
logging.fine('Finished start command.');
|
logging.fine('Finished start command.');
|
||||||
return result;
|
return result;
|
||||||
|
@ -776,10 +776,11 @@ class AndroidDevice extends Device {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool startBundle(AndroidApk apk, String bundlePath, {
|
bool startBundle(AndroidApk apk, String bundlePath, {
|
||||||
bool poke,
|
bool poke: false,
|
||||||
bool checked,
|
bool checked: true,
|
||||||
bool traceStartup,
|
bool traceStartup: false,
|
||||||
String route
|
String route,
|
||||||
|
bool clearLogs: false
|
||||||
}) {
|
}) {
|
||||||
logging.fine('$this startBundle');
|
logging.fine('$this startBundle');
|
||||||
|
|
||||||
@ -791,6 +792,9 @@ class AndroidDevice extends Device {
|
|||||||
if (!poke)
|
if (!poke)
|
||||||
_forwardObservatoryPort();
|
_forwardObservatoryPort();
|
||||||
|
|
||||||
|
if (clearLogs)
|
||||||
|
this.clearLogs();
|
||||||
|
|
||||||
String deviceTmpPath = '/data/local/tmp/dev.flx';
|
String deviceTmpPath = '/data/local/tmp/dev.flx';
|
||||||
runCheckedSync(adbCommandForDevice(['push', bundlePath, deviceTmpPath]));
|
runCheckedSync(adbCommandForDevice(['push', bundlePath, deviceTmpPath]));
|
||||||
List<String> cmd = adbCommandForDevice([
|
List<String> cmd = adbCommandForDevice([
|
||||||
@ -801,7 +805,7 @@ class AndroidDevice extends Device {
|
|||||||
if (checked)
|
if (checked)
|
||||||
cmd.addAll(['--ez', 'enable-checked-mode', 'true']);
|
cmd.addAll(['--ez', 'enable-checked-mode', 'true']);
|
||||||
if (traceStartup)
|
if (traceStartup)
|
||||||
cmd.addAll(['--ez', 'trace-startup', 'true']);
|
cmd.addAll(['--ez', 'trace-startup', 'true']);
|
||||||
if (route != null)
|
if (route != null)
|
||||||
cmd.addAll(['--es', 'route', route]);
|
cmd.addAll(['--es', 'route', route]);
|
||||||
cmd.add(apk.launchActivity);
|
cmd.add(apk.launchActivity);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user