Merge branch 'jackyzy823-develop' into develop

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 *

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,

src/you_get/extractor/fivesing.py

@@ -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")

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:
+        #for 5sing.kugou.com
+        html=get_html(url)
+        ticket=r1(r'"ticket":\s*"(.*)"',html)
+        j=loads(str(b64decode(ticket),encoding="utf-8"))
+        url=j['file']
+        title=j['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)
+    else:
+        #for the www.kugou.com/
+        raise NotImplementedError(url)       
+
+site_info = "kugou.com"
+download = kugou_download
+download_playlist = playlist_not_supported("kugou")