Merge libv1.

sdk/lib/io/directory_impl.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.
 
 
 class _Directory implements Directory {
   static const CREATE_REQUEST = 0;
   static const DELETE_REQUEST = 1;
   static const EXISTS_REQUEST = 2;
   static const CREATE_TEMP_REQUEST = 3;
@@ skipping 33 matching lines @@
     if (_path is !String) {
       throw new ArgumentError();
     }
     var result = _exists(_path);
     if (result is OSError) {
       throw new DirectoryIOException("Exists failed", _path, result);
     }
     return (result == 1);
   }
 
-  Future<Directory> create() {
+  Future<Directory> createRecursively() {
+    if (_path is !String) {
+      throw new ArgumentError();
+    }
+    var path = new Path.fromNative(_path);
+    var current = new Path(path.isAbsolute ? '/' : '');
+    var future = null;
+    for (var segment in path.segments()) {
+      var next = current.append(segment);
+      if (future == null) {
+        future = new Directory.fromPath(current).create();
+      } else {
+        future = future.chain((_) => new Directory.fromPath(next).create());
+      }
+      current = next;
+    }
+    if (future == null) {
+      return new Future.immediate(this);
+    } else {
+      return future.transform((result) => this);
+    }
+  }
+
+  Future<Directory> create({recursive: false}) {
+    if (recursive) return createRecursively();
     _ensureDirectoryService();
     List request = new List(2);
     request[0] = CREATE_REQUEST;
     request[1] = _path;
     return _directoryService.call(request).transform((response) {
       if (_isErrorResponse(response)) {
         throw _exceptionOrErrorFromResponse(response, "Creation failed");
       }
       return this;
     });
   }
 
-  void createSync() {
+  void createRecursivelySync() {
+    var path = new Path.fromNative(_path);
+    var current = new Path(path.isAbsolute ? '/' : '');
+    for (var segment in path.segments()) {
+      current = current.append(segment);
+      new Directory.fromPath(current).createSync();
+    }
+  }
+
+  void createSync({recursive: false}) {
     if (_path is !String) {
       throw new ArgumentError();
     }
+    if (recursive) return createRecursivelySync();
     var result = _create(_path);
     if (result is OSError) {
       throw new DirectoryIOException("Creation failed", _path, result);
     }
   }
 
   Future<Directory> createTemp() {
     _ensureDirectoryService();
     List request = new List(2);
     request[0] = CREATE_TEMP_REQUEST;
@@ skipping 14 matching lines @@
     var result = _createTemp(path);
     if (result is OSError) {
       throw new DirectoryIOException("Creation of temporary directory failed",
                                      _path,
                                      result);
     }
     return new Directory(result);
   }
 
   Future<Directory> _deleteHelper(bool recursive, String errorMsg) {
+  }
+
+  Future<Directory> delete({recursive: false}) {
     _ensureDirectoryService();
     List request = new List(3);
     request[0] = DELETE_REQUEST;
     request[1] = _path;
     request[2] = recursive;
     return _directoryService.call(request).transform((response) {
       if (_isErrorResponse(response)) {
-        throw _exceptionOrErrorFromResponse(response, errorMsg);
+        throw _exceptionOrErrorFromResponse(response, "Deletion failed");
       }
       return this;
     });
   }
 
-  Future<Directory> delete() {
-    return _deleteHelper(false, "Deletion failed");
-  }
-
-  void deleteSync() {
+  void deleteSync({recursive: false}) {
     if (_path is !String) {
       throw new ArgumentError();
     }
-    var result = _delete(_path, false);
+    var result = _delete(_path, recursive);
     if (result is OSError) {
       throw new DirectoryIOException("Deletion failed", _path, result);
     }
-  }
-
-  Future<Directory> deleteRecursively() {
-    return _deleteHelper(true, "Deletion failed");
-  }
-
-  void deleteRecursivelySync() {
-    if (_path is !String) {
-      throw new ArgumentError();
-    }
-    var result = _delete(_path, true);
-    if (result is OSError) {
-      throw new DirectoryIOException("Deletion failed", _path, result);
-    }
   }
 
   Future<Directory> rename(String newPath) {
     _ensureDirectoryService();
     List request = new List(3);
     request[0] = RENAME_REQUEST;
     request[1] = _path;
     request[2] = newPath;
     return _directoryService.call(request).transform((response) {
       if (_isErrorResponse(response)) {
@@ skipping 130 matching lines @@
     } else {
       throw e;
     }
   }
 
   Function _onDir;
   Function _onFile;
   Function _onDone;
   Function _onError;
 }