Merge branch '3.0' into videojs-hls

package.json

@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.18.8",
+  "version": "3.19.0",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },

player/update.coffee

@@ -16,6 +16,7 @@ TYPE_MAP =
     im: ImgurPlayer
     vm: VideoJSPlayer
     hl: HLSPlayer
+    sb: VideoJSPlayer
 
 window.loadMediaPlayer = (data) ->
     try

src/get-info.js

@@ -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);
         });
     }
 };

src/utilities.js

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

www/js/player.js

@@ -1305,7 +1305,8 @@
     us: UstreamPlayer,
     im: ImgurPlayer,
     vm: VideoJSPlayer,
-    hl: HLSPlayer
+    hl: HLSPlayer,
+    sb: VideoJSPlayer
   };
 
   window.loadMediaPlayer = function(data) {

www/js/util.js

@@ -54,6 +54,8 @@ function formatURL(data) {
             return "http://hitbox.tv/" + data.id;
         case "hl":
             return data.id;
+        case "sb":
+            return "https://streamable.com/" + data.id;
         default:
             return "#";
     }
@@ -1375,6 +1377,13 @@ function parseMediaLink(url) {
         };
     }
 
+    if((m = url.match(/streamable\.com\/([\w-]+)/))) {
+        return {
+            id: m[1],
+            type: "sb"
+        };
+    }
+
     /*  Shorthand URIs  */
     // To catch Google Plus by ID alone
     if ((m = url.match(/^(?:gp:)?(\d{21}_\d{19}_\d{19})/))) {