Switch to Koa, more es6
This commit is contained in:
parent
1090affc9c
commit
b3abff99ae
36 changed files with 25573 additions and 928 deletions
|
|
@ -1,30 +1,28 @@
|
|||
"use strict";
|
||||
'use strict';
|
||||
|
||||
var React = require("react");
|
||||
var Router = require("react-router");
|
||||
require("node-jsx").install({extension: ".jsx"});
|
||||
var routes = require("../views/app.jsx").routes;
|
||||
import React from 'react';
|
||||
import createHandler from '../lib/react-handler';
|
||||
import {routes} from '../views/app.jsx';
|
||||
|
||||
module.exports = function(req, res, next) {
|
||||
|
||||
req.db.matches.find().sort({"created_at": -1}).limit(6).toArray().then(function(docs){
|
||||
var recents = [];
|
||||
docs.forEach(function(doc) {
|
||||
var shares = Object.keys(doc.services).map(function (key) {return doc.services[key]; });
|
||||
shares.some(function(item) {
|
||||
if (item.service === doc._id.split("$$")[0]) { // eslint-disable-line no-underscore-dangle
|
||||
recents.push(item);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
module.exports = function* () {
|
||||
let recents = [];
|
||||
let docs = yield this.db.matches.find().sort({'created_at': -1}).limit(6).toArray();
|
||||
docs.forEach(function(doc) {
|
||||
let shares = Object.keys(doc.services).map(function (key) {return doc.services[key]; });
|
||||
shares.some(function(item) {
|
||||
if (item.service === doc._id.split('$$')[0]) { // eslint-disable-line no-underscore-dangle
|
||||
recents.push(item);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
Router.run(routes, req.url, function (Handler) {
|
||||
var App = React.createFactory(Handler);
|
||||
var content = React.renderToString(new App({recents: recents}));
|
||||
res.send("<!doctype html>\n" + content.replace("</body></html>", "<script>var recents = " + JSON.stringify(recents) + "</script></body></html>"));
|
||||
});
|
||||
}).catch(function(error) {
|
||||
next(error);
|
||||
});
|
||||
|
||||
let Handler = yield createHandler(routes, this.request.url);
|
||||
|
||||
let App = React.createFactory(Handler);
|
||||
let content = React.renderToString(new App({recents: recents}));
|
||||
|
||||
content = content.replace('</body></html>', '<script>var recents = ' + JSON.stringify(recents) + '</script></body></html>');
|
||||
|
||||
this.body = '<!doctype html>\n' + content;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
"use strict";
|
||||
var parse = require("url").parse;
|
||||
var request = require("superagent");
|
||||
import {parse} from 'url';
|
||||
import request from 'superagent';
|
||||
|
||||
module.exports = function(req, res) {
|
||||
var url = "http://" + req.url.substr(8);
|
||||
var parsed = parse(url);
|
||||
module.exports = function* (next) {
|
||||
let url = 'http://' + this.request.url.substr(8);
|
||||
let parsed = parse(url);
|
||||
if (parsed.host.match(/mzstatic\.com/)) {
|
||||
request.get(url, function(response){
|
||||
res.set(response.headers);
|
||||
res.send(response.body);
|
||||
});
|
||||
let proxyResponse = yield request.get(url);
|
||||
this.set(proxyResponse.headers);
|
||||
this.body = proxyResponse.body;
|
||||
} else {
|
||||
yield next;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,44 +1,42 @@
|
|||
"use strict";
|
||||
var parse = require("url").parse;
|
||||
var lookup = require("../lib/lookup");
|
||||
var services = require("../lib/services");
|
||||
import {parse} from 'url';
|
||||
import co from 'co';
|
||||
import lookup from '../lib/lookup';
|
||||
import services from '../lib/services';
|
||||
|
||||
module.exports = function(req, res) {
|
||||
var url = parse(req.body.url);
|
||||
if (!url.host) {
|
||||
return res.json({error: {message: "You need to submit a url."}});
|
||||
}
|
||||
module.exports = function* () {
|
||||
let url = parse(this.request.body.url);
|
||||
this.assert(url.host, 400, {error: {message: 'You need to submit a url.'}});
|
||||
|
||||
var promise = lookup(req.body.url);
|
||||
let item = yield lookup(this.request.body.url);
|
||||
|
||||
if (!promise) {
|
||||
return res.json({error: {message: "No supported music found at that link :("}});
|
||||
}
|
||||
this.assert(item, 400, {error: {message: 'No supported music found at that link :('}});
|
||||
|
||||
promise.then(function(item) {
|
||||
if (!item) {
|
||||
return res.json({error: {message: "No supported music found at that link :("}});
|
||||
item.matched_at = new Date(); // eslint-disable-line camelcase
|
||||
let matches = {};
|
||||
matches[item.service] = item;
|
||||
|
||||
|
||||
for (let service of services) {
|
||||
if (service.id === item.service) {
|
||||
continue;
|
||||
}
|
||||
item.matched_at = new Date(); // eslint-disable-line camelcase
|
||||
var matches = {};
|
||||
matches[item.service] = item;
|
||||
services.forEach(function(service) {
|
||||
matches[service.id] = {service: service.id};
|
||||
}
|
||||
|
||||
yield this.db.matches.save({_id: item.service + '$$' + item.id, 'created_at': new Date(), services: matches});
|
||||
this.body = item;
|
||||
|
||||
process.nextTick(co.wrap(function* (){
|
||||
for (let service of services) {
|
||||
if (service.id === item.service) {
|
||||
return;
|
||||
continue;
|
||||
}
|
||||
matches[service.id] = {service: service.id};
|
||||
service.search(item).then(function(match) {
|
||||
match.matched_at = new Date(); // eslint-disable-line camelcase
|
||||
var update = {};
|
||||
update["services." + match.service] = match;
|
||||
req.db.matches.update({_id: item.service + "$$" + item.id}, {"$set": update});
|
||||
});
|
||||
});
|
||||
return req.db.matches.save({_id: item.service + "$$" + item.id, "created_at": new Date(), services: matches}).then(function() {
|
||||
res.json(item);
|
||||
});
|
||||
}, function(error) {
|
||||
console.log(error.stack);
|
||||
res.json({error: {message: "No matches found for this link, sorry :("}});
|
||||
});
|
||||
let match = yield service.search(item);
|
||||
match.matched_at = new Date(); // eslint-disable-line camelcase
|
||||
let update = {};
|
||||
update['services.' + match.service] = match;
|
||||
yield this.db.matches.updateOne({_id: item.service + '$$' + item.id}, {'$set': update});
|
||||
}
|
||||
}.bind(this)));
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
"use strict";
|
||||
import React from 'react';
|
||||
import createHandler from '../lib/react-handler';
|
||||
import {routes} from '../views/app.jsx';
|
||||
import services from '../lib/services';
|
||||
|
||||
var React = require("react");
|
||||
var Router = require("react-router");
|
||||
require("node-jsx").install();
|
||||
var routes = require("../views/app.jsx").routes;
|
||||
|
||||
var services = require("../lib/services");
|
||||
|
||||
var formatAndSort = function(matches, serviceId) {
|
||||
let formatAndSort = function(matches, serviceId) {
|
||||
matches = Object.keys(matches).map(function (key) {return matches[key]; });
|
||||
matches.sort(function(a, b) {
|
||||
return a.id && !b.id;
|
||||
|
|
@ -17,60 +13,34 @@ var formatAndSort = function(matches, serviceId) {
|
|||
return matches;
|
||||
};
|
||||
|
||||
module.exports = function(req, res, next) {
|
||||
var serviceId = req.params.service;
|
||||
var type = req.params.type;
|
||||
var itemId = req.params.id;
|
||||
|
||||
var matchedService;
|
||||
module.exports = function* (serviceId, type, itemId, format, next) {
|
||||
let matchedService;
|
||||
services.some(function(service) {
|
||||
matchedService = serviceId === service.id ? service : null;
|
||||
return matchedService;
|
||||
});
|
||||
|
||||
if (!matchedService || (type !== "album" && type !== "track")) {
|
||||
return next();
|
||||
if (!matchedService || (type !== 'album' && type !== 'track')) {
|
||||
return yield next;
|
||||
}
|
||||
|
||||
return req.db.matches.findOne({_id: serviceId + "$$" + itemId}).then(function(doc) {
|
||||
if (!doc) {
|
||||
return matchedService.lookupId(itemId, type).then(function(item) {
|
||||
var matches = {};
|
||||
item.matched_at = new Date(); // eslint-disable-line camelcase
|
||||
matches[item.service] = item;
|
||||
services.forEach(function(service) {
|
||||
if (service.id === item.service) {
|
||||
return;
|
||||
}
|
||||
matches[service.id] = {service: service.id};
|
||||
service.search(item).then(function(match) {
|
||||
match.matched_at = new Date(); // eslint-disable-line camelcase
|
||||
var update = {};
|
||||
update["services." + match.service] = match;
|
||||
req.db.matches.update({_id: item.service + "$$" + item.id}, {"$set": update});
|
||||
});
|
||||
});
|
||||
return req.db.matches.save({_id: item.service + "$$" + item.id, "created_at": new Date(), services: matches}).then(function() {
|
||||
var newShares = formatAndSort(matches, serviceId);
|
||||
Router.run(routes, req.url, function (Handler) {
|
||||
var App = React.createFactory(Handler);
|
||||
var content = React.renderToString(new App({shares: newShares}));
|
||||
res.send("<!doctype html>\n" + content.replace("</body></html>", "<script>var shares = " + JSON.stringify(newShares) + "</script></body></html>"));
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
var shares = formatAndSort(doc.services, serviceId);
|
||||
if (req.params.format === "json") {
|
||||
return res.json({shares: shares});
|
||||
}
|
||||
Router.run(routes, req.url, function (Handler) {
|
||||
var App = React.createFactory(Handler);
|
||||
var content = React.renderToString(new 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);
|
||||
});
|
||||
let shares = [];
|
||||
let doc = yield this.db.matches.findOne({_id: serviceId + '$$' + itemId});
|
||||
|
||||
this.assert(doc, 404, 'Not Found');
|
||||
|
||||
shares = formatAndSort(doc.services, serviceId);
|
||||
|
||||
if (format === 'json') {
|
||||
this.body = {shares: shares};
|
||||
} else {
|
||||
let Handler = yield createHandler(routes, this.request.url);
|
||||
|
||||
let App = React.createFactory(Handler);
|
||||
let content = React.renderToString(new App({shares: shares}));
|
||||
|
||||
content = content.replace('</body></html>', '<script>var shares = ' + JSON.stringify(shares) + '</script></body></html>');
|
||||
|
||||
this.body = '<!doctype html>\n' + content;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue