rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '3.0' into videojs-hls

Browse source
This commit is contained in:
calzoneman 2016-08-09 22:41:55 -07:00
commit e99bfcd47b
6 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/get-info.js
View file

@ -11,6 +11,7 @@ var mediaquery = require("cytube-mediaquery");
var YouTube = require("cytube-mediaquery/lib/provider/youtube");
var Vimeo = require("cytube-mediaquery/lib/provider/vimeo");
var Vidme = require("cytube-mediaquery/lib/provider/vidme");
var Streamable = require("cytube-mediaquery/lib/provider/streamable");
/*
* Preference map of quality => youtube formats.
@ -567,6 +568,24 @@ var Getters = {
const media = new Media(video.id, video.title, video.duration,
"vm", video.meta);
process.nextTick(callback, false, media);
}).catch(function (err) {
callback(err.message || err, null);
});
},
/* streamable */
sb: function (id, callback) {
if (!/^[\w-]+$/.test(id)) {
process.nextTick(callback, "Invalid streamable.com ID");
return;
}
Streamable.lookup(id).then(video => {
const media = new Media(video.id, video.title, video.duration,
"sb", video.meta);
process.nextTick(callback, false, media);
}).catch(function (err) {
callback(err.message || err, null);
});
}
};

2
src/utilities.js
View file

@ -244,6 +244,8 @@
return "http://hitbox.tv/" + id;
case "hl":
return id;
case "sb":
return "https://streamable.com/" + id;
default:
return "";
}