From ddfc81007b9fa0deb4fee101c32b6a740ac6add4 Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Thu, 10 Jul 2014 22:00:36 +0800
Subject: [PATCH 1/3] add support for 5sing.kugou.com

---
 src/you_get/extractor/__init__.py |  2 +-
 src/you_get/extractor/__main__.py |  2 +-
 src/you_get/extractor/fivesing.py | 18 ------------------
 src/you_get/extractor/kugou.py    | 28 ++++++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 src/you_get/extractor/fivesing.py
 create mode 100644 src/you_get/extractor/kugou.py

diff --git a/src/you_get/extractor/__init__.py b/src/you_get/extractor/__init__.py
index f128640b..f4b6d379 100644
--- a/src/you_get/extractor/__init__.py
+++ b/src/you_get/extractor/__init__.py
@@ -12,7 +12,6 @@ from .dailymotion import *
 from .douban import *
 from .ehow import *
 from .facebook import *
-from .fivesing import *
 from .freesound import *
 from .google import *
 from .ifeng import *
@@ -21,6 +20,7 @@ from .iqiyi import *
 from .joy import *
 from .jpopsuki import *
 from .ku6 import *
+from .kugou import *
 from .letv import *
 from .magisto import *
 from .miomio import *
diff --git a/src/you_get/extractor/__main__.py b/src/you_get/extractor/__main__.py
index 6b8a6da8..1d52d3ab 100644
--- a/src/you_get/extractor/__main__.py
+++ b/src/you_get/extractor/__main__.py
@@ -18,7 +18,6 @@ def url_to_module(url):
     downloads = {
         '163': netease,
         '56': w56,
-        '5sing': fivesing,
         'acfun': acfun,
         'baidu': baidu,
         'bilibili': bilibili,
@@ -41,6 +40,7 @@ def url_to_module(url):
         'jpopsuki': jpopsuki,
         'kankanews': bilibili,
         'ku6': ku6,
+        'kugou':kugou,
         'letv': letv,
         'magisto': magisto,
         'miomio': miomio,
diff --git a/src/you_get/extractor/fivesing.py b/src/you_get/extractor/fivesing.py
deleted file mode 100644
index 2d948af5..00000000
--- a/src/you_get/extractor/fivesing.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-__all__ = ['fivesing_download']
-
-from ..common import *
-
-def fivesing_download(url, output_dir=".", merge=True, info_only=False):
-    html = get_html(url)
-    title = r1(r'var SongName   = "(.*)";', html)
-    url = r1(r'file: "(\S*)"', html)
-    songtype, ext, size = url_info(url)
-    print_info(site_info, title, songtype, size)
-    if not info_only:
-        download_urls([url], title, ext, size, output_dir)
-
-site_info = "5sing.com"
-download = fivesing_download
-download_playlist = playlist_not_supported("5sing")
diff --git a/src/you_get/extractor/kugou.py b/src/you_get/extractor/kugou.py
new file mode 100644
index 00000000..5625ed5b
--- /dev/null
+++ b/src/you_get/extractor/kugou.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+__all__ = ['kugou_download']
+
+from ..common import *
+from json import loads
+from base64 import b64decode
+
+
+def kugou_download(url, output_dir=".", merge=True, info_only=False):
+    if url.lower().find("5sing")!=-1:
+        html=get_html(url)
+        ticket=r1(r'"ticket":\s*"(.*)"',html)
+        j=loads(str(b64decode(ticket),encoding="utf-8"))
+        url=j[u'file']
+        title=j[u'songName']
+        songtype, ext, size = url_info(url)
+        print_info(site_info, title, songtype, size)
+        if not info_only:
+            download_urls([url], title, ext, size, output_dir)
+            
+    # html = get_html(url)
+    # title = r1(r'var SongName   = "(.*)";', html)
+    # url = r1(r'file: "(\S*)"', html)
+
+site_info = "kugou.com"
+download = kugou_download
+download_playlist = playlist_not_supported("kugou")

From ca5151ee58f84715850cd90b5c0a431bcc109452 Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Thu, 10 Jul 2014 22:13:49 +0800
Subject: [PATCH 2/3] add not implement error for kugou

---
 src/you_get/extractor/kugou.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/you_get/extractor/kugou.py b/src/you_get/extractor/kugou.py
index 5625ed5b..cd825955 100644
--- a/src/you_get/extractor/kugou.py
+++ b/src/you_get/extractor/kugou.py
@@ -9,6 +9,7 @@ from base64 import b64decode
 
 def kugou_download(url, output_dir=".", merge=True, info_only=False):
     if url.lower().find("5sing")!=-1:
+        #for 5sing.kugou.com
         html=get_html(url)
         ticket=r1(r'"ticket":\s*"(.*)"',html)
         j=loads(str(b64decode(ticket),encoding="utf-8"))
@@ -18,10 +19,9 @@ def kugou_download(url, output_dir=".", merge=True, info_only=False):
         print_info(site_info, title, songtype, size)
         if not info_only:
             download_urls([url], title, ext, size, output_dir)
-            
-    # html = get_html(url)
-    # title = r1(r'var SongName   = "(.*)";', html)
-    # url = r1(r'file: "(\S*)"', html)
+    else:
+        #for the www.kugou.com/
+        raise NotImplementedError(url)       
 
 site_info = "kugou.com"
 download = kugou_download

From 1d5cb7fae5f28ece3a3068d5a8e6fb087d0a3a4c Mon Sep 17 00:00:00 2001
From: jackyzy823 <jackyzy823@gmail.com>
Date: Thu, 10 Jul 2014 22:28:26 +0800
Subject: [PATCH 3/3] fix small bug

---
 src/you_get/extractor/kugou.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/you_get/extractor/kugou.py b/src/you_get/extractor/kugou.py
index cd825955..5c5a115d 100644
--- a/src/you_get/extractor/kugou.py
+++ b/src/you_get/extractor/kugou.py
@@ -13,8 +13,8 @@ def kugou_download(url, output_dir=".", merge=True, info_only=False):
         html=get_html(url)
         ticket=r1(r'"ticket":\s*"(.*)"',html)
         j=loads(str(b64decode(ticket),encoding="utf-8"))
-        url=j[u'file']
-        title=j[u'songName']
+        url=j['file']
+        title=j['songName']
         songtype, ext, size = url_info(url)
         print_info(site_info, title, songtype, size)
         if not info_only: