diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f14c1e2a..8d57588d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,14 @@ Changelog ========= +0.3dev-20121219 +--------------- + +*Date: 2012-12-19* + +* Add support for: + - Tumblr + 0.3dev-20121217 --------------- diff --git a/README.md b/README.md index d957760d..3ceed30e 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Fork me on GitHub: * Vimeo * Dailymotion * Google+ +* Tumblr * SoundCloud * Youku (优酷) * Tudou (土豆) @@ -203,6 +204,7 @@ You-Get基于优酷下载脚本[iambus/youku-lixian](https://github.com/iambus/y * Vimeo * Dailymotion * Google+ +* Tumblr * SoundCloud * 优酷 * 土豆 diff --git a/README.txt b/README.txt index e3fd637f..272dec57 100644 --- a/README.txt +++ b/README.txt @@ -17,6 +17,7 @@ Supported Sites (As of Now) * Vimeo http://vimeo.com * Dailymotion http://dailymotion.com * Google+ http://plus.google.com +* Tumblr http://www.tumblr.com * SoundCloud http://soundcloud.com * Youku (优酷) http://www.youku.com * Tudou (土豆) http://www.tudou.com diff --git a/you_get/downloader/__init__.py b/you_get/downloader/__init__.py index 1adc856b..2218db08 100644 --- a/you_get/downloader/__init__.py +++ b/you_get/downloader/__init__.py @@ -14,6 +14,7 @@ from .sina import * from .sohu import * from .soundcloud import * from .tudou import * +from .tumblr import * from .vimeo import * from .w56 import * from .yinyuetai import * diff --git a/you_get/downloader/tumblr.py b/you_get/downloader/tumblr.py new file mode 100644 index 00000000..494cf48e --- /dev/null +++ b/you_get/downloader/tumblr.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python + +__all__ = ['tumblr_download'] + +from ..common import * + +import re + +def tumblr_download(url, output_dir = '.', merge = True, info_only = False): + html = get_html(url) + html = parse.unquote(html).replace('\/', '/') + + title = r1(r'(.*)', html) or r1(r'(.*)\n', html) + real_url = r1(r'source src=\\x22([^\\]+)\\', html) + + type, ext, size = url_info(real_url) + + print_info(site_info, title, type, size) + if not info_only: + download_urls([real_url], title, ext, size, output_dir, merge = merge) + +site_info = "Tumblr.com" +download = tumblr_download +download_playlist = playlist_not_supported('tumblr') diff --git a/you_get/main.py b/you_get/main.py index a987e0ab..0a42e2c4 100644 --- a/you_get/main.py +++ b/you_get/main.py @@ -36,6 +36,7 @@ def url_to_module(url): 'sohu': sohu, 'soundcloud': soundcloud, 'tudou': tudou, + 'tumblr': tumblr, 'vimeo': vimeo, 'yinyuetai': yinyuetai, 'youku': youku, diff --git a/you_get/version.py b/you_get/version.py index 5f3e2f34..ac5b81b9 100644 --- a/you_get/version.py +++ b/you_get/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python -__version__ = '0.3dev-20121217' -__date__ = '2012-12-17' +__version__ = '0.3dev-20121219' +__date__ = '2012-12-19'