Skip to content

Dailymotion fixes #1382

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
Twilight0 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −9
Open

Dailymotion fixes #1382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions script.module.resolveurl/lib/resolveurl/plugins/dailymotion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"""

import json
import re
from resolveurl import common
from resolveurl.lib import helpers
from resolveurl.resolver import ResolveUrl, ResolverError
Expand All @@ -26,14 +25,23 @@
class DailymotionResolver(ResolveUrl):
name = 'Dailymotion'
domains = ['dailymotion.com', 'dai.ly']
pattern = r'(?://|\.)(dailymotion\.com|dai\.ly)(?:/(?:video|embed|sequence|swf|player)' \
r'(?:/video|/full)?)?/(?:[a-z0-9]+\.html\?video=)?(?!playlist)([0-9a-zA-Z]+)'
pattern = (
r'(?://|\.)(dailymotion\.com|dai\.ly)(?:/(?:video|embed|sequence|swf|player)'
r'(?:/video|/full)?)?/(?:[a-z0-9]+\.html\?video=)?(?!playlist)([0-9a-zA-Z]+)'
)

def get_media_url(self, host, media_id, subs=False):

main_page_url = 'https://www.dailymotion.com/video/{}'.format(media_id)
cookies = self.net.http_GET(main_page_url).get_cookies()

web_url = self.get_url(host, media_id)
headers = {'User-Agent': common.RAND_UA,
'Origin': 'https://www.dailymotion.com',
'Referer': 'https://www.dailymotion.com/'}
headers = {
'User-Agent': common.RAND_UA,
'Origin': 'https://www.dailymotion.com',
'Referer': main_page_url,
'Cookies': cookies
}
js_result = json.loads(self.net.http_GET(web_url, headers=headers).content)

if js_result.get('error'):
Expand All @@ -48,9 +56,10 @@ def get_media_url(self, host, media_id, subs=False):
subtitles[matches[key].get('label')] = matches[key].get('urls', [])[0]

if quals:
mbtext = self.net.http_GET(quals.get('auto')[0].get('url'), headers=headers).content
sources = re.findall('NAME="(?P<label>[^"]+)".*(?:,PROGRESSIVE-URI="|\n)(?P<url>[^#]+)', mbtext)
vid_src = helpers.pick_source(helpers.sort_sources_list(sources)) + helpers.append_headers(headers)

del headers['Origin']

vid_src = quals.get('auto')[0].get('url') + helpers.append_headers(headers)
if subs:
return vid_src, subtitles
return vid_src
Expand Down