minor changes

This commit is contained in:
Dmitry Shirokov 2013-08-06 11:35:58 +10:00
parent 17efdf03be
commit b60a93a538
4 changed files with 22 additions and 24 deletions

View File

@ -8,7 +8,7 @@ var util = require('util'),
module.exports.UTF_16BE = function() { module.exports.UTF_16BE = function() {
this.name = function() { this.name = function() {
return "UTF-16BE"; return 'UTF-16BE';
}; };
this.match = function(det) { this.match = function(det) {
var input = det.fRawInput; var input = det.fRawInput;
@ -25,7 +25,7 @@ module.exports.UTF_16BE = function() {
module.exports.UTF_16LE = function() { module.exports.UTF_16LE = function() {
this.name = function() { this.name = function() {
return "UTF-16LE"; return 'UTF-16LE';
}; };
this.match = function(det) { this.match = function(det) {
var input = det.fRawInput; var input = det.fRawInput;
@ -93,7 +93,7 @@ UTF_32.prototype.match = function(det) {
module.exports.UTF_32BE = function() { module.exports.UTF_32BE = function() {
this.name = function() { this.name = function() {
return "UTF-32BE"; return 'UTF-32BE';
}; };
this.getChar = function(input, index) { this.getChar = function(input, index) {
return (input[index + 0] & 0xFF) << 24 | (input[index + 1] & 0xFF) << 16 | return (input[index + 0] & 0xFF) << 24 | (input[index + 1] & 0xFF) << 16 |
@ -104,7 +104,7 @@ util.inherits(module.exports.UTF_32BE, UTF_32);
module.exports.UTF_32LE = function() { module.exports.UTF_32LE = function() {
this.name = function() { this.name = function() {
return "UTF-32LE"; return 'UTF-32LE';
}; };
this.getChar = function(input, index) { this.getChar = function(input, index) {
return (input[index + 3] & 0xFF) << 24 | (input[index + 2] & 0xFF) << 16 | return (input[index + 3] & 0xFF) << 24 | (input[index + 2] & 0xFF) << 16 |

View File

@ -6,7 +6,7 @@ var Match = require ('../match');
*/ */
module.exports = function() { module.exports = function() {
this.name = function() { this.name = function() {
return "UTF-8"; return 'UTF-8';
}; };
this.match = function(det) { this.match = function(det) {

View File

@ -62,23 +62,20 @@ module.exports.detect = function(buffer) {
fInputLen: buffer.length fInputLen: buffer.length
}; };
var matches = recognisers.map(function(rec) { var match = recognisers.map(function(rec) {
return rec.match(context); return rec.match(context);
}).filter(function(match) { }).filter(function(match) {
return !!match; return !!match;
}); }).sort(function(a, b) {
matches.sort(function(a, b) {
return a.confidence - b.confidence; return a.confidence - b.confidence;
}); }).pop();
return matches.length ? matches.pop().name : null; return match ? match.name : null;
}; };
module.exports.detectFile = function(filepath, fn) { module.exports.detectFile = function(filepath, fn) {
fs.readFile(filepath, function(err, res) { fs.readFile(filepath, function(err, res) {
if (err) if (err) return fn(err, null);
return fn(err, null);
fn(null, self.detect(res)); fn(null, self.detect(res));
}); });
}; };

View File

@ -1,6 +1,6 @@
{ {
"name": "chardet", "name": "chardet",
"version": "0.0.6", "version": "0.0.7",
"homepage": "https://github.com/runk/node-chardet", "homepage": "https://github.com/runk/node-chardet",
"description": "Character detector", "description": "Character detector",
"keywords": [ "keywords": [
@ -34,5 +34,6 @@
"readmeFilename": "README.md", "readmeFilename": "README.md",
"directories": { "directories": {
"test": "test" "test": "test"
} },
"license" : "MIT"
} }