Skip to content

Commit d0873d2

Browse files
committed
lint fixes
1 parent 0038ab3 commit d0873d2

File tree

6 files changed

+41
-38
lines changed

6 files changed

+41
-38
lines changed

speech-to-text/file-player.js

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,6 @@
22

33
var getContentTypeFromHeader = require('./content-type');
44

5-
6-
7-
/**
8-
* Reads the first few bytes of a binary file and resolves to the content-type if recognized & supported
9-
* @param {File|Blob} file
10-
* @returns {Promise}
11-
*/
12-
function getContentTypeFromFile(file) {
13-
return new Promise(function(resolve, reject) {
14-
var blobToText = new Blob([file]).slice(0, 4);
15-
var r = new FileReader();
16-
r.readAsText(blobToText);
17-
r.onload = function() {
18-
var ct = getContentTypeFromHeader(r.result);
19-
if (ct) {
20-
resolve(ct);
21-
} else {
22-
var err = new Error('Unable to determine content type from file header; only wav, flac, and ogg/opus are supported.');
23-
err.name = FilePlayer.ERROR_UNSUPPORTED_FORMAT;
24-
reject(err);
25-
}
26-
};
27-
});
28-
}
29-
305
/**
316
* Plays audio from File/Blob instances
327
* @param {File|Blob} file
@@ -57,6 +32,29 @@ function FilePlayer(file, contentType) {
5732

5833
FilePlayer.ERROR_UNSUPPORTED_FORMAT = 'UNSUPPORTED_FORMAT';
5934

35+
/**
36+
* Reads the first few bytes of a binary file and resolves to the content-type if recognized & supported
37+
* @param {File|Blob} file
38+
* @returns {Promise}
39+
*/
40+
function getContentTypeFromFile(file) {
41+
return new Promise(function(resolve, reject) {
42+
var blobToText = new Blob([file]).slice(0, 4);
43+
var r = new FileReader();
44+
r.readAsText(blobToText);
45+
r.onload = function() {
46+
var ct = getContentTypeFromHeader(r.result);
47+
if (ct) {
48+
resolve(ct);
49+
} else {
50+
var err = new Error('Unable to determine content type from file header; only wav, flac, and ogg/opus are supported.');
51+
err.name = FilePlayer.ERROR_UNSUPPORTED_FORMAT;
52+
reject(err);
53+
}
54+
};
55+
});
56+
}
57+
6058
/**
6159
* Determines the file's content-type and then resolves to a FilePlayer instance
6260
* @param {File|Blob} file

speech-to-text/no-timestamps.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/**
24
* Returns true if the result is missing it's timestamps
35
* @param {Object} data

speech-to-text/timing-stream.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ TimingStream.prototype.handleResult = function handleResult(data) {
245245
if (noTimestamps(data)) {
246246
var err = new Error('TimingStream requires timestamps');
247247
err.name = noTimestamps.ERROR_NO_TIMESTAMPS;
248-
return this.emit('error', err);
248+
this.emit('error', err);
249+
return;
249250
}
250251

251252
// http://www.ibm.com/watson/developercloud/speech-to-text/api/v1/#SpeechRecognitionEvent

test/format-stream-spec.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ describe('FormatStream', function() {
2424
stream.setEncoding('utf8');
2525
var source = {results: [
2626
{alternatives:
27-
[{
28-
confidence: 0.881,
29-
transcript: 'foo bar ',
30-
final: true}],
31-
result_index: 0}]};
27+
[{
28+
confidence: 0.881,
29+
transcript: 'foo bar ',
30+
final: true}],
31+
result_index: 0}]};
3232
var expected = {results: [
3333
{alternatives:
3434
[{
3535
confidence: 0.881,
3636
transcript: 'Foo bar. ',
3737
final: true}],
38-
result_index: 0}]};
38+
result_index: 0}]};
3939
stream.on('data', function(actual) {
4040
assert.equal(actual, expected);
4141
done();

test/result-stream-spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var ResultStream = require('../speech-to-text/result-stream.js');
77
describe('ResultStream', function() {
88

99
it('should extract results', function(done) {
10-
var stream = new ResultExtractor();
10+
var stream = new ResultStream();
1111
var source = {results: [{alternatives: [{transcript: 'foo'}]}], result_index: 1};
1212
var expected = {alternatives: [{transcript: 'foo'}], index: 1};
1313
stream.on('data', function(actual) {
@@ -19,7 +19,7 @@ describe('ResultStream', function() {
1919
});
2020

2121
it('should pass through speaker_labels messages', function(done) {
22-
var stream = new ResultExtractor();
22+
var stream = new ResultStream();
2323
var source = {speaker_labels: [{
2424
from: 28.92,
2525
to: 29.17,

test/timing-stream-spec.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ describe('TimingStream', function() {
231231
}
232232
});
233233

234+
assert.equal(speakerLabelsMessages, 3);
235+
234236
done();
235237
});
236238
});
@@ -277,16 +279,16 @@ describe('TimingStream', function() {
277279
var noTimestamps = require('../speech-to-text/no-timestamps');
278280
assert(noTimestamps.ERROR_NO_TIMESTAMPS, 'noTimestamps.ERROR_NO_TIMESTAMPS should be defined');
279281
var stream = new TimingStream({objectMode: true});
280-
var data = clone(require('./resources/results.json'));
281-
delete data.results[0].alternatives[0].timestamps;
282+
var message = clone(require('./resources/results.json'));
283+
delete message.results[0].alternatives[0].timestamps;
282284
stream.on('data', function(data) {
283-
assert.fail(data, undefined, "data emitted")
285+
assert.fail(data, null, 'data emitted');
284286
});
285287
stream.on('error', function(err) {
286288
assert.equal(err.name, noTimestamps.ERROR_NO_TIMESTAMPS);
287289
done();
288290
});
289-
stream.end(data);
291+
stream.end(message);
290292
});
291293

292294
});

0 commit comments

Comments
 (0)