0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

embed requested url not just time via oembed

Browse source
This commit is contained in:
j 2013-11-07 12:01:38 +00:00
parent 124363ab8d
commit 7df2dd95c8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pandora/item/views.py
View file

@ -1102,9 +1102,13 @@ def oembed(request):
url = request.GET['url'] url = request.GET['url']
parts = urlparse(url).path.split('/') parts = urlparse(url).path.split('/')
itemId = parts[1] itemId = parts[1]
#fixme: embed should reflect actuall url
item = get_object_or_404_json(models.Item, itemId=itemId) item = get_object_or_404_json(models.Item, itemId=itemId)
embed_url = request.build_absolute_uri('/%s#embed' % item.itemId) embed_url = request.build_absolute_uri('/%s' % itemId)
if url.startswith(embed_url):
embed_url = '%s#embed' % url
else:
embed_url = '%s#embed' % embed_url
oembed = {} oembed = {}
oembed['version'] = '1.0' oembed['version'] = '1.0'
oembed['type'] = 'video' oembed['type'] = 'video'
@ -1119,7 +1123,7 @@ def oembed(request):
if width > maxwidth: if width > maxwidth:
width = maxwidth width = maxwidth
height = min(maxheight, int(width / item.stream_aspect)) height = min(maxheight, int(width / item.stream_aspect))
oembed['html'] = '<iframe width="%s" height="%s" src="%s" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' % (width, height, embed_url) oembed['html'] = '<iframe width="%s" height="%s" src="%s" frameborder="0" allowfullscreen></iframe>' % (width, height, embed_url)
oembed['width'] = width oembed['width'] = width
oembed['height'] = height oembed['height'] = height
thumbheight = 96 thumbheight = 96