| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library byte_stream; | 5 library byte_stream; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:convert'; |
| 8 import 'dart:io'; | 9 import 'dart:io'; |
| 9 import 'dart:typed_data'; | 10 import 'dart:typed_data'; |
| 10 | 11 |
| 11 import 'utils.dart'; | 12 import 'utils.dart'; |
| 12 | 13 |
| 13 /// A stream of chunks of bytes representing a single piece of data. | 14 /// A stream of chunks of bytes representing a single piece of data. |
| 14 class ByteStream extends StreamView<List<int>> { | 15 class ByteStream extends StreamView<List<int>> { |
| 15 ByteStream(Stream<List<int>> stream) | 16 ByteStream(Stream<List<int>> stream) |
| 16 : super(stream); | 17 : super(stream); |
| 17 | 18 |
| 18 /// Returns a single-subscription byte stream that will emit the given bytes | 19 /// Returns a single-subscription byte stream that will emit the given bytes |
| 19 /// in a single chunk. | 20 /// in a single chunk. |
| 20 factory ByteStream.fromBytes(List<int> bytes) => | 21 factory ByteStream.fromBytes(List<int> bytes) => |
| 21 new ByteStream(streamFromIterable([bytes])); | 22 new ByteStream(streamFromIterable([bytes])); |
| 22 | 23 |
| 23 /// Collects the data of this stream in a [Uint8List]. | 24 /// Collects the data of this stream in a [Uint8List]. |
| 24 Future<Uint8List> toBytes() { | 25 Future<Uint8List> toBytes() { |
| 25 /// TODO(nweiz): use BufferList when issue 6409 is fixed. | 26 /// TODO(nweiz): use BufferList when issue 6409 is fixed. |
| 26 return fold(<int>[], (buffer, chunk) { | 27 return fold(<int>[], (buffer, chunk) { |
| 27 buffer.addAll(chunk); | 28 buffer.addAll(chunk); |
| 28 return buffer; | 29 return buffer; |
| 29 }).then(toUint8List); | 30 }).then(toUint8List); |
| 30 } | 31 } |
| 31 | 32 |
| 32 /// Collect the data of this stream in a [String], decoded according to | 33 /// Collect the data of this stream in a [String], decoded according to |
| 33 /// [encoding], which defaults to `Encoding.UTF_8`. | 34 /// [encoding], which defaults to `UTF8`. |
| 34 Future<String> bytesToString([Encoding encoding=Encoding.UTF_8]) => | 35 Future<String> bytesToString([Encoding encoding=UTF8]) => |
| 35 toBytes().then((bytes) => decodeString(bytes, encoding)); | 36 toBytes().then((bytes) => encoding.decode(bytes)); |
| 36 | 37 |
| 37 Stream<String> toStringStream([Encoding encoding=Encoding.UTF_8]) => | 38 Stream<String> toStringStream([Encoding encoding=UTF8]) => |
| 38 transform(new StringDecoder(encoding)); | 39 transform(encoding.decoder); |
| 39 } | 40 } |
| OLD | NEW |