Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1615)

Unified Diff: pkg/watcher/lib/src/directory_watcher/mac_os.dart

Issue 63643008: Remove debugging prints from the Mac OS directory watcher. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/watcher/test/directory_watcher/mac_os_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/watcher/lib/src/directory_watcher/mac_os.dart
diff --git a/pkg/watcher/lib/src/directory_watcher/mac_os.dart b/pkg/watcher/lib/src/directory_watcher/mac_os.dart
index e7b97e46cf8b6574a04fad1ea806c21cb3b21100..5b1feb342f2a220316c339af1e01dd8a3f6eba23 100644
--- a/pkg/watcher/lib/src/directory_watcher/mac_os.dart
+++ b/pkg/watcher/lib/src/directory_watcher/mac_os.dart
@@ -7,8 +7,6 @@ library watcher.directory_watcher.mac_os;
import 'dart:async';
import 'dart:io';
-import 'package:path/path.dart' as p;
-
import '../constructable_file_system_event.dart';
import '../path_set.dart';
import '../utils.dart';
@@ -26,21 +24,11 @@ import 'resubscribable.dart';
/// This also works around issues 14793, 14806, and 14849 in the implementation
/// of [Directory.watch].
class MacOSDirectoryWatcher extends ResubscribableDirectoryWatcher {
- // TODO(nweiz): remove these when issue 15042 is fixed.
- static var logDebugInfo = false;
- static var _count = 0;
- final int _id;
-
MacOSDirectoryWatcher(String directory)
- : _id = _count++,
- super(directory, () => new _MacOSDirectoryWatcher(directory, _count));
+ : super(directory, () => new _MacOSDirectoryWatcher(directory));
}
class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
- // TODO(nweiz): remove these when issue 15042 is fixed.
- static var _count = 0;
- final String _id;
-
final String directory;
Stream<WatchEvent> get events => _eventsController.stream;
@@ -80,10 +68,9 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
/// watcher is closed. This does not include [_watchSubscription].
final _subscriptions = new Set<StreamSubscription>();
- _MacOSDirectoryWatcher(String directory, int parentId)
+ _MacOSDirectoryWatcher(String directory)
: directory = directory,
- _files = new PathSet(directory),
- _id = "$parentId/${_count++}" {
+ _files = new PathSet(directory) {
_startWatch();
_listen(new Directory(directory).list(recursive: true),
@@ -91,22 +78,11 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
if (entity is! Directory) _files.add(entity.path);
},
onError: _emitError,
- onDone: () {
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] watcher is ready, known files:");
- for (var file in _files.toSet()) {
- print("[$_id] ${p.relative(file, from: directory)}");
- }
- }
- _readyCompleter.complete();
- },
+ onDone: _readyCompleter.complete,
cancelOnError: true);
}
void close() {
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] watcher is closed");
- }
for (var subscription in _subscriptions) {
subscription.cancel();
}
@@ -118,38 +94,12 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
/// The callback that's run when [Directory.watch] emits a batch of events.
void _onBatch(List<FileSystemEvent> batch) {
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] ======== batch:");
- for (var event in batch) {
- print("[$_id] ${_formatEvent(event)}");
- }
-
- print("[$_id] known files:");
- for (var file in _files.toSet()) {
- print("[$_id] ${p.relative(file, from: directory)}");
- }
- }
-
batches++;
_sortEvents(batch).forEach((path, events) {
- var relativePath = p.relative(path, from: directory);
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] events for $relativePath:\n");
- for (var event in events) {
- print("[$_id] ${_formatEvent(event)}");
- }
- }
-
var canonicalEvent = _canonicalEvent(events);
events = canonicalEvent == null ?
_eventsBasedOnFileSystem(path) : [canonicalEvent];
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] canonical event for $relativePath: "
- "${_formatEvent(canonicalEvent)}");
- print("[$_id] actionable events for $relativePath: "
- "${events.map(_formatEvent)}");
- }
for (var event in events) {
if (event is FileSystemCreateEvent) {
@@ -163,12 +113,7 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
if (entity is Directory) return;
_emitEvent(ChangeType.ADD, entity.path);
_files.add(entity.path);
- }, onError: (e, stackTrace) {
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] got error listing $relativePath: $e");
- }
- _emitError(e, stackTrace);
- }, cancelOnError: true);
+ }, onError: _emitError, cancelOnError: true);
} else if (event is FileSystemModifyEvent) {
assert(!event.isDirectory);
_emitEvent(ChangeType.MODIFY, path);
@@ -180,10 +125,6 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
}
}
});
-
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] ======== batch complete");
- }
}
/// Sort all the events in a batch into sets based on their path.
@@ -320,13 +261,6 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
var fileExists = new File(path).existsSync();
var dirExists = new Directory(path).existsSync();
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] file existed: $fileExisted");
- print("[$_id] dir existed: $dirExisted");
- print("[$_id] file exists: $fileExists");
- print("[$_id] dir exists: $dirExists");
- }
-
var events = [];
if (fileExisted) {
if (fileExists) {
@@ -396,10 +330,6 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
// watch beginning.
if (type == ChangeType.ADD && _files.contains(path)) return;
- if (MacOSDirectoryWatcher.logDebugInfo) {
- print("[$_id] emitting $type ${p.relative(path, from: directory)}");
- }
-
_eventsController.add(new WatchEvent(type, path));
}
@@ -420,23 +350,4 @@ class _MacOSDirectoryWatcher implements ManuallyClosedDirectoryWatcher {
}, cancelOnError: cancelOnError);
_subscriptions.add(subscription);
}
-
- // TODO(nweiz): remove this when issue 15042 is fixed.
- /// Return a human-friendly string representation of [event].
- String _formatEvent(FileSystemEvent event) {
- if (event == null) return 'null';
-
- var path = p.relative(event.path, from: directory);
- var type = event.isDirectory ? 'directory' : 'file';
- if (event is FileSystemCreateEvent) {
- return "create $type $path";
- } else if (event is FileSystemDeleteEvent) {
- return "delete $type $path";
- } else if (event is FileSystemModifyEvent) {
- return "modify $type $path";
- } else if (event is FileSystemMoveEvent) {
- return "move $type $path to "
- "${p.relative(event.destination, from: directory)}";
- }
- }
}
« no previous file with comments | « no previous file | pkg/watcher/test/directory_watcher/mac_os_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698