Merge commit '98703c7fbfcf06348220aa63f9422cdd792cfe1a'

[youtube-dl] / youtube_dl / extractor / sockshare.py

diff --git a/youtube_dl/extractor/sockshare.py b/youtube_dl/extractor/sockshare.py
index 75b634bc6b2b0595d4bc03b7640e074157b270e3..c663e56d42ed02645313637cd7866a9071d10ae7 100644 (file)
--- a/youtube_dl/extractor/sockshare.py
+++ b/youtube_dl/extractor/sockshare.py
@@ -5,6 +5,7 @@ from ..utils import (
     ExtractorError,
     compat_urllib_parse,
     compat_urllib_request,
+    determine_ext,
 )
 import re
 
@@ -60,7 +61,10 @@ class SockshareIE(InfoExtractor):
             r'<a href="([^"]*)".+class="download_file_link"',
             webpage, 'file url')
         video_url = "http://www.sockshare.com" + video_url
-        title = self._html_search_regex(r'<h1>(.+)<strong>', webpage, 'title')
+        title = self._html_search_regex((
+            r'<h1>(.+)<strong>',
+            r'var name = "([^"]+)";'),
+            webpage, 'title', default=None)
         thumbnail = self._html_search_regex(
             r'<img\s+src="([^"]*)".+?name="bg"',
             webpage, 'thumbnail')
@@ -68,6 +72,7 @@ class SockshareIE(InfoExtractor):
         formats = [{
             'format_id': 'sd',
             'url': video_url,
+            'ext': determine_ext(title),
         }]
 
         return {