From 4b782f92be59e92ad38c3b44fe09d2be3e20c582 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 10 Jan 2017 17:25:37 +0100 Subject: [PATCH 1/5] [nanagogo] skip erroneous posts --- 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 222659f6..9cce9e4c 100644 --- a/src/you_get/extractors/nanagogo.py +++ b/src/you_get/extractors/nanagogo.py @@ -17,6 +17,8 @@ def nanagogo_download(url, output_dir='.', merge=True, info_only=False, **kwargs info = json.loads(get_content(api_url)) items = [] + if info['data']['posts']['post'] is None: + return for i in info['data']['posts']['post']['body']: if 'image' in i: image_url = i['image'] From c401c9b9f83050873fddc2c2ac26fc5e79984e35 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 10 Jan 2017 17:31:57 +0100 Subject: [PATCH 2/5] [bilibili] fix #1605 --- src/you_get/extractors/bilibili.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py index aecb072c..920ab779 100644 --- a/src/you_get/extractors/bilibili.py +++ b/src/you_get/extractors/bilibili.py @@ -127,7 +127,7 @@ def bilibili_download(url, output_dir='.', merge=True, info_only=False, **kwargs if re.match(r'https?://bangumi\.bilibili\.com/', url): # quick hack for bangumi URLs - episode_id = r1(r'first_ep_id = "(\d+)"', html) + episode_id = r1(r'#(\d+)$', url) or r1(r'first_ep_id = "(\d+)"', html) cont = post_content('http://bangumi.bilibili.com/web_api/get_source', post_data={'episode_id': episode_id}) cid = json.loads(cont)['result']['cid'] From a7cd3e2c6e5019dbc07d4c974fe0a751095555bf Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 10 Jan 2017 17:45:09 +0100 Subject: [PATCH 3/5] [bilibili] bangumi titling with episode_id --- src/you_get/extractors/bilibili.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py index 920ab779..5f00ffe9 100644 --- a/src/you_get/extractors/bilibili.py +++ b/src/you_get/extractors/bilibili.py @@ -131,6 +131,7 @@ def bilibili_download(url, output_dir='.', merge=True, info_only=False, **kwargs cont = post_content('http://bangumi.bilibili.com/web_api/get_source', post_data={'episode_id': episode_id}) cid = json.loads(cont)['result']['cid'] + title = '%s [%s]' % (title, episode_id) bilibili_download_by_cid(str(cid), title, output_dir=output_dir, merge=merge, info_only=info_only) else: From 866876e59ffefef55353c4a6ca819681014ab763 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 10 Jan 2017 17:46:04 +0100 Subject: [PATCH 4/5] version 0.4.626 --- 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 28919906..2e8e4f41 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.595' +__version__ = '0.4.626' From 7eca091d0df30f84520f3b665754828f33be95ae Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 10 Jan 2017 18:45:28 +0100 Subject: [PATCH 5/5] tag classifier: Python 3.6 --- you-get.json | 1 + 1 file changed, 1 insertion(+) diff --git a/you-get.json b/you-get.json index 084657d9..594742c2 100644 --- a/you-get.json +++ b/you-get.json @@ -24,6 +24,7 @@ "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", "Topic :: Internet", "Topic :: Internet :: WWW/HTTP", "Topic :: Multimedia",