Get Buffer use fixed, expose Buffer via Filer.Buffer, most tests passing.

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2014-06-06 11:14:52 -04:00
parent 1914f7a52b
commit fa65a34905
12 changed files with 40 additions and 685 deletions

View File

@ -1,11 +0,0 @@
// Hack to allow using encoding.js with only utf8.
// Right now there's a bug where it expects global['encoding-indexes']:
//
// function index(name) {
// if (!('encoding-indexes' in global))
// throw new Error("Indexes missing. Did you forget to include encoding-indexes.js?");
// return global['encoding-indexes'][name];
// }
(function(global) {
global['encoding-indexes'] = global['encoding-indexes'] || [];
}(this));

View File

@ -1,593 +0,0 @@
/*!
* Shim implementation of the TextEncoder, TextDecoder spec:
* http://encoding.spec.whatwg.org/#interface-textencoder
*
* http://code.google.com/p/stringencoding/source/browse/encoding.js
* 09b44d71759d on Sep 19, 2013
* Used under Apache License 2.0 - http://code.google.com/p/stringencoding/
*
* Filer: modified to remove non-utf8 aspects, converted to CommonJS
*/
(function(global) {
'use strict';
//
// Utilities
//
/**
* @param {number} a The number to test.
* @param {number} min The minimum value in the range, inclusive.
* @param {number} max The maximum value in the range, inclusive.
* @return {boolean} True if a >= min and a <= max.
*/
function inRange(a, min, max) {
return min <= a && a <= max;
}
/**
* @param {number} n The numerator.
* @param {number} d The denominator.
* @return {number} The result of the integer division of n by d.
*/
function div(n, d) {
return Math.floor(n / d);
}
//
// Implementation of Encoding specification
// http://dvcs.w3.org/hg/encoding/raw-file/tip/Overview.html
//
//
// 3. Terminology
//
//
// 4. Encodings
//
/** @const */ var EOF_byte = -1;
/** @const */ var EOF_code_point = -1;
/**
* @constructor
* @param {Uint8Array} bytes Array of bytes that provide the stream.
*/
function ByteInputStream(bytes) {
/** @type {number} */
var pos = 0;
/** @return {number} Get the next byte from the stream. */
this.get = function() {
return (pos >= bytes.length) ? EOF_byte : Number(bytes[pos]);
};
/** @param {number} n Number (positive or negative) by which to
* offset the byte pointer. */
this.offset = function(n) {
pos += n;
if (pos < 0) {
throw new Error('Seeking past start of the buffer');
}
if (pos > bytes.length) {
throw new Error('Seeking past EOF');
}
};
/**
* @param {Array.<number>} test Array of bytes to compare against.
* @return {boolean} True if the start of the stream matches the test
* bytes.
*/
this.match = function(test) {
if (test.length > pos + bytes.length) {
return false;
}
var i;
for (i = 0; i < test.length; i += 1) {
if (Number(bytes[pos + i]) !== test[i]) {
return false;
}
}
return true;
};
}
/**
* @constructor
* @param {Array.<number>} bytes The array to write bytes into.
*/
function ByteOutputStream(bytes) {
/** @type {number} */
var pos = 0;
/**
* @param {...number} var_args The byte or bytes to emit into the stream.
* @return {number} The last byte emitted.
*/
this.emit = function(var_args) {
/** @type {number} */
var last = EOF_byte;
var i;
for (i = 0; i < arguments.length; ++i) {
last = Number(arguments[i]);
bytes[pos++] = last;
}
return last;
};
}
/**
* @constructor
* @param {string} string The source of code units for the stream.
*/
function CodePointInputStream(string) {
/**
* @param {string} string Input string of UTF-16 code units.
* @return {Array.<number>} Code points.
*/
function stringToCodePoints(string) {
/** @type {Array.<number>} */
var cps = [];
// Based on http://www.w3.org/TR/WebIDL/#idl-DOMString
var i = 0, n = string.length;
while (i < string.length) {
var c = string.charCodeAt(i);
if (!inRange(c, 0xD800, 0xDFFF)) {
cps.push(c);
} else if (inRange(c, 0xDC00, 0xDFFF)) {
cps.push(0xFFFD);
} else { // (inRange(cu, 0xD800, 0xDBFF))
if (i === n - 1) {
cps.push(0xFFFD);
} else {
var d = string.charCodeAt(i + 1);
if (inRange(d, 0xDC00, 0xDFFF)) {
var a = c & 0x3FF;
var b = d & 0x3FF;
i += 1;
cps.push(0x10000 + (a << 10) + b);
} else {
cps.push(0xFFFD);
}
}
}
i += 1;
}
return cps;
}
/** @type {number} */
var pos = 0;
/** @type {Array.<number>} */
var cps = stringToCodePoints(string);
/** @param {number} n The number of bytes (positive or negative)
* to advance the code point pointer by.*/
this.offset = function(n) {
pos += n;
if (pos < 0) {
throw new Error('Seeking past start of the buffer');
}
if (pos > cps.length) {
throw new Error('Seeking past EOF');
}
};
/** @return {number} Get the next code point from the stream. */
this.get = function() {
if (pos >= cps.length) {
return EOF_code_point;
}
return cps[pos];
};
}
/**
* @constructor
*/
function CodePointOutputStream() {
/** @type {string} */
var string = '';
/** @return {string} The accumulated string. */
this.string = function() {
return string;
};
/** @param {number} c The code point to encode into the stream. */
this.emit = function(c) {
if (c <= 0xFFFF) {
string += String.fromCharCode(c);
} else {
c -= 0x10000;
string += String.fromCharCode(0xD800 + ((c >> 10) & 0x3ff));
string += String.fromCharCode(0xDC00 + (c & 0x3ff));
}
};
}
/**
* @constructor
* @param {string} message Description of the error.
*/
function EncodingError(message) {
this.name = 'EncodingError';
this.message = message;
this.code = 0;
}
EncodingError.prototype = Error.prototype;
/**
* @param {boolean} fatal If true, decoding errors raise an exception.
* @param {number=} opt_code_point Override the standard fallback code point.
* @return {number} The code point to insert on a decoding error.
*/
function decoderError(fatal, opt_code_point) {
if (fatal) {
throw new EncodingError('Decoder error');
}
return opt_code_point || 0xFFFD;
}
/**
* @param {number} code_point The code point that could not be encoded.
*/
function encoderError(code_point) {
throw new EncodingError('The code point ' + code_point +
' could not be encoded.');
}
/**
* @param {string} label The encoding label.
* @return {?{name:string,labels:Array.<string>}}
*/
function getEncoding(label) {
label = String(label).trim().toLowerCase();
if (Object.prototype.hasOwnProperty.call(label_to_encoding, label)) {
return label_to_encoding[label];
}
return null;
}
/** @type {Array.<{encodings: Array.<{name:string,labels:Array.<string>}>,
* heading: string}>} */
var encodings = [
{
"encodings": [
{
"labels": [
"unicode-1-1-utf-8",
"utf-8",
"utf8"
],
"name": "utf-8"
}
],
"heading": "The Encoding"
}
// XXXfiler - removed non-utf8 aspects
];
var name_to_encoding = {};
var label_to_encoding = {};
encodings.forEach(function(category) {
category.encodings.forEach(function(encoding) {
name_to_encoding[encoding.name] = encoding;
encoding.labels.forEach(function(label) {
label_to_encoding[label] = encoding;
});
});
});
//
// 7. The encoding
//
// 7.1 utf-8
/**
* @constructor
* @param {{fatal: boolean}} options
*/
function UTF8Decoder(options) {
var fatal = options.fatal;
var /** @type {number} */ utf8_code_point = 0,
/** @type {number} */ utf8_bytes_needed = 0,
/** @type {number} */ utf8_bytes_seen = 0,
/** @type {number} */ utf8_lower_boundary = 0;
/**
* @param {ByteInputStream} byte_pointer The byte stream to decode.
* @return {?number} The next code point decoded, or null if not enough
* data exists in the input stream to decode a complete code point.
*/
this.decode = function(byte_pointer) {
var bite = byte_pointer.get();
if (bite === EOF_byte) {
if (utf8_bytes_needed !== 0) {
return decoderError(fatal);
}
return EOF_code_point;
}
byte_pointer.offset(1);
if (utf8_bytes_needed === 0) {
if (inRange(bite, 0x00, 0x7F)) {
return bite;
}
if (inRange(bite, 0xC2, 0xDF)) {
utf8_bytes_needed = 1;
utf8_lower_boundary = 0x80;
utf8_code_point = bite - 0xC0;
} else if (inRange(bite, 0xE0, 0xEF)) {
utf8_bytes_needed = 2;
utf8_lower_boundary = 0x800;
utf8_code_point = bite - 0xE0;
} else if (inRange(bite, 0xF0, 0xF4)) {
utf8_bytes_needed = 3;
utf8_lower_boundary = 0x10000;
utf8_code_point = bite - 0xF0;
} else {
return decoderError(fatal);
}
utf8_code_point = utf8_code_point * Math.pow(64, utf8_bytes_needed);
return null;
}
if (!inRange(bite, 0x80, 0xBF)) {
utf8_code_point = 0;
utf8_bytes_needed = 0;
utf8_bytes_seen = 0;
utf8_lower_boundary = 0;
byte_pointer.offset(-1);
return decoderError(fatal);
}
utf8_bytes_seen += 1;
utf8_code_point = utf8_code_point + (bite - 0x80) *
Math.pow(64, utf8_bytes_needed - utf8_bytes_seen);
if (utf8_bytes_seen !== utf8_bytes_needed) {
return null;
}
var code_point = utf8_code_point;
var lower_boundary = utf8_lower_boundary;
utf8_code_point = 0;
utf8_bytes_needed = 0;
utf8_bytes_seen = 0;
utf8_lower_boundary = 0;
if (inRange(code_point, lower_boundary, 0x10FFFF) &&
!inRange(code_point, 0xD800, 0xDFFF)) {
return code_point;
}
return decoderError(fatal);
};
}
/**
* @constructor
* @param {{fatal: boolean}} options
*/
function UTF8Encoder(options) {
var fatal = options.fatal;
/**
* @param {ByteOutputStream} output_byte_stream Output byte stream.
* @param {CodePointInputStream} code_point_pointer Input stream.
* @return {number} The last byte emitted.
*/
this.encode = function(output_byte_stream, code_point_pointer) {
var code_point = code_point_pointer.get();
if (code_point === EOF_code_point) {
return EOF_byte;
}
code_point_pointer.offset(1);
if (inRange(code_point, 0xD800, 0xDFFF)) {
return encoderError(code_point);
}
if (inRange(code_point, 0x0000, 0x007f)) {
return output_byte_stream.emit(code_point);
}
var count, offset;
if (inRange(code_point, 0x0080, 0x07FF)) {
count = 1;
offset = 0xC0;
} else if (inRange(code_point, 0x0800, 0xFFFF)) {
count = 2;
offset = 0xE0;
} else if (inRange(code_point, 0x10000, 0x10FFFF)) {
count = 3;
offset = 0xF0;
}
var result = output_byte_stream.emit(
div(code_point, Math.pow(64, count)) + offset);
while (count > 0) {
var temp = div(code_point, Math.pow(64, count - 1));
result = output_byte_stream.emit(0x80 + (temp % 64));
count -= 1;
}
return result;
};
}
name_to_encoding['utf-8'].getEncoder = function(options) {
return new UTF8Encoder(options);
};
name_to_encoding['utf-8'].getDecoder = function(options) {
return new UTF8Decoder(options);
};
//
// Implementation of Text Encoding Web API
//
/** @const */ var DEFAULT_ENCODING = 'utf-8';
/**
* @constructor
* @param {string=} opt_encoding The label of the encoding;
* defaults to 'utf-8'.
* @param {{fatal: boolean}=} options
*/
function TextEncoder(opt_encoding, options) {
if (!(this instanceof TextEncoder)) {
throw new TypeError('Constructor cannot be called as a function');
}
opt_encoding = opt_encoding ? String(opt_encoding) : DEFAULT_ENCODING;
options = Object(options);
/** @private */
this._encoding = getEncoding(opt_encoding);
if (this._encoding === null || (this._encoding.name !== 'utf-8' &&
this._encoding.name !== 'utf-16le' &&
this._encoding.name !== 'utf-16be'))
throw new TypeError('Unknown encoding: ' + opt_encoding);
/** @private @type {boolean} */
this._streaming = false;
/** @private */
this._encoder = null;
/** @private @type {{fatal: boolean}=} */
this._options = { fatal: Boolean(options.fatal) };
if (Object.defineProperty) {
Object.defineProperty(
this, 'encoding',
{ get: function() { return this._encoding.name; } });
} else {
this.encoding = this._encoding.name;
}
return this;
}
TextEncoder.prototype = {
/**
* @param {string=} opt_string The string to encode.
* @param {{stream: boolean}=} options
*/
encode: function encode(opt_string, options) {
opt_string = opt_string ? String(opt_string) : '';
options = Object(options);
// TODO: any options?
if (!this._streaming) {
this._encoder = this._encoding.getEncoder(this._options);
}
this._streaming = Boolean(options.stream);
var bytes = [];
var output_stream = new ByteOutputStream(bytes);
var input_stream = new CodePointInputStream(opt_string);
while (input_stream.get() !== EOF_code_point) {
this._encoder.encode(output_stream, input_stream);
}
if (!this._streaming) {
var last_byte;
do {
last_byte = this._encoder.encode(output_stream, input_stream);
} while (last_byte !== EOF_byte);
this._encoder = null;
}
return new Uint8Array(bytes);
}
};
/**
* @constructor
* @param {string=} opt_encoding The label of the encoding;
* defaults to 'utf-8'.
* @param {{fatal: boolean}=} options
*/
function TextDecoder(opt_encoding, options) {
if (!(this instanceof TextDecoder)) {
throw new TypeError('Constructor cannot be called as a function');
}
opt_encoding = opt_encoding ? String(opt_encoding) : DEFAULT_ENCODING;
options = Object(options);
/** @private */
this._encoding = getEncoding(opt_encoding);
if (this._encoding === null)
throw new TypeError('Unknown encoding: ' + opt_encoding);
/** @private @type {boolean} */
this._streaming = false;
/** @private */
this._decoder = null;
/** @private @type {{fatal: boolean}=} */
this._options = { fatal: Boolean(options.fatal) };
if (Object.defineProperty) {
Object.defineProperty(
this, 'encoding',
{ get: function() { return this._encoding.name; } });
} else {
this.encoding = this._encoding.name;
}
return this;
}
// TODO: Issue if input byte stream is offset by decoder
// TODO: BOM detection will not work if stream header spans multiple calls
// (last N bytes of previous stream may need to be retained?)
TextDecoder.prototype = {
/**
* @param {ArrayBufferView=} opt_view The buffer of bytes to decode.
* @param {{stream: boolean}=} options
*/
decode: function decode(opt_view, options) {
if (opt_view && !('buffer' in opt_view && 'byteOffset' in opt_view &&
'byteLength' in opt_view)) {
throw new TypeError('Expected ArrayBufferView');
} else if (!opt_view) {
opt_view = new Uint8Array(0);
}
options = Object(options);
if (!this._streaming) {
this._decoder = this._encoding.getDecoder(this._options);
this._BOMseen = false;
}
this._streaming = Boolean(options.stream);
var bytes = new Uint8Array(opt_view.buffer,
opt_view.byteOffset,
opt_view.byteLength);
var input_stream = new ByteInputStream(bytes);
var output_stream = new CodePointOutputStream(), code_point;
while (input_stream.get() !== EOF_byte) {
code_point = this._decoder.decode(input_stream);
if (code_point !== null && code_point !== EOF_code_point) {
output_stream.emit(code_point);
}
}
if (!this._streaming) {
do {
code_point = this._decoder.decode(input_stream);
if (code_point !== null && code_point !== EOF_code_point) {
output_stream.emit(code_point);
}
} while (code_point !== EOF_code_point &&
input_stream.get() != EOF_byte);
this._decoder = null;
}
var result = output_stream.string();
if (!this._BOMseen && result.length) {
this._BOMseen = true;
if (['utf-8', 'utf-16le', 'utf-16be'].indexOf(this.encoding) !== -1 &&
result.charCodeAt(0) === 0xFEFF) {
result = result.substring(1);
}
}
return result;
}
};
// Prefer native impl if available
module.exports = {
TextEncoder: global['TextEncoder'] || TextEncoder,
TextDecoder: global['TextDecoder'] || TextDecoder
};
}(this));

