Get basic Windows stuff working.

utils/pub/io.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Helper functionality to make working with IO easier.
  */
 #library('io');
 
 #import('dart:io');
 #import('dart:uri');
 
 /** Gets the current working directory. */
 String get workingDir() => new File('.').fullPathSync();
 
 /**
  * Prints the given string to `stderr` on its own line.
  */
 void printError(value) {
   stderr.writeString(value.toString());
   stderr.writeString('\n');
 }
 
 /**
  * Joins a number of path string parts into a single path. Handles
  * platform-specific path separators. Parts can be [String], [Directory], or
  * [File] objects.
  */
 String join(part1, [part2, part3, part4]) {
-  final parts = _getPath(part1).split('/');
+  final parts = _getPath(part1).replaceAll('\\', '/').split('/');

[nweiz, 2012/07/30 23:03:39]

It feels like maybe this should be part of _getPath? That way anything in here
that uses string paths can assume that they have forward slashes.

[Bob Nystrom, 2012/07/30 23:42:33]

I'm hesitant to normalize paths eagerly really early in code paths like that. If
that path ends up getting reflected back to the user, they may be confused that
it isn't what they entered.

I think dart:io can correctly handle either form, so we generally just pass
paths along as they are. This is one of the few cases where our code itself
cares about the path separator.

 
   for (final part in [part2, part3, part4]) {
     if (part == null) continue;
 
     for (final piece in _getPath(part).split('/')) {
       if (piece == '..' && parts.length > 0 &&
           parts.last() != '.' && parts.last() != '..') {
         parts.removeLast();
       } else if (piece != '') {
         if (parts.length > 0 && parts.last() == '.') {
@@ skipping 104 matching lines @@
  * Ensures that [path] and all its parent directories exist. If they don't
  * exist, creates them. Returns a [Future] that completes once all the
  * directories are created.
  */
 Future<Directory> ensureDir(path) {
   path = _getPath(path);
   if (path == '.') return new Future.immediate(new Directory('.'));
 
   return dirExists(path).chain((exists) {
     if (exists) return new Future.immediate(new Directory(path));
-    return ensureDir(dirname(path));
-  }).chain((_) {
-    var completer = new Completer<Directory>();
-    var future = createDir(path);
-    future.handleException((error) {
-      if (error is! DirectoryIOException) return false;
-      // Error 17 means the directory already exists.
-      if (error.osError.errorCode != 17) return false;
+    return ensureDir(dirname(path)).chain((p) {

[nweiz, 2012/07/30 23:03:39]

I don't understand why you've named this variable, or why you've increased the
nesting here.

[Bob Nystrom, 2012/07/30 23:42:33]

The "p" is leftover debug code. Removed.

The nesting change is actually a behavioral change. It makes sure we only call
createDir() when the directory doesn't exist. Before it was always doing that.

+      var completer = new Completer<Directory>();
+      var future = createDir(path);
+      future.handleException((error) {
+        if (error is! DirectoryIOException) return false;
+        // Error 17 means the directory already exists (or 183 on Windows).
+        if (error.osError.errorCode != 17 &&
+            error.osError.errorCode != 183) return false;
 
-      completer.complete(_getDirectory(path));
-      return true;
+        completer.complete(_getDirectory(path));
+        return true;
+      });
+      future.then(completer.complete);
+      return completer.future;
     });
-    future.then(completer.complete);
-    return completer.future;
   });
 }
 
 /**
  * Creates a temp directory whose name will be based on [dir] with a unique
  * suffix appended to it. Returns a [Future] that completes when the directory
  * is created.
  */
 Future<Directory> createTempDir(dir) {
   dir = _getDirectory(dir);
@@ skipping 291 matching lines @@
   return new Directory(entry);
 }
 
 /**
  * Gets a [Uri] for [uri], which can either already be one, or be a [String].
  */
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return new Uri.fromString(uri);
 }