From 8acffda8ecbf07997266be6b6605f50b4bf2147a Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Thu, 10 Jul 2014 23:23:48 -0700
Subject: [PATCH] Add clientside support for Google+

---
 www/js/callbacks.js |  4 ++++
 www/js/util.js      | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index f495528a..2c644a50 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -878,6 +878,10 @@ Callbacks = {
             data = vimeoSimulator2014(data);
         }
 
+        if (data.type === "gp") {
+            data = googlePlusSimulator2014(data);
+        }
+
         /* RTMP player has been replaced with the general flash player */
         if (data.type === "rt") {
             data.url = data.id;
diff --git a/www/js/util.js b/www/js/util.js
index 6bdf421f..ae0826d7 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -1280,6 +1280,13 @@ function parseMediaLink(url) {
         };
     }
 
+    if ((m = url.match(/plus\.google\.com\/(?:u\/\d+\/)?photos\/(\d+)\/albums\/(\d+)\/(\d+)/))) {
+        return {
+            id: m[1] + "_" + m[2] + "_" + m[3],
+            type: "gp"
+        };
+    }
+
     /* Raw file */
     var tmp = url.split("?")[0];
     if (tmp.match(/^https?:\/\//)) {
@@ -2725,3 +2732,33 @@ function vimeoSimulator2014(data) {
     data.url = data.meta.direct[q].url;
     return data;
 }
+
+function googlePlusSimulator2014(data) {
+    /* Google+ Simulator uses the raw file player */
+    data.type = "fi";
+
+    /* For browsers that don't support native h264 playback */
+    if (USEROPTS.no_h264) {
+        data.forceFlash = true;
+    }
+
+    /* Convert youtube-style quality key to vimeo workaround quality */
+    var q = USEROPTS.default_quality || "auto";
+
+    var fallbacks = ["hd1080", "hd720", "large", "medium", "small"];
+    var i = fallbacks.indexOf(q);
+    if (i < 0) {
+        // Default to 360p because 480p is Flash
+        i = fallbacks.indexOf("medium");
+    }
+
+    while (!(q in data.meta.direct) && i < fallbacks.length) {
+        q = fallbacks[i++];
+    }
+    if (i === fallbacks.length) {
+        q = "medium";
+    }
+
+    data.url = data.meta.direct[q];
+    return data;
+}