View File

@ -1,34 +0,0 @@
/**
* Provide guarantees about Buffer vs. Uint8Array for internal code
* that has a preference.
*
* From the node.js Buffer docs: http://nodejs.org/api/buffer.html#buffer_buffer
*
* "A Buffer object can also be used with typed arrays. The buffer
* object is cloned to an ArrayBuffer that is used as the backing
* store for the typed array. The memory of the buffer and the
* ArrayBuffer is not shared."
*
* In a browser, where we use https://github.com/feross/buffer, a Buffer
* is really a Uint8Array augmented with other methods and properties. As
* such, we do feature detection instead of type identifiation.
*/
function ensureBuffer(maybeBuffer) {
if(!(typeof maybeBuffer.copy === 'function')) {
maybeBuffer = new Buffer(maybeBuffer);
}
return maybeBuffer;
}
function ensureUint8Array(maybeU8) {
if(!('buffer' in maybeU8 && 'byteOffset' in maybeU8 && 'byteLength' in maybeU8)) {
maybeU8 = new Uint8Array(maybeU8);
}
return maybeU8;
}
module.exports = {
ensureBuffer: ensureBuffer,
ensureUint8Array: ensureUint8Array
};

View File

@ -1,16 +1,10 @@
var TextEncoder = require('../lib/encoding.js').TextEncoder;
var TextDecoder = require('../lib/encoding.js').TextDecoder;
var BufferUtils = require('./buffer-utils.js');
// Adapt encodings to work with Buffer or Uint8Array, they expect the latter // Adapt encodings to work with Buffer or Uint8Array, they expect the latter
function decode(buf) { function decode(buf) {
buf = BufferUtils.ensureUint8Array(buf); return buf.toString('utf8');
return (new TextDecoder('utf8')).decode(buf);
} }
function encode(string) { function encode(string) {
var u8 = (new TextEncoder('utf8')).encode(string); return new Buffer(string, 'utf8');
return BufferUtils.ensureBuffer(u8);
} }
module.exports = { module.exports = {

View File

@ -31,7 +31,6 @@ var FS_NOMTIME = Constants.FS_NOMTIME;
var FS_NOCTIME = Constants.FS_NOCTIME; var FS_NOCTIME = Constants.FS_NOCTIME;
var Encoding = require('../encoding.js'); var Encoding = require('../encoding.js');
var BufferUtils = require('../buffer-utils.js');
var Errors = require('../errors.js'); var Errors = require('../errors.js');
var DirectoryEntry = require('../directory-entry.js'); var DirectoryEntry = require('../directory-entry.js');
var OpenFileDescription = require('../open-file-description.js'); var OpenFileDescription = require('../open-file-description.js');
@ -641,6 +640,7 @@ function open_file(context, path, flags, callback) {
callback(error); callback(error);
} else { } else {
fileData = new Buffer(0); fileData = new Buffer(0);
fileData.fill(0);
context.put(fileNode.data, fileData, update_directory_data); context.put(fileNode.data, fileData, update_directory_data);
} }
} }
@ -675,8 +675,6 @@ function open_file(context, path, flags, callback) {
function replace_data(context, ofd, buffer, offset, length, callback) { function replace_data(context, ofd, buffer, offset, length, callback) {
var fileNode; var fileNode;
buffer = BufferUtils.ensureBuffer(buffer);
function return_nbytes(error) { function return_nbytes(error) {
if(error) { if(error) {
callback(error); callback(error);
@ -708,8 +706,8 @@ function replace_data(context, ofd, buffer, offset, length, callback) {
} else { } else {
fileNode = result; fileNode = result;
var newData = new Buffer(length); var newData = new Buffer(length);
var bufferWindow = buffer.slice(offset, offset + length); newData.fill(0);
bufferWindow.copy(newData); buffer.copy(newData, 0, offset, offset + length);
ofd.position = length; ofd.position = length;
fileNode.size = length; fileNode.size = length;
@ -726,8 +724,6 @@ function write_data(context, ofd, buffer, offset, length, position, callback) {
var fileNode; var fileNode;
var fileData; var fileData;
buffer = BufferUtils.ensureBuffer(buffer);
function return_nbytes(error) { function return_nbytes(error) {
if(error) { if(error) {
callback(error); callback(error);
@ -761,11 +757,11 @@ function write_data(context, ofd, buffer, offset, length, position, callback) {
var _position = (!(undefined === position || null === position)) ? position : ofd.position; var _position = (!(undefined === position || null === position)) ? position : ofd.position;
var newSize = Math.max(fileData.length, _position + length); var newSize = Math.max(fileData.length, _position + length);
var newData = new Buffer(newSize); var newData = new Buffer(newSize);
newData.fill(0);
if(fileData) { if(fileData) {
newData.copy(fileData); fileData.copy(newData);
} }
var bufferWindow = buffer.slice(offset, offset + length); buffer.copy(newData, _position, offset, offset + length);
bufferWindow.copy(newData, _position);
if(undefined === position) { if(undefined === position) {
ofd.position += length; ofd.position += length;
} }
@ -793,8 +789,6 @@ function read_data(context, ofd, buffer, offset, length, position, callback) {
var fileNode; var fileNode;
var fileData; var fileData;
buffer = BufferUtils.ensureBuffer(buffer);
function handle_file_data(error, result) { function handle_file_data(error, result) {
if(error) { if(error) {
callback(error); callback(error);
@ -802,8 +796,7 @@ function read_data(context, ofd, buffer, offset, length, position, callback) {
fileData = result; fileData = result;
var _position = (!(undefined === position || null === position)) ? position : ofd.position; var _position = (!(undefined === position || null === position)) ? position : ofd.position;
length = (_position + length > buffer.length) ? length - _position : length; length = (_position + length > buffer.length) ? length - _position : length;
var dataView = fileData.slice(_position, _position + length); fileData.copy(buffer, offset, _position, _position + length);
dataView.copy(buffer, offset);
if(undefined === position) { if(undefined === position) {
ofd.position += length; ofd.position += length;
} }
@ -1188,6 +1181,7 @@ function truncate_file(context, path, length, callback) {
callback(error); callback(error);
} else { } else {
var data = new Buffer(length); var data = new Buffer(length);
data.fill(0);
if(fileData) { if(fileData) {
fileData.copy(data); fileData.copy(data);
} }
@ -1244,6 +1238,7 @@ function ftruncate_file(context, ofd, length, callback) {
data = fileData.slice(0, length); data = fileData.slice(0, length);
} else { } else {
data = new Buffer(length); data = new Buffer(length);
data.fill(0);
} }
context.put(fileNode.data, data, update_file_node); context.put(fileNode.data, data, update_file_node);
} }
@ -1659,6 +1654,7 @@ function readFile(fs, context, path, options, callback) {
var stats = new Stats(fstatResult, fs.name); var stats = new Stats(fstatResult, fs.name);
var size = stats.size; var size = stats.size;
var buffer = new Buffer(size); var buffer = new Buffer(size);
buffer.fill(0);
read_data(context, ofd, buffer, 0, size, 0, function(err3, nbytes) { read_data(context, ofd, buffer, 0, size, 0, function(err3, nbytes) {
if(err3) { if(err3) {

View File

@ -1,5 +1,6 @@
module.exports = { module.exports = {
FileSystem: require('./filesystem/interface.js'), FileSystem: require('./filesystem/interface.js'),
Buffer: Buffer,
Path: require('./path.js'), Path: require('./path.js'),
Errors: require('./errors.js') Errors: require('./errors.js')
}; };

View File

@ -4,7 +4,7 @@ var Environment = require('./environment.js');
var async = require('../../lib/async.js'); var async = require('../../lib/async.js');
var Network = require('./network.js'); var Network = require('./network.js');
var Zlib = require('../../lib/zip-utils.js'); var Zlib = require('../../lib/zip-utils.js');
var TextEncoder = require('../../lib/encoding.js').TextEncoder; var Encoding = require('../encoding.js');
function Shell(fs, options) { function Shell(fs, options) {
options = options || {}; options = options || {};
@ -537,10 +537,6 @@ Shell.prototype.zip = function(zipfile, paths, options, callback) {
} }
zipfile = Path.resolve(this.cwd, zipfile); zipfile = Path.resolve(this.cwd, zipfile);
function encode(s) {
return new TextEncoder('utf8').encode(s);
}
function addFile(path, callback) { function addFile(path, callback) {
fs.readFile(path, function(err, data) { fs.readFile(path, function(err, data) {
if(err) return callback(err); if(err) return callback(err);
@ -556,7 +552,7 @@ Shell.prototype.zip = function(zipfile, paths, options, callback) {
fs.readdir(path, function(err, list) { fs.readdir(path, function(err, list) {
// Add the directory itself (with no data) and a trailing / // Add the directory itself (with no data) and a trailing /
zip.addFile([], { zip.addFile([], {
filename: encode(path + '/'), filename: Encoding.encode(path + '/'),
compressionMethod: Zlib.Zip.CompressionMethod.STORE compressionMethod: Zlib.Zip.CompressionMethod.STORE
}); });

View File

@ -12,7 +12,7 @@ describe('fs.close', function() {
}); });
it('should release the file descriptor', function(done) { it('should release the file descriptor', function(done) {
var buffer = new Uint8Array(0); var buffer = new Filer.Buffer(0);
var fs = util.fs(); var fs = util.fs();
fs.open('/myfile', 'w+', function(error, result) { fs.open('/myfile', 'w+', function(error, result) {

View File

@ -48,8 +48,9 @@ describe('fs.lseek', function() {
it('should set the current position if whence is SET', function(done) { it('should set the current position if whence is SET', function(done) {
var fs = util.fs(); var fs = util.fs();
var offset = 3; var offset = 3;
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
var result_buffer = new Uint8Array(buffer.length + offset); var result_buffer = new Filer.Buffer(buffer.length + offset);
result_buffer.fill(0);
fs.open('/myfile', 'w+', function(error, fd) { fs.open('/myfile', 'w+', function(error, fd) {
if(error) throw error; if(error) throw error;
@ -71,7 +72,7 @@ describe('fs.lseek', function() {
if(error) throw error; if(error) throw error;
expect(result.size).to.equal(offset + buffer.length); expect(result.size).to.equal(offset + buffer.length);
var expected = new Uint8Array([1, 2, 3, 1, 2, 3, 4, 5, 6, 7, 8]); var expected = new Filer.Buffer([1, 2, 3, 1, 2, 3, 4, 5, 6, 7, 8]);
expect(result_buffer).to.deep.equal(expected); expect(result_buffer).to.deep.equal(expected);
done(); done();
}); });
@ -85,8 +86,9 @@ describe('fs.lseek', function() {
it('should update the current position if whence is CUR', function(done) { it('should update the current position if whence is CUR', function(done) {
var fs = util.fs(); var fs = util.fs();
var offset = -2; var offset = -2;
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
var result_buffer = new Uint8Array(2 * buffer.length + offset); var result_buffer = new Filer.Buffer(2 * buffer.length + offset);
result_buffer.fill(0);
fs.open('/myfile', 'w+', function(error, fd) { fs.open('/myfile', 'w+', function(error, fd) {
if(error) throw error; if(error) throw error;
@ -108,7 +110,7 @@ describe('fs.lseek', function() {
if(error) throw error; if(error) throw error;
expect(result.size).to.equal(offset + 2 * buffer.length); expect(result.size).to.equal(offset + 2 * buffer.length);
var expected = new Uint8Array([1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 7, 8]); var expected = new Filer.Buffer([1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 7, 8]);
expect(result_buffer).to.deep.equal(expected); expect(result_buffer).to.deep.equal(expected);
done(); done();
}); });
@ -122,7 +124,7 @@ describe('fs.lseek', function() {
it('should update the current position if whence is END', function(done) { it('should update the current position if whence is END', function(done) {
var fs = util.fs(); var fs = util.fs();
var offset = 5; var offset = 5;
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
var result_buffer; var result_buffer;
fs.open('/myfile', 'w+', function(error, result) { fs.open('/myfile', 'w+', function(error, result) {
@ -147,10 +149,11 @@ describe('fs.lseek', function() {
if(error) throw error; if(error) throw error;
expect(result.size).to.equal(offset + 2 * buffer.length); expect(result.size).to.equal(offset + 2 * buffer.length);
result_buffer = new Uint8Array(result.size); result_buffer = new Filer.Buffer(result.size);
result_buffer.fill(0);
fs.read(fd2, result_buffer, 0, result_buffer.length, 0, function(error, result) { fs.read(fd2, result_buffer, 0, result_buffer.length, 0, function(error, result) {
if(error) throw error; if(error) throw error;
var expected = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8]); var expected = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8]);
expect(result_buffer).to.deep.equal(expected); expect(result_buffer).to.deep.equal(expected);
done(); done();
}); });

View File

@ -13,8 +13,9 @@ describe('fs.read', function() {
it('should read data from a file', function(done) { it('should read data from a file', function(done) {
var fs = util.fs(); var fs = util.fs();
var wbuffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var wbuffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
var rbuffer = new Uint8Array(wbuffer.length); var rbuffer = new Filer.Buffer(wbuffer.length);
rbuffer.fill(0);
fs.open('/myfile', 'w+', function(error, fd) { fs.open('/myfile', 'w+', function(error, fd) {
if(error) throw error; if(error) throw error;
@ -33,8 +34,9 @@ describe('fs.read', function() {
it('should update the current file position', function(done) { it('should update the current file position', function(done) {
var fs = util.fs(); var fs = util.fs();
var wbuffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var wbuffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
var rbuffer = new Uint8Array(wbuffer.length); var rbuffer = new Filer.Buffer(wbuffer.length);
rbuffer.fill(0);
var _result = 0; var _result = 0;
fs.open('/myfile', 'w+', function(error, fd) { fs.open('/myfile', 'w+', function(error, fd) {

View File

@ -13,7 +13,7 @@ describe('fs.write', function() {
it('should write data to a file', function(done) { it('should write data to a file', function(done) {
var fs = util.fs(); var fs = util.fs();
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
fs.open('/myfile', 'w', function(error, fd) { fs.open('/myfile', 'w', function(error, fd) {
if(error) throw error; if(error) throw error;
@ -34,7 +34,7 @@ describe('fs.write', function() {
it('should update the current file position', function(done) { it('should update the current file position', function(done) {
var fs = util.fs(); var fs = util.fs();
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
var _result = 0; var _result = 0;
fs.open('/myfile', 'w', function(error, fd) { fs.open('/myfile', 'w', function(error, fd) {

View File

@ -355,7 +355,7 @@ describe('node times (atime, mtime, ctime)', function() {
it('should update atime, ctime, mtime when calling fs.write()', function(done) { it('should update atime, ctime, mtime when calling fs.write()', function(done) {
var fs = util.fs(); var fs = util.fs();
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
createTree(function() { createTree(function() {
fs.open('/myfile', 'w', function(err, fd) { fs.open('/myfile', 'w', function(err, fd) {
@ -383,7 +383,7 @@ describe('node times (atime, mtime, ctime)', function() {
it('should make no change when calling fs.read()', function(done) { it('should make no change when calling fs.read()', function(done) {
var fs = util.fs(); var fs = util.fs();
var buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); var buffer = new Filer.Buffer([1, 2, 3, 4, 5, 6, 7, 8]);
createTree(function() { createTree(function() {
fs.open('/myfile', 'w', function(err, fd) { fs.open('/myfile', 'w', function(err, fd) {
@ -399,7 +399,8 @@ describe('node times (atime, mtime, ctime)', function() {
if(error) throw error; if(error) throw error;
stat('/myfile', function(stats1) { stat('/myfile', function(stats1) {
var buffer2 = new Uint8Array(buffer.length); var buffer2 = new Filer.Buffer(buffer.length);
buffer2.fill(0);
fs.read(fd, buffer2, 0, buffer2.length, 0, function(err, nbytes) { fs.read(fd, buffer2, 0, buffer2.length, 0, function(err, nbytes) {
fs.close(fd, function(error) { fs.close(fd, function(error) {