more HTTP status code check

add subtitle upload

Author: ka2er

lib/endpoints.js

@@ -7,12 +7,15 @@
 
 var querystring = require('querystring'),
 	http = require('http'),
-	fs = require('fs');
+	url = require('url'),
+	fs = require('fs'),
+	FormData = require('form-data'),
+	clone = require('clone');
 
 var ep = module.exports = function() {
 
 	this.options = {
-		//'hostname': 'sandbox.thesubdb.com',
+		//'hostname': 'sandbox.thesubdb.com', // buggy
 		//'hostname': 'permita.se',
 		'hostname': 'api.thesubdb.com',
 		'agent': false,
@@ -26,6 +29,7 @@ var ep = module.exports = function() {
 ep.prototype.get = function(action, params, cb) {
 
 	params.action = action;
+	this.options.method = 'GET';
 	this.options.path = "/?"+querystring.stringify(params);
 
 	//console.log(this.options);
@@ -43,12 +47,46 @@ ep.prototype.get = function(action, params, cb) {
 	}).end();
 };
 
+ep.prototype.post = function(action, file, params, cb) {
+
+	var opt = clone(this.options);
+	opt.method = 'POST';
+	opt.path = "/?"+querystring.stringify({action:action});
+
+	var form = new FormData();
+	form.append('file', fs.createReadStream(file));
+	for(var i in params) {
+		form.append(i, params[i]);
+	}
+	var headers = form.getHeaders();
+	for(var i in headers) {
+		opt.headers[i] = headers[i];
+	}
+
+	var req = http.request(opt);
+	form.pipe(req);
+
+	var data = '';
+	req.on('response', function (response) {
+		response.on('data', function (chunk) {
+			data += chunk;
+		}).on('end', function(){
+			cb(null, this.statusCode, data);
+		});
+	}).on('error', function(e) {
+		cb(e);
+	});
+	req.end();
+};
+
 
 /** protocol methods */
 ep.prototype.available_languages = function(cb){
 	this.get('languages',  {}, function(err, status, res) {
 		if(err) return cb(err);
 
+		if(status == 400) return cb('Bad Request');
+
 		cb(null, res.split(','));
 	});
 };
@@ -60,6 +98,9 @@ ep.prototype.search_subtitles = function(hash, versions, cb){
 	this.get('search', params, function(err, status, res){
 		if(err) return cb(err);
 
+		if(status == 400) return cb('Bad Request');
+		if(status == 404) return cb(null, ''); // no subtitle found
+
 		cb(null, res.split(','));
 	});
 };
@@ -69,6 +110,9 @@ ep.prototype.download_subtitle = function(hash, lang, path, cb){
 	this.get('download', params, function(err, status, res){
 		if(err) return cb(err);
 
+		if(status == 400) return cb('Bad Request');
+		if(status == 404) return cb(null, ''); // no subtitle found
+
 		fs.writeFile(path, res, function(err) {
 			if(err) return cb(err);
 
@@ -77,9 +121,22 @@ ep.prototype.download_subtitle = function(hash, lang, path, cb){
 	});
 };
 ep.prototype.upload_subtitle = function(hash, file, cb){
-	this.post('upload', function(err, status, res){
+	var params = {hash:hash}
+	this.post('upload', file, params, function(err, status, res){
 		if(err) return cb(err);
 
-		cb(null, res);
+		/*
+		        'Uploaded': (HTTP/1.1 201 Created)
+            If everything was OK, the HTTP status code 201 will be returned.
+
+         */
+
+
+		if(status == 403) return cb('Forbidden : subtitle already exists');
+		if(status == 415) return cb('Unsupported Media Type');
+		if(status == 400) return cb('Bad Request');
+
+
+		cb(null, status);
 	});
 };

package.json

@@ -12,12 +12,13 @@
   },
   "scripts": {
     "test": "mocha"
-  },  "main": "lib/subdb.js",
+  },"main": "lib/subdb.js",
   "dependencies": {
-
+	"form-data": "0.0.x",
+	"clone": "0.1.x"
   },
   "devDependencies": {
-    "mocha":"1.6.0"
+    "mocha":"1.6.x"
   },
   "optionalDependencies": {},
   "engines": {

test/justified.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

@@ -52,7 +52,7 @@ describe('Subdb', function() {
 				subdb.api.available_languages(function(err, res){
 					if(err) return done(err);
 
-					assert.equal(res.join(','), ["af","cs","da","de","en","es","fi","fr","hu","id","it","la","nl","no","oc","pl","pt","ro","ru","sl","sr","sv","tr"].join(','));
+					assert.equal(res.join(','), ["en","es","fr","it","nl","pl","pt","ro","sv","tr"].join(','));
 					done();
 				});
 			});
@@ -89,6 +89,19 @@ describe('Subdb', function() {
 				});
 			});
 		});
+
+		describe('#upload_subtitle', function(){
+			it('should upload subtitle', function(done) {
+				var path = process.cwd()+'/test/justified.srt';
+				var subdb = new SubDb();
+				subdb.api.upload_subtitle('edc1981d6459c6111fe36205b4aff6c2', path, function(err, res){
+					if(err) return done(err);
+
+					assert.equal(res, 200);
+					done();
+				});
+			});
+		});
 	});
 });