From 95aba7fdcb018bec45965c04d89cfa383f035b32 Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Thu, 31 Jan 2013 16:47:41 +0100
Subject: [PATCH] add support for Mixcloud, fix #91

---
 CHANGELOG.txt                  | 10 ++++++++++
 README.md                      |  2 ++
 README.txt                     |  1 +
 you_get/downloader/__init__.py |  1 +
 you_get/downloader/mixcloud.py | 28 ++++++++++++++++++++++++++++
 you_get/main.py                |  1 +
 you_get/version.py             |  4 ++--
 7 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 you_get/downloader/mixcloud.py

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c75732bd..2ff076cf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.3dev-20130201
+---------------
+
+*Date: 2013-02-01*
+
+* Add support for:
+    - Mixcloud
+    - Facebook
+    - Joy.cn
+
 0.3dev-20130125
 ---------------
 
diff --git a/README.md b/README.md
index 811be9fe..1f63d960 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Fork me on GitHub: <https://github.com/soimort/you-get>
 * Google+ <http://plus.google.com>
 * Tumblr <http://www.tumblr.com>
 * SoundCloud <http://soundcloud.com>
+* Mixcloud <http://www.mixcloud.com>
 * Youku (优酷) <http://www.youku.com>
 * Tudou (土豆) <http://www.tudou.com>
 * YinYueTai (音悦台) <http://www.yinyuetai.com>
@@ -211,6 +212,7 @@ You-Get基于优酷下载脚本[iambus/youku-lixian](https://github.com/iambus/y
 * Google+ <http://plus.google.com>
 * Tumblr <http://www.tumblr.com>
 * SoundCloud <http://soundcloud.com>
+* Mixcloud <http://www.mixcloud.com>
 * 优酷 <http://www.youku.com>
 * 土豆 <http://www.tudou.com>
 * 音悦台 <http://www.yinyuetai.com>
diff --git a/README.txt b/README.txt
index 41076856..5ad16688 100644
--- a/README.txt
+++ b/README.txt
@@ -20,6 +20,7 @@ Supported Sites (As of Now)
 * Google+ http://plus.google.com
 * Tumblr http://www.tumblr.com
 * SoundCloud http://soundcloud.com
+* Mixcloud http://www.mixcloud.com
 * Youku (优酷) http://www.youku.com
 * Tudou (土豆) http://www.tudou.com
 * YinYueTai (音悦台) http://www.yinyuetai.com
diff --git a/you_get/downloader/__init__.py b/you_get/downloader/__init__.py
index 4be6c7f5..31290d85 100644
--- a/you_get/downloader/__init__.py
+++ b/you_get/downloader/__init__.py
@@ -10,6 +10,7 @@ from .ifeng import *
 from .iqiyi import *
 from .joy import *
 from .ku6 import *
+from .mixcloud import *
 from .netease import *
 from .pptv import *
 from .qq import *
diff --git a/you_get/downloader/mixcloud.py b/you_get/downloader/mixcloud.py
new file mode 100644
index 00000000..c7a06251
--- /dev/null
+++ b/you_get/downloader/mixcloud.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+__all__ = ['mixcloud_download']
+
+from ..common import *
+
+def mixcloud_download(url, output_dir = '.', merge = True, info_only = False):
+    html = get_html(url)
+    title = r1(r'<meta property="og:title" content="([^"]*)"', html)
+    url = r1("data-preview-url=\"([^\"]+)\"", html)
+    
+    url = re.sub(r'previews', r'cloudcasts/originals', url)
+    for i in range(10, 30):
+        url = re.sub(r'stream[^.]*', r'stream' + str(i), url)
+        
+        try:
+            type, ext, size = url_info(url)
+            break
+        except:
+            continue
+    
+    print_info(site_info, title, type, size)
+    if not info_only:
+        download_urls([url], title, type, size, output_dir, merge = merge)
+
+site_info = "Mixcloud.com"
+download = mixcloud_download
+download_playlist = playlist_not_supported('mixcloud')
diff --git a/you_get/main.py b/you_get/main.py
index 4d45448e..ddb60448 100644
--- a/you_get/main.py
+++ b/you_get/main.py
@@ -32,6 +32,7 @@ def url_to_module(url):
         'joy': joy,
         'kankanews': bilibili,
         'ku6': ku6,
+        'mixcloud': mixcloud,
         'pptv': pptv,
         'qq': qq,
         'sina': sina,
diff --git a/you_get/version.py b/you_get/version.py
index 7d443436..d01633ba 100644
--- a/you_get/version.py
+++ b/you_get/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-__version__ = '0.3dev-20130125'
-__date__ = '2013-01-25'
+__version__ = '0.3dev-20130201'
+__date__ = '2013-02-01'