From 226c7adaaf2d988c3a0152795c6a9eb54256aa9d Mon Sep 17 00:00:00 2001 From: zuoht Date: Tue, 16 Apr 2013 17:00:45 +0800 Subject: [PATCH 1/3] xiami album 3332 UnicodeEncodeError --- src/you_get/downloader/xiami.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/you_get/downloader/xiami.py b/src/you_get/downloader/xiami.py index 75c61b42..42f6b754 100644 --- a/src/you_get/downloader/xiami.py +++ b/src/you_get/downloader/xiami.py @@ -30,7 +30,7 @@ def location_dec(str): def xiami_download_lyric(lrc_url, file_name, output_dir): lrc = get_html(lrc_url, faker = True) if len(lrc) > 0: - with open(output_dir + "/" + file_name.replace('/', '-') + '.lrc', 'w') as x: + with open(output_dir + "/" + file_name.replace('/', '-') + '.lrc', 'w', encoding='utf-8') as x: x.write(lrc) def xiami_download_song(sid, output_dir = '.', merge = True, info_only = False): From 04670164d524eb01e8ba012900a560a71a784c10 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 16 Apr 2013 21:29:00 +0200 Subject: [PATCH 2/3] Google+: use Content-Disposition filename --- src/you_get/downloader/googleplus.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/you_get/downloader/googleplus.py b/src/you_get/downloader/googleplus.py index fb386c39..e3e0e66b 100644 --- a/src/you_get/downloader/googleplus.py +++ b/src/you_get/downloader/googleplus.py @@ -47,12 +47,17 @@ def googleplus_download(url, output_dir = '.', merge = True, info_only = False): if real_url: break real_url = unicodize(real_url) - + type, ext, size = url_info(real_url) if not ext: ext = 'mp4' + response = request.urlopen(request.Request(real_url)) + if response.headers['content-disposition']: + filename = parse.unquote(r1(r'filename="?(.+)"?', response.headers['content-disposition'])).split('.') + title = ''.join(filename[:-1]) + print_info(site_info, title, ext, size) if not info_only: download_urls([real_url], title, ext, size, output_dir, merge = merge) From 77e3f0da9bec64c2bf0f34faec735a29f1a74284 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 16 Apr 2013 21:33:32 +0200 Subject: [PATCH 3/3] remove test for Google+ --- tests/test.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/test.py b/tests/test.py index 76851123..f7544d7d 100644 --- a/tests/test.py +++ b/tests/test.py @@ -17,16 +17,6 @@ class YouGetTests(unittest.TestCase): "http://www.freesound.org/people/Corsica_S/sounds/184419/", ]) - def test_googleplus(self): - test_urls([ - "http://plus.google.com/102663035987142737445/posts/jJRu43KQFT5", - "http://plus.google.com/+%E5%B9%B3%E7%94%B0%E6%A2%A8%E5%A5%88/posts/jJRu43KQFT5", - "http://plus.google.com/+平田梨奈/posts/jJRu43KQFT5", - "http://plus.google.com/photos/102663035987142737445/albums/5844078581209509505/5844078587839097874", - "http://plus.google.com/photos/+%E5%B9%B3%E7%94%B0%E6%A2%A8%E5%A5%88/albums/5844078581209509505/5844078587839097874", - "http://plus.google.com/photos/+平田梨奈/albums/5844078581209509505/5844078587839097874", - ]) - def test_jpopsuki(self): test_urls([ "http://jpopsuki.tv/video/Dragon-Ash---Run-to-the-Sun/8ad7aec604badd0b0798cd999b63ae17",