Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 12:15:40 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Vimeo module.

Browse Source 
This introduces an external dependency for lxml (http://lxml.de/). The standard
library xml.etree doesn't support invalid XML and Vimeo's source is fairly
broken. There are several third party XML parsers so I just chose my favorite.
We might have been able to get away this time by using a regexp search but that
would have introduced brittle code instead.

I've also ripped out some old safeguards that didn't make sense anymore and
put the quality auto-selection code in a separate method. As the quality setting
on Vimeo is a string (hd, sd or mobile), we can't use
svtplay_dl.utils.select_quality which just picks the highest number in a list.

Signed-off-by: Anton Eliasson <devel@antoneliasson.se>
This commit is contained in:
Anton Eliasson 2013-11-12 20:46:08 +01:00
parent 50aab78454
commit 3e8f8015bd
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/svtplay_dl/service/vimeo.py
View File

@ -4,6 +4,12 @@ from __future__ import absolute_import
import sys import sys
import json import json
try:
import lxml.html
except ImportError:
print('You need to install the lxml Python library (http://lxml.de/) to download from Vimeo.')
sys.exit(1)
from svtplay_dl.service import Service from svtplay_dl.service import Service
from svtplay_dl.utils import get_http_data from svtplay_dl.utils import get_http_data
from svtplay_dl.fetcher.http import download_http from svtplay_dl.fetcher.http import download_http
@ -14,28 +20,38 @@ class Vimeo(Service):
return "vimeo.com" in url return "vimeo.com" in url
def get(self, options, url): def get(self, options, url):
data = get_http_data(url, referer="") tree = lxml.html.parse(url)
match = data.split(' = {config:')[1].split(',assets:')[0] root = tree.getroot()
if match: player_element = root.xpath('//div[@data-config-url]')[0]
jsondata = json.loads(match) player_url = player_element.attrib['data-config-url']
sig = jsondata['request']['signature'] player_data = get_http_data(player_url)
vidid = jsondata["video"]["id"]
timestamp = jsondata['request']['timestamp']
referer = jsondata["request"]["referrer"]
avail_quality = jsondata["video"]["files"]["h264"]
selected_quality = None
for i in avail_quality:
if options.quality == i:
selected_quality = i
if options.quality and selected_quality is None: if player_data:
jsondata = json.loads(player_data)
avail_quality = jsondata["request"]["files"]["h264"]
if options.quality:
try:
selected = avail_quality[options.quality]
except KeyError:
log.error("Can't find that quality. (Try one of: %s)", log.error("Can't find that quality. (Try one of: %s)",
", ".join([str(elm) for elm in avail_quality])) ", ".join([str(elm) for elm in avail_quality]))
sys.exit(4) sys.exit(4)
elif options.quality is None and selected_quality is None: else:
selected_quality = avail_quality[0] try:
url = "http://player.vimeo.com/play_redirect?clip_id=%s&sig=%s&time=%s&quality=%s&codecs=H264,VP8,VP6&type=moogaloop_local&embed_location=%s" % (vidid, sig, timestamp, selected_quality, referer) selected = self.select_highest_quality(avail_quality)
except KeyError:
log.error("Can't find any streams.")
sys.exit(4)
url = selected['url']
download_http(options, url) download_http(options, url)
else: else:
log.error("Can't find any streams.") log.error("Can't find any streams.")
sys.exit(2) sys.exit(2)
def select_highest_quality(self, available):
if 'hd' in available:
return available['hd']
elif 'sd' in available:
return available['sd']
else:
raise KeyError()