Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaner API for calculating file size #110

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cleaner API for calculating file size #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,18 @@ var events = require('events')
var common = require('./common')
var strtok = require('strtok2')
var through = require('through')
var fs = require('fs')

module.exports = function (stream, opts, callback) {
module.exports = function (stream, opts, callback, fileSizeCallback) {
console.log(opts, callback, fileSizeCallback)
if (typeof opts === 'function') {
var tmp = callback
callback = opts
fileSizeCallback = tmp
opts = {}
}

var emitter = new events.EventEmitter()

var fsize = function (cb) {
if (opts.fileSize) {
process.nextTick(function () {
cb(opts.fileSize)
})
} else if (stream.hasOwnProperty('path')) {
fs.stat(stream.path, function (err, stats) {
if (err) throw err
cb(stats.size)
})
} else if (stream.hasOwnProperty('fileSize')) {
stream.fileSize(cb)
} else if (opts.duration) {
emitter.emit(
'done',
new Error('for non file streams, specify the size of the stream with a fileSize option'))
}
}

// pipe to an internal stream so we aren't messing
// with the stream passed to us by our users
var istream = stream.pipe(through(null, null, {autoDestroy: false}))
Expand Down Expand Up @@ -63,7 +46,7 @@ module.exports = function (stream, opts, callback) {
emitter.emit(event, value)
}
buildAliases(alias, event, value, aliased)
}, done, opts.hasOwnProperty('duration'), fsize)
}, done, fileSizeCallback, fileSizeCallback)
// re-emitting the first data chunk so the
// parser picks the stream up from the start
istream.emit('data', result)
Expand Down
1 change: 1 addition & 0 deletions lib/ogg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ module.exports = function (stream, callback, done, readDuration) {
check_sum: strtok.UINT32_LE.get(v, 22),
segments: v[26]
}
console.log(header)
if (header.type !== 'OggS') {
return done(new Error('expected ogg header but was not found'))
}
Expand Down
10 changes: 8 additions & 2 deletions test/test-audio-frame-header-bug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@ var fs = require('fs')
var test = require('prova')

