From f58ff20862103342708b40608946ccc67b524090 Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Thu, 27 Dec 2012 13:21:47 +0100
Subject: [PATCH] add support for Tumblr audios (fix #50)

---
 CHANGELOG.txt                | 9 +++++++++
 you_get/downloader/tumblr.py | 4 +++-
 you_get/version.py           | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5cdbbcc0..7445179b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+0.3dev-20121228
+---------------
+
+*Date: 2012-12-28*
+
+* Add support for:
+    - Xiami
+    - Tumblr audios
+
 0.3dev-20121221
 ---------------
 
diff --git a/you_get/downloader/tumblr.py b/you_get/downloader/tumblr.py
index 494cf48e..d3f8d374 100644
--- a/you_get/downloader/tumblr.py
+++ b/you_get/downloader/tumblr.py
@@ -10,8 +10,10 @@ def tumblr_download(url, output_dir = '.', merge = True, info_only = False):
     html = get_html(url)
     html = parse.unquote(html).replace('\/', '/')
     
-    title = r1(r'<title>(.*)</title>', html) or r1(r'<title>(.*)\n', html)
+    title = unescape_html(r1(r'<meta property="og:title" content="([^"]*)" />', html))
     real_url = r1(r'source src=\\x22([^\\]+)\\', html)
+    if not real_url:
+        real_url = r1(r'audio_file=([^&]+)&', html) + '?plead=please-dont-download-this-or-our-lawyers-wont-let-us-host-audio'
     
     type, ext, size = url_info(real_url)
     
diff --git a/you_get/version.py b/you_get/version.py
index 6dcfde8e..8ee46a7e 100644
--- a/you_get/version.py
+++ b/you_get/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-__version__ = '0.3dev-20121221'
-__date__ = '2012-12-21'
+__version__ = '0.3dev-20121228'
+__date__ = '2012-12-28'