Nulo/tar-stream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make extract stream destroyable and add offset

Browse source
This commit is contained in:
Mathias Buus 2014-11-18 15:12:38 +01:00
parent cbb5a99775
commit dc032784ac
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
extract.js
View file

@ -13,8 +13,8 @@ var overflow = function(size) {
return size && 512 - size return size && 512 - size
} }
var emptyStream = function() { var emptyStream = function(self, offset) {
var s = new PassThrough() var s = new Source(self, offset)
s.end() s.end()
return s return s
} }
@ -25,10 +25,24 @@ var mixinPax = function(header, pax) {
return header return header
} }
var Source = function(self, offset) {
this._parent = self
this.offset = offset
console.log(this.offset,'<--', offset)
PassThrough.call(this)
}
util.inherits(Source, PassThrough)
Source.prototype.destroy = function(err) {
this._parent.destroy(err)
}
var Extract = function(opts) { var Extract = function(opts) {
if (!(this instanceof Extract)) return new Extract(opts) if (!(this instanceof Extract)) return new Extract(opts)
Writable.call(this, opts) Writable.call(this, opts)
this._offset = 0
this._buffer = bl() this._buffer = bl()
this._missing = 0 this._missing = 0
this._onparse = noop this._onparse = noop
@ -84,6 +98,7 @@ var Extract = function(opts) {
} }
var onheader = function() { var onheader = function() {
var offset = self._offset
var header var header
try { try {
header = self._header = headers.decode(b.slice(0, 512)) header = self._header = headers.decode(b.slice(0, 512))
@ -117,11 +132,11 @@ var Extract = function(opts) {
if (!header.size) { if (!header.size) {
self._parse(512, onheader) self._parse(512, onheader)
self.emit('entry', header, emptyStream(), onunlock) self.emit('entry', header, emptyStream(self, offset), onunlock)
return return
} }
self._stream = new PassThrough() self._stream = new Source(self, offset)
self.emit('entry', header, self._stream, onunlock) self.emit('entry', header, self._stream, onunlock)
self._parse(header.size, onstreamend) self._parse(header.size, onstreamend)
@ -144,6 +159,7 @@ Extract.prototype.destroy = function(err) {
Extract.prototype._parse = function(size, onparse) { Extract.prototype._parse = function(size, onparse) {
if (this._destroyed) return if (this._destroyed) return
this._offset += size
this._missing = size this._missing = size
this._onparse = onparse this._onparse = onparse
} }