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

Add html titles, improve youtube track matching

Browse source
This commit is contained in:
Jonathan Cremin 2014-12-05 23:47:27 +00:00
parent 6decb7e8e3
commit 4d4c078220
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/services/youtube.js
View file

@ -29,22 +29,28 @@ module.exports.search = function(data) {
query = data.artist.name + " " + data.name; query = data.artist.name + " " + data.name;
album = data.name; album = data.name;
} else if (type == "track") { } else if (type == "track") {
query = data.artist.name + data.name; query = data.artist.name + " " + data.name;
album = data.album.name album = data.album.name
} }
var path = "/search?part=snippet&q=" + encodeURIComponent(query) + "&type=video&videoCaption=any&key=" + credentials.key; var path = "/search?part=snippet&q=" + encodeURIComponent(query) + "&type=video&videoCaption=any&key=" + credentials.key;
request.get(apiRoot + path, function(res) { request.get(apiRoot + path, function(res) {
var result = res.body.items[0]; var result = res.body.items[0];
deferred.resolve({
service: "youtube", if (!result) {
type: "video", deferred.resolve({service:"youtube", type: "video"});
id: result.id.videoId, } else {
name: result.snippet.title, deferred.resolve({
streamUrl: "https://www.youtube.com/watch?v=" + result.id.videoId, service: "youtube",
purchaseUrl: null, type: "video",
artwork: result.snippet.thumbnails.medium.url, id: result.id.videoId,
}); name: result.snippet.title,
streamUrl: "https://www.youtube.com/watch?v=" + result.id.videoId,
purchaseUrl: null,
artwork: result.snippet.thumbnails.medium.url,
});
}
}); });
return deferred.promise; return deferred.promise;
}; };

4
routes/share.js
View file

@ -29,7 +29,7 @@ module.exports = function(req, res, next) {
req.db.matches.findOne({_id:serviceId + itemId}).then(function(doc) { req.db.matches.findOne({_id:serviceId + itemId}).then(function(doc) {
if (doc) { if (doc) {
res.render(type, {page: type, items: doc.items}); res.render(type, {page: type, title: doc.items[0].name + " by " + doc.items[0].artist.name, items: doc.items});
} else { } else {
Q.timeout(services[serviceId].lookupId(itemId, type), 5000).then(function(item) { Q.timeout(services[serviceId].lookupId(itemId, type), 5000).then(function(item) {
for (var id in services) { for (var id in services) {
@ -58,7 +58,7 @@ module.exports = function(req, res, next) {
items.unshift(item); items.unshift(item);
req.db.matches.save({_id:serviceId + itemId, items:items}); req.db.matches.save({_id:serviceId + itemId, items:items});
cache[serviceId][type + "-" + itemId] = items; cache[serviceId][type + "-" + itemId] = items;
res.render(type, {page: type, items: items}); res.render(type, {page: type, title: item.name + " by " + item.artist.name, items: items});
}); });
}, function(error) { }, function(error) {
if (error.code == "ETIMEDOUT") { if (error.code == "ETIMEDOUT") {

2
views/header.ejs
View file

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Match Audio</title> <title><% if (locals.title) { %><%= title %> - <% } %>Match Audio</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="/images/favicon.png"> <link rel="shortcut icon" href="/images/favicon.png">