Skip to content

Improve video embedding #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve video embedding #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c670ddc
Allow https in videos.
Kami Apr 8, 2013
2ad4706
Use protocol from the provided link.
Kami Apr 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions lib/markdown2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2147,8 +2147,8 @@ class StreamingVideoUrlHandler(object):
# 'height': 423
#},
'veoh': {
'regex': re.compile(r'([^(]|^)http://www\.veoh\.com/\S*(#watch%3D|watch/)(?P<param>\w+)'),
'stream_url': 'http://www.veoh.com/videodetails2.swf?permalinkId=%s',
'regex': re.compile(r'([^(]|^)(?P<protocol>https?)://www\.veoh\.com/\S*(#watch%3D|watch/)(?P<param>\w+)'),
'stream_url': '%s://www.veoh.com/videodetails2.swf?permalinkId=%s',
'width': 410,
'height': 341
},
Expand All @@ -2172,8 +2172,8 @@ class StreamingVideoUrlHandler(object):
# 'height': 322
#},
'youtube': {
'regex': re.compile(r'([^(]|^)http://www\.youtube\.com/watch\?\S*v=(?P<param>[A-Za-z0-9_&=-]+)\S*'),
'stream_url': 'http://www.youtube.com/v/%s',
'regex': re.compile(r'([^(]|^)(?P<protocol>https?)://www\.youtube\.com/watch\?\S*v=(?P<param>[A-Za-z0-9_&=-]+)\S*'),
'stream_url': '%s://www.youtube.com/v/%s',
'width': 425,
'height': 344
},
Expand All @@ -2189,12 +2189,11 @@ def get_embed_video_xml(self, url):
"""
for data in self.providers.values():
m = data['regex'].match(url)
if m:

get_params = data.get('get_params', lambda m: m.group('param'))

if m:
if '%s' in data['stream_url']:
stream_url = data['stream_url'] % get_params(m)
params = tuple([m.group('protocol'), m.group('param')])
stream_url = data['stream_url'] % params
else:
stream_url = data['stream_url']

Expand Down