hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-08 19:11:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

better error handling for incorrect URLs

Browse source
This commit is contained in:
Sacha Greif 2014-11-30 13:03:35 +09:00
parent d2b24794bc
commit 025861f40c
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/telescope-module-embedly/lib/client/autoform-postthumbnail.js
View file

@ -32,8 +32,15 @@ Template.afPostThumbnail.rendered = function () {
var url = $urlField.val();
if (!!url) {
$thumbnailContainer.addClass('loading');
clearSeenErrors();
console.log('getting embedly data for '+url);
Meteor.call('getEmbedlyData', url, function (error, data) {
if (error) {
console.log(error)
throwError(error.reason);
$thumbnailContainer.removeClass('loading');
return
}
if (data) {
$img.attr('src', data.thumbnailUrl);
$thumbnailUrlField.val(data.thumbnailUrl);

12
packages/telescope-module-embedly/lib/server/get_embedly_data.js
View file

@ -5,10 +5,10 @@ getEmbedlyData = function (url) {
var thumbnailWidth = getSetting('thumbnailWidth', 200);
var thumbnailHeight = getSetting('thumbnailHeight', 125);
try {
if(!embedlyKey)
throw new Meteor.Error("Couldn't find an Embedly API key! Please add it to your Telescope settings.")
if(!embedlyKey)
throw new Error("Couldn't find an Embedly API key! Please add it to your Telescope settings.")
try {
var result = Meteor.http.get(extractBase, {
params: {
@ -22,12 +22,16 @@ getEmbedlyData = function (url) {
// console.log(result)
result.data.thumbnailUrl = result.data.images[0].url; // add thumbnailUrl as its own property
if (!!result.data.images && !!result.data.images.length) // there may not always be an image
result.data.thumbnailUrl = result.data.images[0].url; // add thumbnailUrl as its own property
return _.pick(result.data, 'title', 'media', 'description', 'thumbnailUrl');
} catch (error) {
console.log(error)
// the first 13 characters of the Embedly errors are "failed [400] ", so remove them and parse the rest
var errorObject = JSON.parse(error.message.substring(13));
throw new Meteor.Error(errorObject.error_code, errorObject.error_message);
return null;
}
}