Merge pull request #3 from danyg/master

Binary safe

Author: ka2er

.gitignore

@@ -14,3 +14,4 @@ results
 
 node_modules
 npm-debug.log
+/test/justified.srt

lib/endpoints.js

@@ -34,17 +34,18 @@ ep.prototype.get = function(action, params, cb) {
 
 	//console.log(this.options);
 
-	var data = '';
+	var data = [];
 	var req = http.request(this.options);
 	req.on('response', function (response) {
 
         //to avoid problems with subtitle with a chatset different than utf-8
-        response.setEncoding('binary');
 
 		response.on('data', function (chunk) {
-			data += chunk;
+			if(!!chunk && chunk.length > 0){
+				data.push(chunk);
+			}
 		}).on('end', function(){
-			cb(null, this.statusCode, data);
+			cb(null, this.statusCode, Buffer.concat(data));
 		});
 	}).on('error', function(e) {
 		cb(e);
@@ -77,17 +78,19 @@ ep.prototype.post = function(action, file, params, cb) {
 		}).on('end', function(){
 			cb(null, this.statusCode, data);
 		});
+		req.end();
 	}).on('error', function(e) {
 		cb(e);
+		req.end();
 	});
-	req.end();
 };
 
 
 /** protocol methods */
 ep.prototype.available_languages = function(cb){
 	this.get('languages',  {}, function(err, status, res) {
 		if(err) return cb(err);
+		res = res.toString();
 
 		if(status == 400) return cb('Bad Request');
 
@@ -101,6 +104,7 @@ ep.prototype.search_subtitles = function(hash, versions, cb){
 
 	this.get('search', params, function(err, status, res){
 		if(err) return cb(err);
+		res = res.toString();
 
 		if(status == 400) return cb('Bad Request');
 		if(status == 404) return cb(null, ''); // no subtitle found
@@ -117,7 +121,7 @@ ep.prototype.download_subtitle = function(hash, lang, path, cb){
 		if(status == 400) return cb('Bad Request');
 		if(status == 404) return cb(null, ''); // no subtitle found
 
-		fs.writeFile(path, res, function(err) {
+		fs.writeFile(path, res, {encoding: 'binary'}, function(err) {
 			if(err) return cb(err);
 
 			cb(null, path);

test/justified-FR-ANSI.srt

@@ -0,0 +1,9 @@
+1
+00:00:05,000 --> 00:00:15,000
+Attention: Ceci est une légende de test.
+
+2
+00:00:25,000 --> 00:00:40,000
+SubDB - une base de données libre de sous-titres.
+http://thesubdb.com
+

test/test.js

@@ -73,19 +73,26 @@ describe('Subdb', function() {
 
 		describe('#download_subtitle', function(){
 			it('should download subtitle', function(done) {
-				var path = process.cwd()+'/test/justified.srt';
+				var path = process.cwd()+'/test/justified.srt',
+					properlyEncoded = process.cwd() + '/test/justified-FR-ANSI.srt'
+				;
+
+				var bufferExpectedFile = fs.readFileSync(properlyEncoded);
+
 				fs.unlink(path, function() {
 					var subdb = new SubDb();
 					subdb.api.download_subtitle('edc1981d6459c6111fe36205b4aff6c2', 'fr', path, function(err, res){
 						if(err) return done(err);
 
-						fs.stat(res, function(err, stat) {
-							if(err) return done(err);
+						var bufferActualFile = fs.readFileSync(path);
+
+						assert.equal(bufferActualFile.length, bufferExpectedFile.length);
 
-                            assert.equal(stat.size, 179);
+						for(var i = 0; i < bufferActualFile.length; i++){
+							assert.equal(bufferActualFile[i], bufferExpectedFile[i]);
+						}
 
-                            done();
-						});
+						done();
 					});
 				});
 			});