From e0802b29da19d0f68c23d7843e44d7e271f582eb Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Thu, 11 Apr 2013 18:25:08 +0200 Subject: [PATCH 1/3] version 0.3.9 --- CHANGELOG.txt | 8 ++++++++ src/you_get/version.py | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b7de915c..f11e33db 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,14 @@ Changelog ========= +0.3.9 +----- + +*Date: 2013-04-12* + +* Add support for: + - Freesound + 0.3.8 ----- diff --git a/src/you_get/version.py b/src/you_get/version.py index b446d041..ea16e46b 100644 --- a/src/you_get/version.py +++ b/src/you_get/version.py @@ -2,5 +2,5 @@ __all__ = ['__version__', '__date__'] -__version__ = '0.3.8' -__date__ = '2013-04-05' +__version__ = '0.3.9' +__date__ = '2013-04-12' From a26da57c5249c42ddb362c1607678478f671b215 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Thu, 11 Apr 2013 18:30:13 +0200 Subject: [PATCH 2/3] remove test for vid48 --- tests/test.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/test.py b/tests/test.py index dc91bfb8..76851123 100644 --- a/tests/test.py +++ b/tests/test.py @@ -39,11 +39,6 @@ class YouGetTests(unittest.TestCase): "http://www.mixcloud.com/DJVadim/north-america-are-you-ready/", ]) - def test_vid48(self): - test_urls([ - "http://vid48.com/watch_video.php?v=KXUSG8169U41", - ]) - def test_vimeo(self): test_urls([ "http://vimeo.com/56810854", From e10068f6562c06df52a2de65ba6cf3531f1527c4 Mon Sep 17 00:00:00 2001 From: gongqijian Date: Sat, 13 Apr 2013 02:15:18 +0800 Subject: [PATCH 3/3] catch exception in url_info(), fix xiami download error #146 --- src/you_get/common.py | 11 +++++++---- src/you_get/downloader/xiami.py | 8 +++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/you_get/common.py b/src/you_get/common.py index 1a846b86..e963cf90 100644 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -134,10 +134,13 @@ def url_info(url, faker = False): else: type = None if headers['content-disposition']: - filename = parse.unquote(r1(r'filename="?(.+)"?', headers['content-disposition'])) - if len(filename.split('.')) > 1: - ext = filename.split('.')[-1] - else: + try: + filename = parse.unquote(r1(r'filename="?(.+)"?', headers['content-disposition'])) + if len(filename.split('.')) > 1: + ext = filename.split('.')[-1] + else: + ext = None + except: ext = None else: ext = None diff --git a/src/you_get/downloader/xiami.py b/src/you_get/downloader/xiami.py index 05e67a3c..75c61b42 100644 --- a/src/you_get/downloader/xiami.py +++ b/src/you_get/downloader/xiami.py @@ -43,6 +43,8 @@ def xiami_download_song(sid, output_dir = '.', merge = True, info_only = False): url = location_dec(i.getElementsByTagName("location")[0].firstChild.nodeValue) lrc_url = i.getElementsByTagName("lyric")[0].firstChild.nodeValue type, ext, size = url_info(url, faker = True) + if not ext: + ext = 'mp3' print_info(site_info, song_title, type, size) if not info_only: @@ -66,6 +68,8 @@ def xiami_download_showcollect(cid, output_dir = '.', merge = True, info_only = url = location_dec(i.getElementsByTagName("location")[0].firstChild.nodeValue) lrc_url = i.getElementsByTagName("lyric")[0].firstChild.nodeValue type, ext, size = url_info(url, faker = True) + if not ext: + ext = 'mp3' print_info(site_info, song_title, type, size) if not info_only: @@ -88,7 +92,9 @@ def xiami_download_album(aid, output_dir = '.', merge = True, info_only = False) url = location_dec(i.getElementsByTagName("location")[0].firstChild.nodeValue) lrc_url = i.getElementsByTagName("lyric")[0].firstChild.nodeValue type, ext, size = url_info(url, faker = True) - + if not ext: + ext = 'mp3' + print_info(site_info, song_title, type, size) if not info_only: file_name = "%02d.%s" % (track_nr, song_title)