From 44e60c3e2193d3198899f211a8b7c9767b0b6d5e Mon Sep 17 00:00:00 2001
From: Valdemar Erk <valdemarerk@gmail.com>
Date: Sat, 10 Dec 2016 12:23:35 +0100
Subject: [PATCH 01/37] Initial support for yizhibo.com

---
 src/you_get/common.py             |  1 +
 src/you_get/extractors/yizhibo.py | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 src/you_get/extractors/yizhibo.py

diff --git a/src/you_get/common.py b/src/you_get/common.py
index 7db4fba2..fd727cf4 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -91,6 +91,7 @@ SITES = {
     'xiaojiadianvideo' : 'fc2video',
     'yinyuetai'        : 'yinyuetai',
     'miaopai'          : 'yixia',
+    'yizhibo'          : 'yizhibo',
     'youku'            : 'youku',
     'youtu'            : 'youtube',
     'youtube'          : 'youtube',
diff --git a/src/you_get/extractors/yizhibo.py b/src/you_get/extractors/yizhibo.py
new file mode 100644
index 00000000..f524a0a8
--- /dev/null
+++ b/src/you_get/extractors/yizhibo.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+__all__ = ['yizhibo_download']
+
+from ..common import *
+import json
+import time
+
+def yizhibo_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
+    video_id = url[url.rfind('/')+1:].split(".")[0]
+    json_request_url = 'http://www.yizhibo.com/live/h5api/get_basic_live_info?scid={}'.format(video_id)
+    content = get_html(json_request_url)
+    error = json.loads(content)['result']
+    if (error != 1):
+        raise ValueError("Error : {}".format(error))
+
+    data = json.loads(content)#['data']
+    title = data.get('data')['live_title']
+    if (title == ''):
+        title = data.get('data')['nickname']
+    real_url = data.get('data')['play_url']
+
+    print_info(site_info, title, 'flv', float('inf'))
+    if not info_only:
+        download_url_ffmpeg(real_url, title, 'flv', None, output_dir, merge = merge)
+
+site_info = "yizhibo.com"
+download = yizhibo_download
+download_playlist = playlist_not_supported('yizhibo')

From 0f33e471ad65c2c2dfb0a1e4480cb39d1f2430a2 Mon Sep 17 00:00:00 2001
From: Valdemar Erk <valdemarerk@gmail.com>
Date: Sat, 10 Dec 2016 12:26:06 +0100
Subject: [PATCH 02/37] minor correction

---
 src/you_get/extractors/yizhibo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/you_get/extractors/yizhibo.py b/src/you_get/extractors/yizhibo.py
index f524a0a8..0744e1f9 100644
--- a/src/you_get/extractors/yizhibo.py
+++ b/src/you_get/extractors/yizhibo.py
@@ -14,7 +14,7 @@ def yizhibo_download(url, output_dir = '.', merge = True, info_only = False, **k
     if (error != 1):
         raise ValueError("Error : {}".format(error))
 
-    data = json.loads(content)#['data']
+    data = json.loads(content)
     title = data.get('data')['live_title']
     if (title == ''):
         title = data.get('data')['nickname']

From 0f1d5beb1494ca6b64b90e3d8d5949de29b2c31b Mon Sep 17 00:00:00 2001
From: Valdemar Erk <valdemarerk@gmail.com>
Date: Sun, 11 Dec 2016 01:46:23 +0100
Subject: [PATCH 03/37] Changed the plugin to use download_urls instead of
 ffmpeg

---
 src/you_get/extractors/yizhibo.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/you_get/extractors/yizhibo.py b/src/you_get/extractors/yizhibo.py
index 0744e1f9..37fa043c 100644
--- a/src/you_get/extractors/yizhibo.py
+++ b/src/you_get/extractors/yizhibo.py
@@ -9,7 +9,7 @@ import time
 def yizhibo_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
     video_id = url[url.rfind('/')+1:].split(".")[0]
     json_request_url = 'http://www.yizhibo.com/live/h5api/get_basic_live_info?scid={}'.format(video_id)
-    content = get_html(json_request_url)
+    content = get_content(json_request_url)
     error = json.loads(content)['result']
     if (error != 1):
         raise ValueError("Error : {}".format(error))
@@ -18,11 +18,17 @@ def yizhibo_download(url, output_dir = '.', merge = True, info_only = False, **k
     title = data.get('data')['live_title']
     if (title == ''):
         title = data.get('data')['nickname']
-    real_url = data.get('data')['play_url']
-
-    print_info(site_info, title, 'flv', float('inf'))
+    m3u8_url = data.get('data')['play_url']
+    m3u8 = get_content(m3u8_url)
+    base_url = "/".join(data.get('data')['play_url'].split("/")[:7])+"/"
+    part_url = re.findall(r'([0-9]+\.ts)', m3u8)
+    real_url = []
+    for i in part_url:
+        url = base_url + i
+        real_url.append(url)
+    print_info(site_info, title, 'ts', float('inf'))
     if not info_only:
-        download_url_ffmpeg(real_url, title, 'flv', None, output_dir, merge = merge)
+        download_urls(real_url, title, 'ts', float('inf'), output_dir, merge = merge)
 
 site_info = "yizhibo.com"
 download = yizhibo_download

From e0554b2d7b7a214c988100ac32187208b22e1d26 Mon Sep 17 00:00:00 2001
From: Valdemar Erk <valdemarerk@gmail.com>
Date: Sun, 11 Dec 2016 01:49:13 +0100
Subject: [PATCH 04/37] Made player use the m3u8 file.

---
 src/you_get/extractors/yizhibo.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/you_get/extractors/yizhibo.py b/src/you_get/extractors/yizhibo.py
index 37fa043c..11ce86ad 100644
--- a/src/you_get/extractors/yizhibo.py
+++ b/src/you_get/extractors/yizhibo.py
@@ -28,6 +28,8 @@ def yizhibo_download(url, output_dir = '.', merge = True, info_only = False, **k
         real_url.append(url)
     print_info(site_info, title, 'ts', float('inf'))
     if not info_only:
+        if player:
+            launch_player(player, [m3u8_url])
         download_urls(real_url, title, 'ts', float('inf'), output_dir, merge = merge)
 
 site_info = "yizhibo.com"

From a520eb051e797b70eddfecaf5c934259c071bf3c Mon Sep 17 00:00:00 2001
From: AlanYang <knift1128@gmail.com>
Date: Thu, 19 Jan 2017 11:15:42 +0800
Subject: [PATCH 05/37] fixed mgtv.com 1.17 change api address and stream
 domain

---
 src/you_get/extractors/mgtv.py | 9 +++++----
 src/you_get/json_output.py     | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/you_get/extractors/mgtv.py b/src/you_get/extractors/mgtv.py
index 3ce62efe..1656ac3c 100644
--- a/src/you_get/extractors/mgtv.py
+++ b/src/you_get/extractors/mgtv.py
@@ -21,7 +21,7 @@ class MGTV(VideoExtractor):
     
     id_dic = {i['video_profile']:(i['id']) for i in stream_types}
     
-    api_endpoint = 'http://v.api.mgtv.com/player/video?video_id={video_id}'
+    api_endpoint = 'http://pcweb.api.mgtv.com/player/video?video_id={video_id}'
 
     @staticmethod
     def get_vid_from_url(url):
@@ -63,6 +63,7 @@ class MGTV(VideoExtractor):
         content = get_content(self.api_endpoint.format(video_id = self.vid))
         content = loads(content)
         self.title = content['data']['info']['title']
+        domain = content['data']['stream_domain'][0]
         
         #stream_avalable = [i['name'] for i in content['data']['stream']]
         stream_available = {}
@@ -73,7 +74,7 @@ class MGTV(VideoExtractor):
             if s['video_profile'] in stream_available.keys():
                 quality_id = self.id_dic[s['video_profile']]
                 url = stream_available[s['video_profile']]
-                url = re.sub( r'(\&arange\=\d+)', '', url)  #Un-Hum
+                url = domain + re.sub( r'(\&arange\=\d+)', '', url)  #Un-Hum
                 m3u8_url, m3u8_size, segment_list_this = self.get_mgtv_real_url(url)
 
                 stream_fileid_list = []
@@ -144,8 +145,8 @@ class MGTV(VideoExtractor):
             else:
                 download_urls(stream_info['src'], self.title, stream_info['container'], stream_info['size'],
                               output_dir=kwargs['output_dir'],
-                              merge=kwargs['merge'],
-                              av=stream_id in self.dash_streams)
+                              merge=kwargs.get('merge', True))
+                              # av=stream_id in self.dash_streams)
 
 site = MGTV()
 download = site.download_by_url
diff --git a/src/you_get/json_output.py b/src/you_get/json_output.py
index 86a42abc..3e1bac9f 100644
--- a/src/you_get/json_output.py
+++ b/src/you_get/json_output.py
@@ -31,6 +31,11 @@ def print_info(site_info=None, title=None, type=None, size=None):
 
 def download_urls(urls=None, title=None, ext=None, total_size=None, refer=None):
     ve = last_info
+    if not ve:
+        ve = VideoExtractor()
+        ve.name = ''
+        ve.url = urls
+        ve.title=title
     # save download info in streams
     stream = {}
     stream['container'] = ext

From 61225b1552df86dbecf1be22c6b5433cd3412f44 Mon Sep 17 00:00:00 2001
From: Chuntao Hong <chuntao.hong@gmail.com>
Date: Tue, 24 Jan 2017 12:36:57 +0800
Subject: [PATCH 06/37] fix non-ascii url

---
 src/you_get/common.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/you_get/common.py b/src/you_get/common.py
index bea6e62c..51b81cad 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -259,6 +259,7 @@ def undeflate(data):
 
 # DEPRECATED in favor of get_content()
 def get_response(url, faker = False):
+    url = parse.quote(url,':/')
     # install cookies
     if cookies:
         opener = request.build_opener(request.HTTPCookieProcessor(cookies))

From 4d0dac29681a18520dabe1fc6a6deb81fe20f49d Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Thu, 2 Feb 2017 03:59:44 -0500
Subject: [PATCH 07/37] [ffmpeg] call ffmpeg with stdin redirected to the null
 device

Prevent FFmpeg from consuming stdin and interpreting the character
stream as a stream of interactive commands, specifically:

    ?      show this help
    +      increase verbosity
    -      decrease verbosity
    c      Send command to first matching filter supporting it
    C      Send/Queue command to all matching filters
    D      cycle through available debug modes
    h      dump packets/hex press to cycle through the 3 states
    q      quit
    s      Show QP histogram

This prevents misclicking a key or key sequence (e.g., h) produces a
large amount of debugging output which may confuse the unseasoned
user. It is also useful in a batch environment where an unsuspecting
user may not realize you-get could consume stdin through FFmpeg, e.g.

    while read url; do you-get $url; done <urllist

(Related: BashFAQ/089.)

Note that interactive commands are enabled in debug mode (which also
doesn't suppress FFmpeg's default logging).

---

A note on implementation:

An alternative would be FFmpeg's -nostdin option, which explicitly
disables interaction, but adding such an option to existing code would
be even more destructive than the stdin=DEVNULL approach taken here.

---

This commit also happens to fix a dual-call bug in
ffmpeg_concat_mp4_to_mpg.
---
 src/you_get/processor/ffmpeg.py | 38 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py
index da7c076c..78cd83fa 100755
--- a/src/you_get/processor/ffmpeg.py
+++ b/src/you_get/processor/ffmpeg.py
@@ -6,9 +6,18 @@ import subprocess
 from ..util.strings import parameterize
 from ..common import print_more_compatible as print
 
+try:
+    from subprocess import DEVNULL
+except ImportError:
+    # Python 3.2 or below
+    import os
+    import atexit
+    DEVNULL = os.open(os.devnull, os.O_RDWR)
+    atexit.register(lambda fd: os.close(fd), DEVNULL)
+
 def get_usable_ffmpeg(cmd):
     try:
-        p = subprocess.Popen([cmd, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p = subprocess.Popen([cmd, '-version'], stdin=DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = p.communicate()
         vers = str(out, 'utf-8').split('\n')[0].split()
         assert (vers[0] == 'ffmpeg' and vers[2][0] > '0') or (vers[0] == 'avconv')
@@ -24,8 +33,10 @@ def get_usable_ffmpeg(cmd):
 FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None)
 if logging.getLogger().isEnabledFor(logging.DEBUG):
     LOGLEVEL = ['-loglevel', 'info']
+    STDIN = None
 else:
     LOGLEVEL = ['-loglevel', 'quiet']
+    STDIN = DEVNULL
 
 def has_ffmpeg_installed():
     return FFMPEG is not None
@@ -54,14 +65,14 @@ def ffmpeg_concat_av(files, output, ext):
         params.extend(['-c:a', 'vorbis'])
     params.extend(['-strict', 'experimental'])
     params.append(output)
-    return subprocess.call(params)
+    return subprocess.call(params, stdin=STDIN)
 
 def ffmpeg_convert_ts_to_mkv(files, output='output.mkv'):
     for file in files:
         if os.path.isfile(file):
             params = [FFMPEG] + LOGLEVEL
             params.extend(['-y', '-i', file, output])
-            subprocess.call(params)
+            subprocess.call(params, stdin=STDIN)
 
     return
 
@@ -71,7 +82,7 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'):
         concat_list = generate_concat_list(files, output)
         params = [FFMPEG] + LOGLEVEL + ['-y', '-f', 'concat', '-safe', '-1',
                                         '-i', concat_list, '-c', 'copy', output]
-        if subprocess.call(params) == 0:
+        if subprocess.call(params, stdin=STDIN) == 0:
             os.remove(output + '.txt')
             return True
         else:
@@ -81,7 +92,7 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'):
         if os.path.isfile(file):
             params = [FFMPEG] + LOGLEVEL + ['-y', '-i']
             params.extend([file, file + '.mpg'])
-            subprocess.call(params)
+            subprocess.call(params, stdin=STDIN)
 
     inputs = [open(file + '.mpg', 'rb') for file in files]
     with open(output + '.mpg', 'wb') as o:
@@ -92,9 +103,8 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'):
     params.append(output + '.mpg')
     params += ['-vcodec', 'copy', '-acodec', 'copy']
     params.append(output)
-    subprocess.call(params)
 
-    if subprocess.call(params) == 0:
+    if subprocess.call(params, stdin=STDIN) == 0:
         for file in files:
             os.remove(file + '.mpg')
         os.remove(output + '.mpg')
@@ -112,7 +122,7 @@ def ffmpeg_concat_ts_to_mkv(files, output='output.mkv'):
     params += ['-f', 'matroska', '-c', 'copy', output]
 
     try:
-        if subprocess.call(params) == 0:
+        if subprocess.call(params, stdin=STDIN) == 0:
             return True
         else:
             return False
@@ -127,7 +137,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
         params = [FFMPEG] + LOGLEVEL + ['-y', '-f', 'concat', '-safe', '-1',
                                         '-i', concat_list, '-c', 'copy',
                                         '-bsf:a', 'aac_adtstoasc', output]
-        subprocess.check_call(params)
+        subprocess.check_call(params, stdin=STDIN)
         os.remove(output + '.txt')
         return True
 
@@ -138,7 +148,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
             params += ['-map', '0', '-c', 'copy', '-f', 'mpegts', '-bsf:v', 'h264_mp4toannexb']
             params.append(file + '.ts')
 
-            subprocess.call(params)
+            subprocess.call(params, stdin=STDIN)
 
     params = [FFMPEG] + LOGLEVEL + ['-y', '-i']
     params.append('concat:')
@@ -151,7 +161,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
     else:
         params += ['-c', 'copy', '-absf', 'aac_adtstoasc', output]
 
-    if subprocess.call(params) == 0:
+    if subprocess.call(params, stdin=STDIN) == 0:
         for file in files:
             os.remove(file + '.ts')
         return True
@@ -166,7 +176,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
         params = [FFMPEG] + LOGLEVEL + ['-y', '-f', 'concat', '-safe', '-1',
                                         '-i', concat_list, '-c', 'copy',
                                         '-bsf:a', 'aac_adtstoasc', output]
-        subprocess.check_call(params)
+        subprocess.check_call(params, stdin=STDIN)
         os.remove(output + '.txt')
         return True
 
@@ -177,7 +187,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
             params += ['-c', 'copy', '-f', 'mpegts', '-bsf:v', 'h264_mp4toannexb']
             params.append(file + '.ts')
 
-            subprocess.call(params)
+            subprocess.call(params, stdin=STDIN)
 
     params = [FFMPEG] + LOGLEVEL + ['-y', '-i']
     params.append('concat:')
@@ -190,7 +200,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
     else:
         params += ['-c', 'copy', '-absf', 'aac_adtstoasc', output]
 
-    subprocess.check_call(params)
+    subprocess.check_call(params, stdin=STDIN)
     for file in files:
         os.remove(file + '.ts')
     return True

From 8799197befd1f52278a4344fc41ba94cc45c548a Mon Sep 17 00:00:00 2001
From: YK Liu <cos.lyk@gmail.com>
Date: Mon, 20 Feb 2017 15:09:38 +0800
Subject: [PATCH 08/37] Print audiolang in json output

---
 src/you_get/json_output.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/you_get/json_output.py b/src/you_get/json_output.py
index 3e1bac9f..0e610a41 100644
--- a/src/you_get/json_output.py
+++ b/src/you_get/json_output.py
@@ -11,6 +11,11 @@ def output(video_extractor, pretty_print=True):
     out['title'] = ve.title
     out['site'] = ve.name
     out['streams'] = ve.streams
+    try:
+        if ve.audiolang:
+            out['audiolang'] = ve.audiolang
+    except NameError:
+        pass
     if pretty_print:
         print(json.dumps(out, indent=4, sort_keys=True, ensure_ascii=False))
     else:

From 9b9d80b32deb6bae475d3d85f376e6d69c6c0835 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Sat, 25 Feb 2017 02:31:07 +0800
Subject: [PATCH 09/37] do not print size when the container is m3u8

---
 src/you_get/extractor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/you_get/extractor.py b/src/you_get/extractor.py
index 332440dd..af7cc824 100644
--- a/src/you_get/extractor.py
+++ b/src/you_get/extractor.py
@@ -98,7 +98,7 @@ class VideoExtractor():
         if 'quality' in stream:
             print("      quality:       %s" % stream['quality'])
 
-        if 'size' in stream:
+        if 'size' in stream and stream['container'].lower() != 'm3u8':
             print("      size:          %s MiB (%s bytes)" % (round(stream['size'] / 1048576, 1), stream['size']))
 
         if 'itag' in stream:

From 251a1bff489d2eb34bfa52b54b55dbab6069bd63 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Fri, 24 Feb 2017 22:54:59 +0800
Subject: [PATCH 10/37] ckplayer.py: fix when got data without a ckplayer->info
 and clean the code

---
 src/you_get/extractors/ckplayer.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/you_get/extractors/ckplayer.py b/src/you_get/extractors/ckplayer.py
index 09e95557..91159897 100644
--- a/src/you_get/extractors/ckplayer.py
+++ b/src/you_get/extractors/ckplayer.py
@@ -9,7 +9,6 @@ __all__ = ['ckplayer_download']
 from xml.etree import cElementTree as ET
 from copy import copy
 from ..common import *
-
 #----------------------------------------------------------------------
 def ckplayer_get_info_by_xml(ckinfo):
     """str->dict
@@ -20,20 +19,22 @@ def ckplayer_get_info_by_xml(ckinfo):
                   'links': [],
                   'size': 0,
                   'flashvars': '',}
-    if '_text' in dictify(e)['ckplayer']['info'][0]['title'][0]:  #title
-        video_dict['title'] = dictify(e)['ckplayer']['info'][0]['title'][0]['_text'].strip()
+    dictified = dictify(e)['ckplayer']
+    if 'info' in dictified:
+        if '_text' in dictified['info'][0]['title'][0]:  #title
+            video_dict['title'] = dictified['info'][0]['title'][0]['_text'].strip()
 
     #if dictify(e)['ckplayer']['info'][0]['title'][0]['_text'].strip():  #duration
         #video_dict['title'] = dictify(e)['ckplayer']['info'][0]['title'][0]['_text'].strip()
 
-    if '_text' in dictify(e)['ckplayer']['video'][0]['size'][0]:  #size exists for 1 piece
-        video_dict['size'] = sum([int(i['size'][0]['_text']) for i in dictify(e)['ckplayer']['video']])
+    if '_text' in dictified['video'][0]['size'][0]:  #size exists for 1 piece
+        video_dict['size'] = sum([int(i['size'][0]['_text']) for i in dictified['video']])
 
-    if '_text' in dictify(e)['ckplayer']['video'][0]['file'][0]:  #link exist
-        video_dict['links'] = [i['file'][0]['_text'].strip() for i in dictify(e)['ckplayer']['video']]
+    if '_text' in dictified['video'][0]['file'][0]:  #link exist
+        video_dict['links'] = [i['file'][0]['_text'].strip() for i in dictified['video']]
 
-    if '_text' in dictify(e)['ckplayer']['flashvars'][0]:
-        video_dict['flashvars'] = dictify(e)['ckplayer']['flashvars'][0]['_text'].strip()
+    if '_text' in dictified['flashvars'][0]:
+        video_dict['flashvars'] = dictified['flashvars'][0]['_text'].strip()
 
     return video_dict
 

From 925415fa2b831c6fb5856de0e3739c31c101c1a9 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Sat, 25 Feb 2017 00:31:30 +0800
Subject: [PATCH 11/37] add support for dilidili.mobi and dilidili.wang

---
 src/you_get/extractors/dilidili.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/you_get/extractors/dilidili.py b/src/you_get/extractors/dilidili.py
index 082f84e1..f7b5922d 100644
--- a/src/you_get/extractors/dilidili.py
+++ b/src/you_get/extractors/dilidili.py
@@ -21,8 +21,9 @@ headers = {
 #----------------------------------------------------------------------
 def dilidili_parser_data_to_stream_types(typ ,vid ,hd2 ,sign, tmsign, ulk):
     """->list"""
+    another_url = 'https://newplayer.jfrft.com/parse.php?xmlurl=null&type={typ}&vid={vid}&hd={hd2}&sign={sign}&tmsign={tmsign}&userlink={ulk}'.format(typ = typ, vid = vid, hd2 = hd2, sign = sign, tmsign = tmsign, ulk = ulk)
     parse_url = 'http://player.005.tv/parse.php?xmlurl=null&type={typ}&vid={vid}&hd={hd2}&sign={sign}&tmsign={tmsign}&userlink={ulk}'.format(typ = typ, vid = vid, hd2 = hd2, sign = sign, tmsign = tmsign, ulk = ulk)
-    html = get_content(parse_url, headers=headers)
+    html = get_content(another_url, headers=headers)
     
     info = re.search(r'(\{[^{]+\})(\{[^{]+\})(\{[^{]+\})(\{[^{]+\})(\{[^{]+\})', html).groups()
     info = [i.strip('{}').split('->') for i in info]
@@ -35,13 +36,22 @@ def dilidili_parser_data_to_stream_types(typ ,vid ,hd2 ,sign, tmsign, ulk):
 
 #----------------------------------------------------------------------
 def dilidili_download(url, output_dir = '.', merge = False, info_only = False, **kwargs):
-    if re.match(r'http://www.dilidili.com/watch\S+', url):
+    global headers
+    re_str = r'http://www.dilidili.com/watch\S+'
+    if re.match(r'http://www.dilidili.wang', url):
+        re_str = r'http://www.dilidili.wang/watch\S+'
+        headers['Referer'] = 'http://www.dilidili.wang/'
+    elif re.match(r'http://www.dilidili.mobi', url):
+        re_str = r'http://www.dilidili.mobi/watch\S+'
+        headers['Referer'] = 'http://www.dilidili.mobi/'
+
+    if re.match(re_str, url):
         html = get_content(url)
         title = match1(html, r'<title>(.+)丨(.+)</title>')  #title
         
         # player loaded via internal iframe
         frame_url = re.search(r'<iframe src=\"(.+?)\"', html).group(1)
-        #print(frame_url)
+        logging.debug('dilidili_download: %s' % frame_url)
         
         #https://player.005.tv:60000/?vid=a8760f03fd:a04808d307&v=yun&sign=a68f8110cacd892bc5b094c8e5348432
         html = get_content(frame_url, headers=headers, decoded=False).decode('utf-8')
@@ -53,7 +63,7 @@ def dilidili_download(url, output_dir = '.', merge = False, info_only = False, *
         sign = match1(html, r'var sign="(.+)"')
         tmsign = match1(html, r'tmsign=([A-Za-z0-9]+)')
         ulk =  match1(html, r'var ulk="(.+)"')
-        
+
         # here s the parser...
         stream_types = dilidili_parser_data_to_stream_types(typ, vid, hd2, sign, tmsign, ulk)
         
@@ -62,7 +72,9 @@ def dilidili_download(url, output_dir = '.', merge = False, info_only = False, *
         
         parse_url = 'http://player.005.tv/parse.php?xmlurl=null&type={typ}&vid={vid}&hd={hd2}&sign={sign}&tmsign={tmsign}&userlink={ulk}'.format(typ = typ, vid = vid, hd2 = best_id, sign = sign, tmsign = tmsign, ulk = ulk)
         
-        ckplayer_download(parse_url, output_dir, merge, info_only, is_xml = True, title = title, headers = headers)
+        another_url = 'https://newplayer.jfrft.com/parse.php?xmlurl=null&type={typ}&vid={vid}&hd={hd2}&sign={sign}&tmsign={tmsign}&userlink={ulk}'.format(typ = typ, vid = vid, hd2 = hd2, sign = sign, tmsign = tmsign, ulk = ulk)
+
+        ckplayer_download(another_url, output_dir, merge, info_only, is_xml = True, title = title, headers = headers)
 
         #type_ = ''
         #size = 0

From d361b55de83354cc631852fdfc9d968e4089b4d0 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sun, 26 Feb 2017 23:07:52 +0100
Subject: [PATCH 12/37] [nanagogo] skip more

---
 src/you_get/extractors/nanagogo.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/you_get/extractors/nanagogo.py b/src/you_get/extractors/nanagogo.py
index 9cce9e4c..1f1ed820 100644
--- a/src/you_get/extractors/nanagogo.py
+++ b/src/you_get/extractors/nanagogo.py
@@ -19,6 +19,8 @@ def nanagogo_download(url, output_dir='.', merge=True, info_only=False, **kwargs
     items = []
     if info['data']['posts']['post'] is None:
         return
+    if info['data']['posts']['post']['body'] is None:
+        return
     for i in info['data']['posts']['post']['body']:
         if 'image' in i:
             image_url = i['image']

From e4c1d0e23c1ca96e2b33a171a580ea541e227c8d Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Wed, 1 Mar 2017 02:13:58 +0800
Subject: [PATCH 13/37] add .m4a and .DS_Store to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index d22d3afe..0888e5ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@ _*
 *.xml
 /.env
 /.idea
+*.m4a
+*.DS_Store

From fa9c51dfea4caa6fc1cac44135247373831feca6 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Wed, 1 Mar 2017 03:35:47 +0800
Subject: [PATCH 14/37] add support for ximalaya.py

---
 src/you_get/common.py              |  3 +-
 src/you_get/extractors/ximalaya.py | 91 ++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 src/you_get/extractors/ximalaya.py

diff --git a/src/you_get/common.py b/src/you_get/common.py
index 2edbc426..c4a71bac 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -86,6 +86,7 @@ SITES = {
     'xiami'            : 'xiami',
     'xiaokaxiu'        : 'yixia',
     'xiaojiadianvideo' : 'fc2video',
+    'ximalaya'         : 'ximalaya',
     'yinyuetai'        : 'yinyuetai',
     'miaopai'          : 'yixia',
     'youku'            : 'youku',
@@ -1050,7 +1051,7 @@ def print_info(site_info, title, type, size):
         type_info = "Advanced Systems Format (%s)" % type
     #elif type in ['video/mpeg']:
     #    type_info = "MPEG video (%s)" % type
-    elif type in ['audio/mp4']:
+    elif type in ['audio/mp4', 'audio/m4a']:
         type_info = "MPEG-4 audio (%s)" % type
     elif type in ['audio/mpeg']:
         type_info = "MP3 (%s)" % type
diff --git a/src/you_get/extractors/ximalaya.py b/src/you_get/extractors/ximalaya.py
new file mode 100644
index 00000000..275b018c
--- /dev/null
+++ b/src/you_get/extractors/ximalaya.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+
+__all__ = ['ximalaya_download_playlist', 'ximalaya_download', 'ximalaya_download_by_id']
+
+from ..common import *
+
+import json
+import re
+
+stream_types = [
+        {'itag': '1', 'container': 'm4a', 'bitrate': 'default'},
+        {'itag': '2', 'container': 'm4a', 'bitrate': '32'},
+        {'itag': '3', 'container': 'm4a', 'bitrate': '64'}
+        ]
+def ximalaya_download_by_id(id, title = None, output_dir = '.', info_only = False, stream_id = None):
+    BASE_URL = 'http://www.ximalaya.com/tracks/'
+    json_data = json.loads(get_content(BASE_URL + id + '.json'))
+    if 'res' in json_data:
+        if json_data['res'] == False:
+            raise ValueError('Server reported id %s is invalid' % id)
+    if 'is_paid' in json_data and json_data['is_paid']:
+        raise ValueError('%s is paid item' % id)
+    if (not title) and 'title' in json_data:
+        title = json_data['title']
+#no size data in the json. should it be calculated?
+    size = 0
+    url = json_data['play_path_64']
+    if stream_id:
+        if stream_id == '1':
+            url = json_data['play_path_32']
+        elif stream_id == '0':
+            url = json_data['play_path']
+    logging.debug('ximalaya_download_by_id: %s' % url)
+    ext = 'm4a' 
+    urls = [url]
+    print('Site:        %s' % site_info)
+    print('title:       %s' % title)
+    if info_only:
+        if stream_id:
+            print_stream_info(stream_id)
+        else:
+            for item in range(0, len(stream_types)):
+                print_stream_info(item)
+    if not info_only:
+        print('Type:        MPEG-4 audio m4a')
+        print('Size:        N/A')
+        download_urls(urls, title, ext, size, output_dir = output_dir, merge = False)
+
+def ximalaya_download(url, output_dir = '.', info_only = False, stream_id = None, **kwargs):
+    if re.match(r'http://www\.ximalaya\.com/(\d+)/sound/(\d+)', url):
+        id = match1(url, r'http://www\.ximalaya\.com/\d+/sound/(\d+)')
+    else:
+        raise NotImplementedError(url)
+    ximalaya_download_by_id(id, output_dir = output_dir, info_only = info_only, stream_id = stream_id)
+
+def ximalaya_download_page(playlist_url, output_dir = '.', info_only = False, stream_id = None, **kwargs):
+    if re.match(r'http://www\.ximalaya\.com/(\d+)/album/(\d+)', playlist_url):
+        page_content = get_content(playlist_url)
+        pattern = re.compile(r'<li sound_id="(\d+)"')
+        ids = pattern.findall(page_content)
+        for id in ids:
+            ximalaya_download_by_id(id, output_dir=output_dir, info_only=info_only, stream_id=stream_id)
+    else:
+        raise NotImplementedError(playlist_url)
+def ximalaya_download_playlist(url, output_dir='.', info_only=False, stream_id=None, **kwargs):
+    match_result = re.match(r'http://www\.ximalaya\.com/(\d+)/album/(\d+)', url)
+    if not match_result:
+        raise NotImplementedError(url)
+    pages = []
+    page_content = get_content(url)
+    if page_content.find('<div class="pagingBar_wrapper"') == -1:
+        pages.append(url)
+    else:
+        base_url = 'http://www.ximalaya.com/' + match_result.group(1) + '/album/' + match_result.group(2)
+        html_str = '<a href=(\'|")\/' + match_result.group(1) + '\/album\/' + match_result.group(2) + '\?page='
+        count = len(re.findall(html_str, page_content))
+        for page_num in range(count):
+            pages.append(base_url + '?page=' +str(page_num+1))
+            print(pages[-1])
+    for page in pages:
+        ximalaya_download_page(page, output_dir=output_dir, info_only=info_only, stream_id=stream_id)
+def print_stream_info(stream_id):
+    print('    - itag:        %s' % stream_id)
+    print('      container:   %s' % 'm4a')
+    print('      bitrate:     %s' % stream_types[int(stream_id)]['bitrate'])
+    print('      size:        %s' % 'N/A')
+    print('    # download-with: you-get --itag=%s [URL]' % stream_id)
+
+site_info = 'ximalaya.com'
+download = ximalaya_download
+download_playlist = ximalaya_download_playlist 

From 36bdff7c16256a36aec5964bbf14a6358b533bf1 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Wed, 1 Mar 2017 03:56:43 +0800
Subject: [PATCH 15/37] [ximalaya]ignore paid item in an album

---
 src/you_get/extractors/ximalaya.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/you_get/extractors/ximalaya.py b/src/you_get/extractors/ximalaya.py
index 275b018c..e91a1c48 100644
--- a/src/you_get/extractors/ximalaya.py
+++ b/src/you_get/extractors/ximalaya.py
@@ -12,6 +12,7 @@ stream_types = [
         {'itag': '2', 'container': 'm4a', 'bitrate': '32'},
         {'itag': '3', 'container': 'm4a', 'bitrate': '64'}
         ]
+
 def ximalaya_download_by_id(id, title = None, output_dir = '.', info_only = False, stream_id = None):
     BASE_URL = 'http://www.ximalaya.com/tracks/'
     json_data = json.loads(get_content(BASE_URL + id + '.json'))
@@ -59,9 +60,13 @@ def ximalaya_download_page(playlist_url, output_dir = '.', info_only = False, st
         pattern = re.compile(r'<li sound_id="(\d+)"')
         ids = pattern.findall(page_content)
         for id in ids:
-            ximalaya_download_by_id(id, output_dir=output_dir, info_only=info_only, stream_id=stream_id)
+            try:
+                ximalaya_download_by_id(id, output_dir=output_dir, info_only=info_only, stream_id=stream_id)
+            except(ValueError):
+                print("something wrong with %s, perhaps paid item?" % id)
     else:
         raise NotImplementedError(playlist_url)
+    
 def ximalaya_download_playlist(url, output_dir='.', info_only=False, stream_id=None, **kwargs):
     match_result = re.match(r'http://www\.ximalaya\.com/(\d+)/album/(\d+)', url)
     if not match_result:

From 63eca70f86bfd7d56c28c16ffae79fc91da558eb Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Wed, 1 Mar 2017 17:08:22 +0800
Subject: [PATCH 16/37] [ximalaya]support downloading (is_paid and is_free)
 tracks

---
 src/you_get/extractors/ximalaya.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/you_get/extractors/ximalaya.py b/src/you_get/extractors/ximalaya.py
index e91a1c48..58a158ba 100644
--- a/src/you_get/extractors/ximalaya.py
+++ b/src/you_get/extractors/ximalaya.py
@@ -20,7 +20,8 @@ def ximalaya_download_by_id(id, title = None, output_dir = '.', info_only = Fals
         if json_data['res'] == False:
             raise ValueError('Server reported id %s is invalid' % id)
     if 'is_paid' in json_data and json_data['is_paid']:
-        raise ValueError('%s is paid item' % id)
+        if 'is_free' in json_data and not json_data['is_free']:
+            raise ValueError('%s is paid item' % id)
     if (not title) and 'title' in json_data:
         title = json_data['title']
 #no size data in the json. should it be calculated?

From 96398d8f6c2ce95c19324d6ea38d89e6c15c71fb Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sun, 5 Mar 2017 23:58:00 +0100
Subject: [PATCH 17/37] [common] revert #1644 (per #1728)

---
 src/you_get/common.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/you_get/common.py b/src/you_get/common.py
index be3ee3fd..c4a71bac 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -257,7 +257,6 @@ def undeflate(data):
 # DEPRECATED in favor of get_content()
 def get_response(url, faker = False):
     logging.debug('get_response: %s' % url)
-    url = parse.quote(url, ':/')
 
     # install cookies
     if cookies:
@@ -280,7 +279,6 @@ def get_response(url, faker = False):
 # DEPRECATED in favor of get_content()
 def get_html(url, encoding = None, faker = False):
     logging.debug('get_html: %s' % url)
-    url = parse.quote(url, ':/')
 
     content = get_response(url, faker).data
     return str(content, 'utf-8', 'ignore')
@@ -288,7 +286,6 @@ def get_html(url, encoding = None, faker = False):
 # DEPRECATED in favor of get_content()
 def get_decoded_html(url, faker = False):
     logging.debug('get_decoded_html: %s' % url)
-    url = parse.quote(url, ':/')
 
     response = get_response(url, faker)
     data = response.data
@@ -300,7 +297,6 @@ def get_decoded_html(url, faker = False):
 
 def get_location(url):
     logging.debug('get_location: %s' % url)
-    url = parse.quote(url, ':/')
 
     response = request.urlopen(url)
     # urllib will follow redirections and it's too much code to tell urllib
@@ -327,7 +323,6 @@ def get_content(url, headers={}, decoded=True):
     """
 
     logging.debug('get_content: %s' % url)
-    url = parse.quote(url, ':/')
 
     req = request.Request(url, headers=headers)
     if cookies:
@@ -367,7 +362,6 @@ def post_content(url, headers={}, post_data={}, decoded=True):
     """
 
     logging.debug('post_content: %s \n post_data: %s' % (url, post_data))
-    url = parse.quote(url, ':/')
 
     req = request.Request(url, headers=headers)
     if cookies:

From cedab9419dbf9a69eb1989fcda458e73a1195c93 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Wed, 8 Mar 2017 20:47:03 -0500
Subject: [PATCH 18/37] youku: warn about segments skipped due to paywall

This is especially helpful in cases where the entire video is blocked by
paywall, resulting in an unhelpful error message "you-get: [Failed]
Cannot extract video source."
---
 src/you_get/extractors/youku.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/you_get/extractors/youku.py b/src/you_get/extractors/youku.py
index 65fcbc27..ff23e706 100644
--- a/src/you_get/extractors/youku.py
+++ b/src/you_get/extractors/youku.py
@@ -295,9 +295,14 @@ class Youku(VideoExtractor):
                 for piece in pieces:
                     segs = piece['segs']
                     streamfileid = piece['fileid']
-                    for no in range(0, len(segs)):
+                    seg_count = len(segs)
+                    for no in range(0, seg_count):
                         k = segs[no]['key']
-                        if k == -1: break # we hit the paywall; stop here
+                        if k == -1:
+                            # we hit the paywall; stop here
+                            log.w('Skipping %d out of %d segments due to paywall' %
+                                  (seg_count - no, seg_count))
+                            break
                         fileid, ep = self.__class__.generate_ep(self, no, streamfileid,
                                                                 sid, token)
                         q = parse.urlencode(dict(

From 4255cc8b86fad2c062992716d2cdaf17d4923f15 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Wed, 8 Mar 2017 20:59:21 -0500
Subject: [PATCH 19/37] log: mark xterm* terminals as ANSI escape
 sequences-compatible

xterm-color, xterm-16color, xterm-88color and xterm-256color are now
covered.
---
 src/you_get/util/log.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/you_get/util/log.py

diff --git a/src/you_get/util/log.py b/src/you_get/util/log.py
old mode 100644
new mode 100755
index 5c8504f5..b858789c
--- a/src/you_get/util/log.py
+++ b/src/you_get/util/log.py
@@ -5,13 +5,13 @@ from ..version import script_name
 
 import os, sys
 
-IS_ANSI_TERMINAL = os.getenv('TERM') in (
+TERM = os.getenv('TERM', '')
+IS_ANSI_TERMINAL = TERM in (
     'eterm-color',
     'linux',
     'screen',
     'vt100',
-    'xterm',
-)
+) or TERM.startswith('xterm')
 
 # ANSI escape code
 # See <http://en.wikipedia.org/wiki/ANSI_escape_code>

From ee93e12675565550deef8e5d517cbeb75fe95d55 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Thu, 9 Mar 2017 20:47:35 +0800
Subject: [PATCH 20/37] [ku6] add baidu.ku6 matching pattern

---
 src/you_get/extractors/ku6.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/you_get/extractors/ku6.py b/src/you_get/extractors/ku6.py
index 7f28c75b..808619f4 100644
--- a/src/you_get/extractors/ku6.py
+++ b/src/you_get/extractors/ku6.py
@@ -36,7 +36,6 @@ def ku6_download(url, output_dir = '.', merge = True, info_only = False, **kwarg
                 r'http://v.ku6.com/show/(.*)\.\.\.html',
                 r'http://my.ku6.com/watch\?.*v=(.*)\.\..*']
         id = r1_of(patterns, url)
-
     ku6_download_by_id(id, output_dir = output_dir, merge = merge, info_only = info_only)
 
 def baidu_ku6(url):
@@ -48,6 +47,10 @@ def baidu_ku6(url):
     if isrc is not None:
         h2 = get_html(isrc)
         id = match1(h2, r'http://v.ku6.com/show/(.*)\.\.\.html')
+#fix #1746
+#some ku6 urls really ends with three dots? A bug?
+        if id is None:
+            id = match1(h2, r'http://v.ku6.com/show/(.*)\.html')
 
     return id
 

From 3d2d748e72c1480bcae28c045a8f6caa4d044a33 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Sat, 11 Mar 2017 15:35:14 +0800
Subject: [PATCH 21/37] [qq] add support for kg.qq.com

---
 src/you_get/extractors/qq.py | 43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/you_get/extractors/qq.py b/src/you_get/extractors/qq.py
index f2c3d9ec..b462bc85 100644
--- a/src/you_get/extractors/qq.py
+++ b/src/you_get/extractors/qq.py
@@ -69,9 +69,52 @@ def qq_download_by_vid(vid, title, output_dir='.', merge=True, info_only=False):
             if not info_only:
                 download_urls([url], title, ext, size, output_dir=output_dir, merge=merge)
 
+def kg_qq_download_by_shareid(shareid, output_dir='.', info_only=False, caption=False):
+    BASE_URL = 'http://cgi.kg.qq.com/fcgi-bin/kg_ugc_getdetail'
+    params_str = '?dataType=jsonp&jsonp=callback&jsonpCallback=jsopgetsonginfo&v=4&outCharset=utf-8&shareid=' + shareid
+    url = BASE_URL + params_str
+    content = get_content(url)
+    json_str = content[len('jsonpcallback('):-1]
+    json_data = json.loads(json_str)
+
+    playurl = json_data['data']['playurl']
+    videourl = json_data['data']['playurl_video']
+    real_url = playurl if playurl else videourl
+    real_url = real_url.replace('\/', '/')
+
+    ksong_mid = json_data['data']['ksong_mid']
+    lyric_url = 'http://cgi.kg.qq.com/fcgi-bin/fcg_lyric?jsonpCallback=jsopgetlrcdata&outCharset=utf-8&ksongmid=' + ksong_mid 
+    lyric_data = get_content(lyric_url)
+    lyric_string = lyric_data[len('jsopgetlrcdata('):-1]
+    lyric_json = json.loads(lyric_string)
+    lyric = lyric_json['data']['lyric']
+
+    title = match1(lyric, r'\[ti:([^\]]*)\]')
+
+    type, ext, size = url_info(real_url)
+    if not title:
+        title = shareid
+
+    print_info('腾讯全民K歌', title, type, size)
+    if not info_only:
+        download_urls([real_url], title, ext, size, output_dir, merge=False)
+        if caption:
+            caption_filename = title + '.lrc'
+            caption_path = output_dir + '/' + caption_filename
+            with open(caption_path, 'w') as f:
+                lrc_list = lyric.split('\r\n')
+                for line in lrc_list:
+                    f.write(line)
+                    f.write('\n')
 
 def qq_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
     """"""
+    if 'kg.qq.com' in url or 'kg2.qq.com' in url:
+        shareid = url.split('?s=')[-1]
+        caption = kwargs['caption']
+        kg_qq_download_by_shareid(shareid, output_dir=output_dir, info_only=info_only, caption=caption)
+        return
+
     if 'live.qq.com' in url:
         qieDownload(url, output_dir=output_dir, merge=merge, info_only=info_only)
         return

From 89f2331a0cb4255243a7f16f3af7284092bc8acd Mon Sep 17 00:00:00 2001
From: lilydjwg <lilydjwg@gmail.com>
Date: Sat, 11 Mar 2017 21:56:30 +0800
Subject: [PATCH 22/37] [xiami] fix #1650 again

example url: http://www.xiami.com/song/xL4jJGd3829
---
 src/you_get/extractors/xiami.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/you_get/extractors/xiami.py b/src/you_get/extractors/xiami.py
index e321c42e..3b915b4f 100644
--- a/src/you_get/extractors/xiami.py
+++ b/src/you_get/extractors/xiami.py
@@ -152,7 +152,10 @@ def xiami_download(url, output_dir = '.', stream_type = None, merge = True, info
         id = r1(r'http://www.xiami.com/collect/(\d+)', url)
         xiami_download_showcollect(id, output_dir, merge, info_only)
 
-    if re.match('http://www.xiami.com/song/\d+', url):
+    if re.match(r'http://www.xiami.com/song/\d+\b', url):
+        id = r1(r'http://www.xiami.com/song/(\d+)', url)
+        xiami_download_song(id, output_dir, merge, info_only)
+    elif re.match(r'http://www.xiami.com/song/\w+', url):
         html = get_html(url, faker=True)
         id = r1(r'rel="canonical" href="http://www.xiami.com/song/([^"]+)"', html)
         xiami_download_song(id, output_dir, merge, info_only)

From 5d1293d4a4ca8f72082a93682c9a593bc496a6ed Mon Sep 17 00:00:00 2001
From: lilydjwg <lilydjwg@gmail.com>
Date: Sat, 11 Mar 2017 21:59:45 +0800
Subject: [PATCH 23/37] [xiami] title is wrong, use name instead

example url: http://www.xiami.com/song/xL4jJGd3829
---
 src/you_get/extractors/xiami.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/you_get/extractors/xiami.py b/src/you_get/extractors/xiami.py
index 3b915b4f..ff965602 100644
--- a/src/you_get/extractors/xiami.py
+++ b/src/you_get/extractors/xiami.py
@@ -49,7 +49,7 @@ def xiami_download_song(sid, output_dir = '.', merge = True, info_only = False):
     i = doc.getElementsByTagName("track")[0]
     artist = i.getElementsByTagName("artist")[0].firstChild.nodeValue
     album_name = i.getElementsByTagName("album_name")[0].firstChild.nodeValue
-    song_title = i.getElementsByTagName("title")[0].firstChild.nodeValue
+    song_title = i.getElementsByTagName("name")[0].firstChild.nodeValue
     url = location_dec(i.getElementsByTagName("location")[0].firstChild.nodeValue)
     try:
         lrc_url = i.getElementsByTagName("lyric")[0].firstChild.nodeValue

From 3adc839870e98cc0dcb54831691ef3c23f1a777d Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Sun, 12 Mar 2017 15:56:06 +0800
Subject: [PATCH 24/37] [mgtv] add url patterns

---
 src/you_get/extractors/mgtv.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/you_get/extractors/mgtv.py b/src/you_get/extractors/mgtv.py
index 1656ac3c..b0df6b28 100644
--- a/src/you_get/extractors/mgtv.py
+++ b/src/you_get/extractors/mgtv.py
@@ -27,7 +27,10 @@ class MGTV(VideoExtractor):
     def get_vid_from_url(url):
         """Extracts video ID from URL.
         """
-        return match1(url, 'http://www.mgtv.com/b/\d+/(\d+).html')
+        vid = match1(url, 'http://www.mgtv.com/b/\d+/(\d+).html')
+        if not vid:
+            vid = match1(url, 'http://www.mgtv.com/hz/bdpz/\d+/(\d+).html')
+        return vid
     
     #----------------------------------------------------------------------
     @staticmethod
@@ -150,4 +153,4 @@ class MGTV(VideoExtractor):
 
 site = MGTV()
 download = site.download_by_url
-download_playlist = site.download_playlist_by_url
\ No newline at end of file
+download_playlist = site.download_playlist_by_url

From 027d13c97eb31f2b9d31eceb376b7428671b6b23 Mon Sep 17 00:00:00 2001
From: up1m <up1m@163.com>
Date: Fri, 17 Mar 2017 02:03:55 +0800
Subject: [PATCH 25/37] make video.weibo.com downloadable

---
 src/you_get/extractors/miaopai.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/you_get/extractors/miaopai.py b/src/you_get/extractors/miaopai.py
index 48a71239..72dfdaf7 100644
--- a/src/you_get/extractors/miaopai.py
+++ b/src/you_get/extractors/miaopai.py
@@ -19,7 +19,7 @@ def miaopai_download_by_url(url, output_dir = '.', merge = False, info_only = Fa
 
         #grab download URL
         a = get_content(webpage_url, headers= fake_headers_mobile , decoded=True)
-        url = match1(a, r'<video src="(.*?)\"\W')
+        url = match1(a, r'<video id=.*?src=[\'"](.*?)[\'"]\W')
 
         #grab title
         b = get_content(webpage_url)  #normal
@@ -28,7 +28,7 @@ def miaopai_download_by_url(url, output_dir = '.', merge = False, info_only = Fa
         type_, ext, size = url_info(url)
         print_info(site_info, title, type_, size)
         if not info_only:
-            download_urls([url], title, ext, total_size=None, output_dir=output_dir, merge=merge)
+            download_urls([url], title.replace('\n',''), ext, total_size=None, output_dir=output_dir, merge=merge)
 
 #----------------------------------------------------------------------
 def miaopai_download(url, output_dir = '.', merge = False, info_only = False, **kwargs):

From 2b7a5419cbfa1596e19e0f17a6acc29a7601f1a1 Mon Sep 17 00:00:00 2001
From: YK Liu <cos.lyk@gmail.com>
Date: Sat, 18 Mar 2017 13:24:00 +0800
Subject: [PATCH 26/37] Change "NameError" to "AttributeError"

---
 src/you_get/json_output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/you_get/json_output.py b/src/you_get/json_output.py
index 0e610a41..0f0f48ec 100644
--- a/src/you_get/json_output.py
+++ b/src/you_get/json_output.py
@@ -14,7 +14,7 @@ def output(video_extractor, pretty_print=True):
     try:
         if ve.audiolang:
             out['audiolang'] = ve.audiolang
-    except NameError:
+    except AttributeError:
         pass
     if pretty_print:
         print(json.dumps(out, indent=4, sort_keys=True, ensure_ascii=False))

From 85b0abf51704b795eefa6fdf1a14bf50727a0aa8 Mon Sep 17 00:00:00 2001
From: YK Liu <cos.lyk@gmail.com>
Date: Wed, 22 Mar 2017 19:16:48 +0800
Subject: [PATCH 27/37] Fix qq video; #1778

---
 src/you_get/extractors/qq.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/you_get/extractors/qq.py b/src/you_get/extractors/qq.py
index f2c3d9ec..c92b7301 100644
--- a/src/you_get/extractors/qq.py
+++ b/src/you_get/extractors/qq.py
@@ -14,6 +14,8 @@ def qq_download_by_vid(vid, title, output_dir='.', merge=True, info_only=False):
     parts_ti = video_json['vl']['vi'][0]['ti']
     parts_prefix = video_json['vl']['vi'][0]['ul']['ui'][0]['url']
     parts_formats = video_json['fl']['fi']
+    if parts_prefix.endswith('/'):
+        parts_prefix = parts_prefix[:-1]
     # find best quality
     # only looking for fhd(1080p) and shd(720p) here.
     # 480p usually come with a single file, will be downloaded as fallback.
@@ -38,7 +40,7 @@ def qq_download_by_vid(vid, title, output_dir='.', merge=True, info_only=False):
                 # For fhd(1080p), every part is about 100M and 6 minutes
                 # try 100 parts here limited download longest single video of 10 hours.
                 for part in range(1,100):
-                    filename = vid + '.p' + str(part_format_id % 1000) + '.' + str(part) + '.mp4'
+                    filename = vid + '.p' + str(part_format_id % 10000) + '.' + str(part) + '.mp4'
                     key_api = "http://vv.video.qq.com/getkey?otype=json&platform=11&format=%s&vid=%s&filename=%s" % (part_format_id, parts_vid, filename)
                     #print(filename)
                     #print(key_api)
@@ -59,7 +61,9 @@ def qq_download_by_vid(vid, title, output_dir='.', merge=True, info_only=False):
             fvkey = video_json['vl']['vi'][0]['fvkey']
             mp4 = video_json['vl']['vi'][0]['cl'].get('ci', None)
             if mp4:
-                mp4 = mp4[0]['keyid'].replace('.10', '.p') + '.mp4'
+                old_id = mp4[0]['keyid'].split('.')[1]
+                new_id = 'p' + str(int(old_id) % 10000)
+                mp4 = mp4[0]['keyid'].replace(old_id, new_id) + '.mp4'
             else:
                 mp4 = video_json['vl']['vi'][0]['fn']
             url = '%s/%s?vkey=%s' % ( parts_prefix, mp4, fvkey )

From 24e59bae1972f45ba832c6c6923f36ab2be4e32e Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Thu, 23 Mar 2017 00:16:36 +0800
Subject: [PATCH 28/37] [vine]fix vine

---
 src/you_get/extractors/vine.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/you_get/extractors/vine.py b/src/you_get/extractors/vine.py
index 5c54c5fd..491ced73 100644
--- a/src/you_get/extractors/vine.py
+++ b/src/you_get/extractors/vine.py
@@ -3,6 +3,7 @@
 __all__ = ['vine_download']
 
 from ..common import *
+import json
 
 def vine_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
     html = get_html(url)
@@ -11,7 +12,17 @@ def vine_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
     title = r1(r'<title>([^<]*)</title>', html)
     stream = r1(r'<meta property="twitter:player:stream" content="([^"]*)">', html)
     if not stream: # https://vine.co/v/.../card
-        stream = r1(r'"videoUrl":"([^"]+)"', html).replace('\\/', '/')
+        stream = r1(r'"videoUrl":"([^"]+)"', html)
+        if stream:
+            stream = stream.replace('\\/', '/')
+        else:
+            if url[-1] == '/':
+                url = url[:-1]
+            video_id = url.split('/')[-1]
+            posts_url = 'https://archive.vine.co/posts/' + video_id + '.json'
+            json_data = json.loads(get_content(posts_url))
+            stream = json_data['videoDashUrl']
+            title = json_data['description']
 
     mime, ext, size = url_info(stream)
 

From 39bcdfc4a2e8ab05dcd46d9086e96acfe64c987b Mon Sep 17 00:00:00 2001
From: Ein Verne <einverne@gmail.com>
Date: Sat, 1 Apr 2017 14:39:41 +0800
Subject: [PATCH 29/37] Fix cntv

---
 src/you_get/extractors/cntv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/you_get/extractors/cntv.py b/src/you_get/extractors/cntv.py
index e25fa961..87f1984f 100644
--- a/src/you_get/extractors/cntv.py
+++ b/src/you_get/extractors/cntv.py
@@ -32,6 +32,8 @@ def cntv_download_by_id(id, title = None, output_dir = '.', merge = True, info_o
 def cntv_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
     if re.match(r'http://tv\.cntv\.cn/video/(\w+)/(\w+)', url):
         id = match1(url, r'http://tv\.cntv\.cn/video/\w+/(\w+)')
+    elif re.match(r'http://tv\.cctv\.com/\d+/\d+/\d+/\w+.shtml', url):
+        id = r1(r'var guid = "(\w+)"', get_html(url))
     elif re.match(r'http://\w+\.cntv\.cn/(\w+/\w+/(classpage/video/)?)?\d+/\d+\.shtml', url) or \
          re.match(r'http://\w+.cntv.cn/(\w+/)*VIDE\d+.shtml', url) or \
          re.match(r'http://(\w+).cntv.cn/(\w+)/classpage/video/(\d+)/(\d+).shtml', url) or \

From 2d6c828ad4fa9d449ca38fad2cdd4c3c12da27e9 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sat, 1 Apr 2017 22:14:13 +0200
Subject: [PATCH 30/37] util/log.py: change mode back to 644

---
 src/you_get/util/log.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 src/you_get/util/log.py

diff --git a/src/you_get/util/log.py b/src/you_get/util/log.py
old mode 100755
new mode 100644

From f0682403c022b89b98bac408878d5518ac939ff7 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Fri, 24 Mar 2017 20:42:48 +0100
Subject: [PATCH 31/37] [common] allow specifying timeout for url_save()

---
 src/you_get/common.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/you_get/common.py b/src/you_get/common.py
index 78594f17..45e277a8 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -482,7 +482,7 @@ def url_locations(urls, faker = False, headers = {}):
         locations.append(response.url)
     return locations
 
-def url_save(url, filepath, bar, refer = None, is_part = False, faker = False, headers = {}):
+def url_save(url, filepath, bar, refer = None, is_part = False, faker = False, headers = {}, timeout = None, **kwargs):
     file_size = url_size(url, faker = faker, headers = headers)
 
     if os.path.exists(filepath):
@@ -527,7 +527,10 @@ def url_save(url, filepath, bar, refer = None, is_part = False, faker = False, h
         if refer:
             headers['Referer'] = refer
 
-        response = urlopen_with_retry(request.Request(url, headers=headers))
+        if timeout:
+            response = urlopen_with_retry(request.Request(url, headers=headers), timeout=timeout)
+        else:
+            response = urlopen_with_retry(request.Request(url, headers=headers))
         try:
             range_start = int(response.headers['content-range'][6:].split('/')[0].split('-')[0])
             end_length = int(response.headers['content-range'][6:].split('/')[1])
@@ -791,7 +794,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
         url = urls[0]
         print('Downloading %s ...' % tr(output_filename))
         bar.update()
-        url_save(url, output_filepath, bar, refer = refer, faker = faker, headers = headers)
+        url_save(url, output_filepath, bar, refer = refer, faker = faker, headers = headers, **kwargs)
         bar.done()
     else:
         parts = []
@@ -803,7 +806,7 @@ def download_urls(urls, title, ext, total_size, output_dir='.', refer=None, merg
             parts.append(filepath)
             #print 'Downloading %s [%s/%s]...' % (tr(filename), i + 1, len(urls))
             bar.update_piece(i + 1)
-            url_save(url, filepath, bar, refer = refer, is_part = True, faker = faker, headers = headers)
+            url_save(url, filepath, bar, refer = refer, is_part = True, faker = faker, headers = headers, **kwargs)
         bar.done()
 
         if not merge:

From 5525694fe3fa4274515184d56675a9b3fdf81092 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Fri, 24 Mar 2017 20:44:17 +0100
Subject: [PATCH 32/37] [bilibili] workaround for speed limiting issue, fix
 #1784

---
 src/you_get/extractors/bilibili.py | 34 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py
index 47dfe045..a776f9a6 100644
--- a/src/you_get/extractors/bilibili.py
+++ b/src/you_get/extractors/bilibili.py
@@ -86,22 +86,28 @@ def bilibili_download_by_cids(cids, title, output_dir='.', merge=True, info_only
 
 
 def bilibili_download_by_cid(cid, title, output_dir='.', merge=True, info_only=False):
-    sign_this = hashlib.md5(bytes('cid={cid}&from=miniplay&player=1{SECRETKEY_MINILOADER}'.format(cid = cid, SECRETKEY_MINILOADER = SECRETKEY_MINILOADER), 'utf-8')).hexdigest()
-    url = 'http://interface.bilibili.com/playurl?&cid=' + cid + '&from=miniplay&player=1' + '&sign=' + sign_this
-    urls = [i
-            if not re.match(r'.*\.qqvideo\.tc\.qq\.com', i)
-            else re.sub(r'.*\.qqvideo\.tc\.qq\.com', 'http://vsrc.store.qq.com', i)
-            for i in parse_cid_playurl(get_content(url))]
+    while True:
+        try:
+            sign_this = hashlib.md5(bytes('cid={cid}&from=miniplay&player=1{SECRETKEY_MINILOADER}'.format(cid = cid, SECRETKEY_MINILOADER = SECRETKEY_MINILOADER), 'utf-8')).hexdigest()
+            url = 'http://interface.bilibili.com/playurl?&cid=' + cid + '&from=miniplay&player=1' + '&sign=' + sign_this
+            urls = [i
+                    if not re.match(r'.*\.qqvideo\.tc\.qq\.com', i)
+                    else re.sub(r'.*\.qqvideo\.tc\.qq\.com', 'http://vsrc.store.qq.com', i)
+                    for i in parse_cid_playurl(get_content(url))]
 
-    type_ = ''
-    size = 0
-    for url in urls:
-        _, type_, temp = url_info(url)
-        size += temp or 0
+            type_ = ''
+            size = 0
+            for url in urls:
+                _, type_, temp = url_info(url)
+                size += temp or 0
 
-    print_info(site_info, title, type_, size)
-    if not info_only:
-        download_urls(urls, title, type_, total_size=None, output_dir=output_dir, merge=merge)
+            print_info(site_info, title, type_, size)
+            if not info_only:
+                download_urls(urls, title, type_, total_size=None, output_dir=output_dir, merge=merge, timeout=1)
+        except socket.timeout:
+            continue
+        else:
+            break
 
 
 def bilibili_live_download_by_cid(cid, title, output_dir='.', merge=True, info_only=False):

From aaa96f4389281451c84ac2532dfd3a2fa2854f64 Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Wed, 5 Apr 2017 21:12:39 +0800
Subject: [PATCH 33/37] add ifeng new matching patterns

---
 src/you_get/extractors/ifeng.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/you_get/extractors/ifeng.py b/src/you_get/extractors/ifeng.py
index 6ca45b30..b1b8524a 100644
--- a/src/you_get/extractors/ifeng.py
+++ b/src/you_get/extractors/ifeng.py
@@ -25,8 +25,12 @@ def ifeng_download(url, output_dir = '.', merge = True, info_only = False, **kwa
     if id:
         return ifeng_download_by_id(id, None, output_dir = output_dir, merge = merge, info_only = info_only)
 
-    html = get_html(url)
+    html = get_content(url)
+    uuid_pattern = r'"([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})"'
     id = r1(r'var vid="([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})"', html)
+    if id is None:
+        video_pattern = r'"vid"\s*:\s*' + uuid_pattern
+        id = match1(html, video_pattern)
     assert id, "can't find video info"
     return ifeng_download_by_id(id, None, output_dir = output_dir, merge = merge, info_only = info_only)
 

From 0e87a5c06c216ba151e7a71a6bc03101f790688d Mon Sep 17 00:00:00 2001
From: MaxwellGoblin <lispmachine@outlook.com>
Date: Fri, 7 Apr 2017 11:09:28 +0800
Subject: [PATCH 34/37] common.py append ext name when -O flag existed

---
 src/you_get/common.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/you_get/common.py b/src/you_get/common.py
index 45e277a8..a811cd35 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -737,7 +737,10 @@ class DummyProgressBar:
 def get_output_filename(urls, title, ext, output_dir, merge):
     # lame hack for the --output-filename option
     global output_filename
-    if output_filename: return output_filename
+    if output_filename:
+        if ext:
+            return output_filename + '.' + ext
+        return output_filename
 
     merged_ext = ext
     if (len(urls) > 1) and merge:

From b90884cbdf35f2bfe1f0a43f36830f49655a1949 Mon Sep 17 00:00:00 2001
From: Adam Cavendish <GetbetterABC@yeah.net>
Date: Sat, 15 Apr 2017 23:47:40 +0800
Subject: [PATCH 35/37] Fix youku's problem, issue #1856

---
 src/you_get/extractors/youku.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/you_get/extractors/youku.py b/src/you_get/extractors/youku.py
index ff23e706..f36d6339 100644
--- a/src/you_get/extractors/youku.py
+++ b/src/you_get/extractors/youku.py
@@ -228,14 +228,14 @@ class Youku(VideoExtractor):
                         'video_profile': stream_types[stream_id]['video_profile'],
                         'size': stream['size'],
                         'pieces': [{
-                            'fileid': stream['stream_fileid'],
+                            'fileid': stream['segs'][0]['fileid'],
                             'segs': stream['segs']
                         }]
                     }
                 else:
                     self.streams[stream_id]['size'] += stream['size']
                     self.streams[stream_id]['pieces'].append({
-                        'fileid': stream['stream_fileid'],
+                        'fileid': stream['segs'][0]['fileid'],
                         'segs': stream['segs']
                     })
 
@@ -252,14 +252,14 @@ class Youku(VideoExtractor):
                         'video_profile': stream_types[stream_id]['video_profile'],
                         'size': stream['size'],
                         'pieces': [{
-                            'fileid': stream['stream_fileid'],
+                            'fileid': stream['segs'][0]['fileid'],
                             'segs': stream['segs']
                         }]
                     }
                 else:
                     self.streams_fallback[stream_id]['size'] += stream['size']
                     self.streams_fallback[stream_id]['pieces'].append({
-                        'fileid': stream['stream_fileid'],
+                        'fileid': stream['segs'][0]['fileid'],
                         'segs': stream['segs']
                     })
 

From 15a1a20fb9e4a92f10dcbf8494ad3555ac4d4e61 Mon Sep 17 00:00:00 2001
From: Adam Cavendish <GetbetterABC@yeah.net>
Date: Sun, 16 Apr 2017 00:12:54 +0800
Subject: [PATCH 36/37] Cleaner fix for the last commit

---
 src/you_get/extractors/youku.py | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/you_get/extractors/youku.py b/src/you_get/extractors/youku.py
index f36d6339..c3ad67eb 100644
--- a/src/you_get/extractors/youku.py
+++ b/src/you_get/extractors/youku.py
@@ -53,18 +53,14 @@ class Youku(VideoExtractor):
 
         return result
 
-    def generate_ep(self, no, streamfileids, sid, token):
-        number = hex(int(str(no), 10))[2:].upper()
-        if len(number) == 1:
-            number = '0' + number
-        fileid = streamfileids[0:8] + number + streamfileids[10:]
+    def generate_ep(self, fileid, sid, token):
         ep = parse.quote(base64.b64encode(
             ''.join(self.__class__.trans_e(
                 self.f_code_2,  #use the 86 fcode if using 86
                 sid + '_' + fileid + '_' + token)).encode('latin1')),
             safe='~()*!.\''
         )
-        return fileid, ep
+        return ep
 
     # Obsolete -- used to parse m3u8 on pl.youku.com
     def parse_m3u8(m3u8):
@@ -228,14 +224,12 @@ class Youku(VideoExtractor):
                         'video_profile': stream_types[stream_id]['video_profile'],
                         'size': stream['size'],
                         'pieces': [{
-                            'fileid': stream['segs'][0]['fileid'],
                             'segs': stream['segs']
                         }]
                     }
                 else:
                     self.streams[stream_id]['size'] += stream['size']
                     self.streams[stream_id]['pieces'].append({
-                        'fileid': stream['segs'][0]['fileid'],
                         'segs': stream['segs']
                     })
 
@@ -252,14 +246,12 @@ class Youku(VideoExtractor):
                         'video_profile': stream_types[stream_id]['video_profile'],
                         'size': stream['size'],
                         'pieces': [{
-                            'fileid': stream['segs'][0]['fileid'],
                             'segs': stream['segs']
                         }]
                     }
                 else:
                     self.streams_fallback[stream_id]['size'] += stream['size']
                     self.streams_fallback[stream_id]['pieces'].append({
-                        'fileid': stream['segs'][0]['fileid'],
                         'segs': stream['segs']
                     })
 
@@ -294,17 +286,17 @@ class Youku(VideoExtractor):
                 pieces = self.streams[stream_id]['pieces']
                 for piece in pieces:
                     segs = piece['segs']
-                    streamfileid = piece['fileid']
                     seg_count = len(segs)
                     for no in range(0, seg_count):
                         k = segs[no]['key']
+                        fileid = segs[no]['fileid']
                         if k == -1:
                             # we hit the paywall; stop here
                             log.w('Skipping %d out of %d segments due to paywall' %
                                   (seg_count - no, seg_count))
                             break
-                        fileid, ep = self.__class__.generate_ep(self, no, streamfileid,
-                                                                sid, token)
+                        ep = self.__class__.generate_ep(self, fileid,
+                                                        sid, token)
                         q = parse.urlencode(dict(
                             ctype = self.ctype,
                             ev    = 1,

From f65fe485cd141bd4d68121e1586e789109a6bc5c Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sun, 16 Apr 2017 12:25:19 +0200
Subject: [PATCH 37/37] version 0.4.715

---
 src/you_get/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/you_get/version.py b/src/you_get/version.py
index 63d908c6..fd8d7bc0 100644
--- a/src/you_get/version.py
+++ b/src/you_get/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
 script_name = 'you-get'
-__version__ = '0.4.652'
+__version__ = '0.4.715'