Prepare to upload

[youtubedl] / youtube_dl / extractor / youku.py

diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py
index 0c4bc2edab616cceff7cf68f7f64d12010c6e16d..c7947d4a1165212d0bbeb1ad571d9b6a1c04590a 100644 (file)
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dl/extractor/youku.py
@@ -154,7 +154,7 @@ class YoukuIE(InfoExtractor):
         # request basic data
         basic_data_params = {
             'vid': video_id,
         # request basic data
         basic_data_params = {
             'vid': video_id,

-            'ccode': '0402' if 'tudou.com' in url else '0401',
+            'ccode': '0507',

             'client_ip': '192.168.1.1',
             'utid': cna,
             'client_ts': time.time() / 1000,
             'client_ip': '192.168.1.1',
             'utid': cna,
             'client_ts': time.time() / 1000,


@@ -240,7 +240,11 @@ class YoukuShowIE(InfoExtractor):
     }, {
         # Ongoing playlist. The initial page is the last one
         'url': 'http://list.youku.com/show/id_za7c275ecd7b411e1a19e.html',
     }, {
         # Ongoing playlist. The initial page is the last one
         'url': 'http://list.youku.com/show/id_za7c275ecd7b411e1a19e.html',

-        'only_matchine': True,
+        'only_matching': True,
+    }, {
+        #  No data-id value.
+        'url': 'http://list.youku.com/show/id_zefbfbd61237fefbfbdef.html',
+        'only_matching': True,

     }]
 
     def _extract_entries(self, playlist_data_url, show_id, note, query):
     }]
 
     def _extract_entries(self, playlist_data_url, show_id, note, query):


@@ -276,9 +280,9 @@ class YoukuShowIE(InfoExtractor):
             r'<div[^>]+id="(reload_\d+)', first_page, 'first page reload id')
         # The first reload_id has the same items as first_page
         reload_ids = re.findall('<li[^>]+data-id="([^"]+)">', first_page)
             r'<div[^>]+id="(reload_\d+)', first_page, 'first page reload id')
         # The first reload_id has the same items as first_page
         reload_ids = re.findall('<li[^>]+data-id="([^"]+)">', first_page)

+        entries.extend(initial_entries)

         for idx, reload_id in enumerate(reload_ids):
             if reload_id == first_page_reload_id:
         for idx, reload_id in enumerate(reload_ids):
             if reload_id == first_page_reload_id:

-                entries.extend(initial_entries)

                 continue
             _, new_entries = self._extract_entries(
                 'http://list.youku.com/show/episode', show_id,
                 continue
             _, new_entries = self._extract_entries(
                 'http://list.youku.com/show/episode', show_id,