jonathan/combine.fm
jonathan/combine.fm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Refactor searching

Browse source
This commit is contained in:
Jonathan Cremin 2015-01-06 12:58:57 +00:00
parent 87649b5a3a
commit bbcbe8d871
9 changed files with 155 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

76
routes/share.js
View file

@ -9,72 +9,36 @@ var Router = require('react-router');
var nodejsx = require('node-jsx').install();
var routes = require('../views/app.jsx').routes;
var services = {};
require("fs").readdirSync(path.join(__dirname, "..", "lib", "services")).forEach(function(file) {
var service = require("../lib/services/" + file);
if (service.search) {
services[service.id] = service;
}
});
var services = require('../lib/services');
module.exports = function(req, res, next) {
var serviceId = req.params.service;
var type = req.params.type;
var itemId = req.params.id;
var promises = [];
if (!services[serviceId] || (type != "album" && type != "track")) {
next();
return;
var matchedService;
services.some(function(service) {
matchedService = serviceId == service.id ? service : null;
return matchedService;
});
if (!matchedService || (type != "album" && type != "track")) {
return next();
}
req.db.matches.findOne({_id:serviceId + "$$" + itemId}, function(err, doc) {
if (err) {
return next(new Error());
} else if (!doc) {
return next();
return req.db.matches.findOne({_id:serviceId + "$$" + itemId}).then(function(doc) {
var shares = Object.keys(doc.services).map(function (key) {return doc.services[key]});
if (req.params.format == "json") {
return res.json({shares:shares});
}
var shares = [];
for (var docService in Object.keys(services)) {
var loopServiceId = Object.keys(services)[docService];
shares.push(doc.services[loopServiceId]);
if (doc.services[loopServiceId].id === undefined) {
services[loopServiceId].search(doc.services[serviceId]).timeout(15000).then(function(item) {
if (!item.id) {
item.id = null;
}
var set = {};
set["services." + item.service] = item;
req.db.matches.update({_id: serviceId + "$$" + itemId}, {$set: set});
}).catch(function(err) {
console.log(err)
});
}
}
var shares = shares.filter(function(item) {
return item.service != serviceId;
Router.run(routes, req.url, function (Handler) {
var App = React.createFactory(Handler);
var content = React.renderToString(App({shares: shares}));
res.send('<!doctype html>\n' + content.replace("</body></html>", "<script>var shares = " + JSON.stringify(shares) + "</script></body></html>"));
});
shares.sort(function(a, b) {
return a.type == "video" && b.type != "video";
});
shares.unshift(doc.services[serviceId]);
if (req.accepts(['html', 'json']) === 'json') {
req.db.matches.findOne({_id:serviceId + "$$" + itemId}, function(err, doc) {
res.json({shares:shares});
});
} else {
Router.run(routes, req.url, function (Handler) {
var App = React.createFactory(Handler);
var content = React.renderToString(App({shares: shares}));
res.send('<!doctype html>\n' + content.replace("</body></html>", "<script>var shares = " + JSON.stringify(shares) + "</script></body></html>"));
});
}
}).catch(function (error) {
return next(error);
});
};