]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[aparat] Fix extraction (Closes #4897)
authorSergey M․ <dstftw@gmail.com>
Sun, 8 Feb 2015 11:30:29 +0000 (17:30 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 8 Feb 2015 11:30:29 +0000 (17:30 +0600)
youtube_dl/extractor/aparat.py

index 15006336faacb0c7f6ab9c24263726776866dbb6..5d70758a3692a28b82deb73a0fceb571b5f8698e 100644 (file)
@@ -34,7 +34,8 @@ class AparatIE(InfoExtractor):
                      video_id + '/vt/frame')
         webpage = self._download_webpage(embed_url, video_id)
 
-        video_urls = re.findall(r'fileList\[[0-9]+\]\s*=\s*"([^"]+)"', webpage)
+        video_urls = [video_url.replace('\\/', '/') for video_url in re.findall(
+            r'(?:fileList\[[0-9]+\]\s*=|"file"\s*:)\s*"([^"]+)"', webpage)]
         for i, video_url in enumerate(video_urls):
             req = HEADRequest(video_url)
             res = self._request_webpage(
@@ -46,7 +47,7 @@ class AparatIE(InfoExtractor):
 
         title = self._search_regex(r'\s+title:\s*"([^"]+)"', webpage, 'title')
         thumbnail = self._search_regex(
-            r'\s+image:\s*"([^"]+)"', webpage, 'thumbnail', fatal=False)
+            r'image:\s*"([^"]+)"', webpage, 'thumbnail', fatal=False)
 
         return {
             'id': video_id,