From 25ec59652696e6c4b2bb0989a931d5e642a5baf9 Mon Sep 17 00:00:00 2001
From: Toni Gundogdu <legatvs@gmail.com>
Date: Sat, 30 Nov 2013 17:13:55 +0200
Subject: [PATCH] FIX: media/vimeo: Reimpl. support

  - Use HTTPS if the input URL was given using it [1]
  - Improve stream identification (incl. bitrate)
  - Parse media properties using LuaJSON
  - Parse data from a new location
  - Update all relevant patterns

Notes:
[1]: media streams are still provided over HTTP
[2]: http://thread.gmane.org/gmane.comp.web.flash.quvi/358

Signed-off-by: Toni Gundogdu <legatvs@gmail.com>
---
 share/Makefile.am     |  4 +--
 share/media/vimeo.lua | 85 +++++++++++++++++++++++++++++----------------------
 2 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 55d3d18..2d32ba2 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -74,6 +74,7 @@ dist_media_DATA=\
   media/tvlux.lua\
   media/videa.lua\
   media/videobash.lua\
+  media/vimeo.lua\
   media/vzaar.lua\
   media/youtube.lua
 
@@ -88,8 +89,7 @@ endif
 if WITH_FIXME
 dist_media_DATA+=\
   media/break.lua\
-  media/charlierose.lua\
-  media/vimeo.lua
+  media/charlierose.lua
 if WITH_GEOBLOCKED
 endif
 if WITH_NSFW
diff --git a/share/media/vimeo.lua b/share/media/vimeo.lua
index 5f3c613..192073f 100644
--- a/share/media/vimeo.lua
+++ b/share/media/vimeo.lua
@@ -36,17 +36,17 @@ end
 function parse(qargs)
   Vimeo.normalize(qargs)
 
-  local p = quvi.http.fetch(qargs.input_url).data
-  local U = require 'quvi/util'
-
   qargs.id = qargs.input_url:match('/(%d+)$') or error('no match: media ID')
-  qargs.duration_ms =(tonumber(p:match('"duration":(%d+)')) or 0) * 1000
-  qargs.thumb_url = U.slash_unescape(p:match('"thumbnail":"(.-)"') or '')
+  local c = Vimeo.config_new(qargs)
+
+  local J = require 'json'
+  local j = J.decode(c)
 
-  local s = p:match('"title":(.-),') or ''
-  qargs.title = U.slash_unescape(s):gsub('^"',''):gsub('"$','')
+  qargs.duration_ms = tonumber(j.video.duration or 0) * 1000
+  qargs.streams = Vimeo.iter_streams(qargs, j)
 
-  qargs.streams = Vimeo.iter_streams(qargs, p)
+  qargs.thumb_url = Vimeo.thumb_new(j)
+  qargs.title = j.video.title or ''
 
   return qargs
 end
@@ -69,50 +69,63 @@ function Vimeo.can_parse_url(qargs)
   end
 end
 
-function Vimeo.iter_streams(qargs, page)
-  local p = page:match('"profiles":{(.-)},') or error('no match: profiles')
-
-  local rs = page:match('"signature":"(.-)"')
-              or error('no match: request signature')
+function Vimeo.config_new(qargs)
+  local U = require 'socket.url'
+  local t = U.parse(qargs.input_url)
+  t.host = 'player.vimeo.com'
+  t.path = table.concat({'/video/', qargs.id})
+  local p = quvi.http.fetch(U.build(t)).data
+  return p:match('b=(.-);') or error('no match: b')
+end
 
-  local rt = page:match('"timestamp":(%d+)')
-              or error('no match: request timestamp')
+function Vimeo.thumb_new(j)
+  local r = {}
+  for _,u in pairs(j.video.thumbs) do
+    table.insert(r,u)
+  end
+  return r[#r] or ''
+end
 
-  local f = "http://player.vimeo.com/play_redirect?clip_id=%s"
-              .. "&sig=%s&time=%s&quality=%s&type=moogaloop_local"
+function Vimeo.normalize(qargs)
+  qargs_input_url = qargs.input_url:gsub("player%.", "")
+  qargs.input_url = qargs.input_url:gsub("/video/", "/")
+end
 
+function Vimeo.iter_streams(qargs, j)
   local S = require 'quvi/stream'
-  local r = {}
+  local h = j.request.files.h264
 
-  for e,a in p:gmatch('"(.-)":{(.-)}') do -- For each profile.
-    for q in a:gmatch('"(.-)":%d+') do    -- For each quality in the profile.
-      local u = string.format(f, qargs.id, rs, rt, q)
-      local t = S.stream_new(u)
-      t.video.encoding = string.lower(e or '')
-      t.id = Vimeo.to_id(t, q)
-      table.insert(r, t)
-    end
+  local r = {}
+  for k,v in pairs(h) do
+    local s = S.stream_new(v.url)
+    s.container = v.url:match('%.(%w+)%?') or ''
+    s.video.bitrate_kbit_s = v.bitrate
+    s.video.height = v.height
+    s.video.width = v.width
+    s.id = Vimeo.to_id(s,k)
+    table.insert(r,s)
   end
 
   if #r >1 then
-    Vimeo.ch_best(r)
+    Vimeo.ch_best(S, r)
   end
 
   return r
 end
 
-function Vimeo.normalize(qargs)
-  qargs_input_url = qargs.input_url:gsub("player%.", "")
-  qargs.input_url = qargs.input_url:gsub("/video/", "/")
-end
-
-function Vimeo.ch_best(t)
-  t[1].flags.best = true -- Should be the 'hd'.
+function Vimeo.ch_best(S, t)
+  local r = t[1]
+  r.flags.best = true
+  for _,v in pairs(t) do
+    if v.video.height > r.video.height then
+      r = S.swap_best(r, v)
+    end
+  end
 end
 
--- Return an ID for a stream.
 function Vimeo.to_id(t, quality)
-  return string.format("%s_%s", quality, t.video.encoding)
+  return string.format("%s_%s_%dk_%dp",
+            quality, t.container, t.video.bitrate_kbit_s, t.video.height)
 end
 
 -- vim: set ts=2 sw=2 tw=72 expandtab:
-- 
2.11.4.GIT