test('audio-frame-header-bug', function (t) {
t.plan(2)
t.plan(3)

var sample = (process.browser) ?
new window.Blob([fs.readFileSync(__dirname + '/samples/audio-frame-header-bug.mp3')])
: fs.createReadStream(path.join(__dirname, '/samples/audio-frame-header-bug.mp3'))

mm(sample, { duration: true }, function (err, result) {
mm(sample, function (err, result) {
t.error(err)
t.strictEqual(result.duration, 200.59591666666665)
t.end()
}, function (cb) {
fs.stat(sample.path, function (err, stats) {
t.error(err)
cb(stats.size)
})
})

})
5 changes: 5 additions & 0 deletions test/test-id3v2-duration-allframes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ test('id3v2-duration-allframes', function (t) {
picture: {},
duration: 1.48928125 })
t.end()
}, function (cb) {
fs.stat(sample.path, function (err, stats) {
if (err) throw err
cb(stats.size)
})
})
.on('duration', function (result) {
t.strictEqual(result, 1.48928125, 'duration')
Expand Down
232 changes: 120 additions & 112 deletions test/test-ogg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,119 +8,127 @@ test('ogg', function (t) {
var comCounter = 0
var genCounter = 0

var sample = (process.browser) ?
var readable = (process.browser) ?
new window.Blob([fs.readFileSync(__dirname + '/samples/oggy.ogg')])
: fs.createReadStream(path.join(__dirname, '/samples/oggy.ogg'))

mm(sample, { duration: true }, function (err, result) {
t.error(err)
t.strictEqual(result.title, 'In Bloom', 'title')
t.strictEqual(result.artist[0], 'Nirvana', 'artist')
t.strictEqual(result.albumartist[0], 'Nirvana', 'albumartist')
t.strictEqual(result.album, 'Nevermind', 'album')
t.strictEqual(result.year, '1991', 'year')
t.strictEqual(result.track.no, 1, 'track no')
t.strictEqual(result.track.of, 12, 'track of')
t.strictEqual(result.disk.no, 1, 'disk no')
t.strictEqual(result.disk.of, 0, 'disk of')
t.strictEqual(result.genre[0], 'Grunge', 'genre 0')
t.strictEqual(result.genre[1], 'Alternative', 'genre 1')
t.strictEqual(result.picture[0].format, 'jpg', 'picture format')
t.strictEqual(result.picture[0].data.length, 30966, 'picture length')
t.strictEqual(result.duration, 0, 'metadata duration')
t.end()
})
.on('duration', function (result) {
t.strictEqual(result, 0, 'duration')
})
// aliased tests
.on('title', function (result) {
t.strictEqual(result, 'In Bloom', 'aliased title')
})
.on('artist', function (result) {
t.strictEqual(result[0], 'Nirvana', 'aliased artist')
})
.on('albumartist', function (result) {
t.strictEqual(result[0], 'Nirvana', 'aliased albumartist')
})
.on('album', function (result) {
t.strictEqual(result, 'Nevermind', 'aliased album')
})
.on('year', function (result) {
t.strictEqual(result, '1991', 'aliased year')
})
.on('track', function (result) {
t.strictEqual(result.no, 1, 'aliased track no')
t.strictEqual(result.of, 12, 'aliased track of')
})
.on('disk', function (result) {
t.strictEqual(result.no, 1, 'aliased disk no')
t.strictEqual(result.of, 0, 'aliased disk of')
})
.on('genre', function (result) {
t.strictEqual(result[0], 'Grunge', 'aliased genre 0')
t.strictEqual(result[1], 'Alternative', 'aliased genre 1')
})
.on('picture', function (result) {
t.strictEqual(result[0].format, 'jpg', 'aliased picture format')
t.strictEqual(result[0].data.length, 30966, 'aliased picture length')
})
// raw tests
.on('TRACKTOTAL', function (result) {
t.strictEqual(result, '12', 'raw TRACKTOTAL')
})
.on('ALBUM', function (result) {
t.strictEqual(result, 'Nevermind', 'raw ALBUM')
})
.on('ARTIST', function (result) {
t.strictEqual(result, 'Nirvana', 'raw ARTIST')
})
.on('COMMENT', function (result) {
switch (comCounter) {
case 0:
t.strictEqual(result, "Nirvana's Greatest Album", 'raw COMMENT 0')
break
case 1:
t.strictEqual(result, 'And their greatest song', 'raw COMMENT 1')
break
}
comCounter++
})
.on('GENRE', function (result) {
switch (genCounter) {
case 0:
t.strictEqual(result, 'Grunge', 'raw GENRE 0')
break
case 1:
t.strictEqual(result, 'Alternative', 'raw GENRE 1')
break
}
genCounter++
})
.on('TITLE', function (result) {
t.strictEqual(result, 'In Bloom', 'raw TITLE')
})
.on('ALBUMARTIST', function (result) {
t.strictEqual(result, 'Nirvana', 'raw ALBUMARTIST')
})
.on('DISCNUMBER', function (result) {
t.strictEqual(result, '1', 'raw DISCNUMBER')
})
.on('DATE', function (result) {
t.strictEqual(result, '1991', 'raw DATE')
})
.on('TRACKNUMBER', function (result) {
t.strictEqual(result, '1', 'raw TRACKNUMBER')
})
.on('METADATA_BLOCK_PICTURE', function (result) {
t.strictEqual(result.format, 'image/jpeg', 'raw METADATA_BLOCK_PICTURE format')
t.strictEqual(result.type, 'Cover (back)', 'raw METADATA_BLOCK_PICTURE type')
t.strictEqual(result.description, 'little willy', 'raw METADATA_BLOCK_PICTURE description')
// test exact contents too
t.strictEqual(result.data.length, 30966, 'raw METADATA_BLOCK_PICTURE length')
t.strictEqual(result.data[0], 255, 'raw METADATA_BLOCK_PICTURE data 0')
t.strictEqual(result.data[1], 216, 'raw METADATA_BLOCK_PICTURE data 1')
t.strictEqual(result.data[result.data.length - 1], 217, 'raw METADATA_BLOCK_PICTURE data -1')
t.strictEqual(result.data[result.data.length - 2], 255, 'raw METADATA_BLOCK_PICTURE data -2')
})

readable.on('readable', function() {
var chunk;
while (null !== (chunk = readable.read(4))) {
console.log('got %d bytes of data', chunk.length);
}
});

// mm(sample, { duration: true }, function (err, result) {
// t.error(err)
// t.strictEqual(result.title, 'In Bloom', 'title')
// t.strictEqual(result.artist[0], 'Nirvana', 'artist')
// t.strictEqual(result.albumartist[0], 'Nirvana', 'albumartist')
// t.strictEqual(result.album, 'Nevermind', 'album')
// t.strictEqual(result.year, '1991', 'year')
// t.strictEqual(result.track.no, 1, 'track no')
// t.strictEqual(result.track.of, 12, 'track of')
// t.strictEqual(result.disk.no, 1, 'disk no')
// t.strictEqual(result.disk.of, 0, 'disk of')
// t.strictEqual(result.genre[0], 'Grunge', 'genre 0')
// t.strictEqual(result.genre[1], 'Alternative', 'genre 1')
// t.strictEqual(result.picture[0].format, 'jpg', 'picture format')
// t.strictEqual(result.picture[0].data.length, 30966, 'picture length')
// t.strictEqual(result.duration, 0, 'metadata duration')
// t.end()
// })
// .on('duration', function (result) {
// t.strictEqual(result, 0, 'duration')
// })
// // aliased tests
// .on('title', function (result) {
// t.strictEqual(result, 'In Bloom', 'aliased title')
// })
// .on('artist', function (result) {
// t.strictEqual(result[0], 'Nirvana', 'aliased artist')
// })
// .on('albumartist', function (result) {
// t.strictEqual(result[0], 'Nirvana', 'aliased albumartist')
// })
// .on('album', function (result) {
// t.strictEqual(result, 'Nevermind', 'aliased album')
// })
// .on('year', function (result) {
// t.strictEqual(result, '1991', 'aliased year')
// })
// .on('track', function (result) {
// t.strictEqual(result.no, 1, 'aliased track no')
// t.strictEqual(result.of, 12, 'aliased track of')
// })
// .on('disk', function (result) {
// t.strictEqual(result.no, 1, 'aliased disk no')
// t.strictEqual(result.of, 0, 'aliased disk of')
// })
// .on('genre', function (result) {
// t.strictEqual(result[0], 'Grunge', 'aliased genre 0')
// t.strictEqual(result[1], 'Alternative', 'aliased genre 1')
// })
// .on('picture', function (result) {
// t.strictEqual(result[0].format, 'jpg', 'aliased picture format')
// t.strictEqual(result[0].data.length, 30966, 'aliased picture length')
// })
// // raw tests
// .on('TRACKTOTAL', function (result) {
// t.strictEqual(result, '12', 'raw TRACKTOTAL')
// })
// .on('ALBUM', function (result) {
// t.strictEqual(result, 'Nevermind', 'raw ALBUM')
// })
// .on('ARTIST', function (result) {
// t.strictEqual(result, 'Nirvana', 'raw ARTIST')
// })
// .on('COMMENT', function (result) {
// switch (comCounter) {
// case 0:
// t.strictEqual(result, "Nirvana's Greatest Album", 'raw COMMENT 0')
// break
// case 1:
// t.strictEqual(result, 'And their greatest song', 'raw COMMENT 1')
// break
// }
// comCounter++
// })
// .on('GENRE', function (result) {
// switch (genCounter) {
// case 0:
// t.strictEqual(result, 'Grunge', 'raw GENRE 0')
// break
// case 1:
// t.strictEqual(result, 'Alternative', 'raw GENRE 1')
// break
// }
// genCounter++
// })
// .on('TITLE', function (result) {
// t.strictEqual(result, 'In Bloom', 'raw TITLE')
// })
// .on('ALBUMARTIST', function (result) {
// t.strictEqual(result, 'Nirvana', 'raw ALBUMARTIST')
// })
// .on('DISCNUMBER', function (result) {
// t.strictEqual(result, '1', 'raw DISCNUMBER')
// })
// .on('DATE', function (result) {
// t.strictEqual(result, '1991', 'raw DATE')
// })
// .on('TRACKNUMBER', function (result) {
// t.strictEqual(result, '1', 'raw TRACKNUMBER')
// })
// .on('METADATA_BLOCK_PICTURE', function (result) {
// t.strictEqual(result.format, 'image/jpeg', 'raw METADATA_BLOCK_PICTURE format')
// t.strictEqual(result.type, 'Cover (back)', 'raw METADATA_BLOCK_PICTURE type')
// t.strictEqual(result.description, 'little willy', 'raw METADATA_BLOCK_PICTURE description')
// // test exact contents too
// t.strictEqual(result.data.length, 30966, 'raw METADATA_BLOCK_PICTURE length')
// t.strictEqual(result.data[0], 255, 'raw METADATA_BLOCK_PICTURE data 0')
// t.strictEqual(result.data[1], 216, 'raw METADATA_BLOCK_PICTURE data 1')
// t.strictEqual(result.data[result.data.length - 1], 217, 'raw METADATA_BLOCK_PICTURE data -1')
// t.strictEqual(result.data[result.data.length - 2], 255, 'raw METADATA_BLOCK_PICTURE data -2')
// })
})
7 changes: 6 additions & 1 deletion test/test-regress-GH-56.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var id3 = require('..')
var test = require('prova')

test('mp3 cbr calculation', function (t) {
t.plan(2)
t.plan(3)

var sample = (process.browser) ?
new window.Blob([fs.readFileSync(__dirname + '/samples/regress-GH-56.mp3')])
Expand All @@ -14,5 +14,10 @@ test('mp3 cbr calculation', function (t) {
t.error(err)
t.strictEqual(result.duration, 373.329375, 'duration')
t.end()
}, function (cb) {
fs.stat(sample.path, function (err, stats) {
t.error(err)
cb(stats.size)
})
})
})