From 560b7b5f91648e62bee5c1b90c8a38f33a09c32b Mon Sep 17 00:00:00 2001
From: yfang1644 <yfang1644@gmail.com>
Date: Mon, 23 Oct 2017 13:32:08 +0800
Subject: [PATCH] rewrite some audio plugins

---
 addons.xml                                    |  16 +-
 addons.xml.md5                                |   2 +-
 plugin.audio.kugoufm/addon.py                 | 118 +++++++++++
 plugin.audio.kugoufm/addon.xml                |   7 +-
 plugin.audio.kugoufm/changelog.txt            |  13 +-
 plugin.audio.kugoufm/default.py               | 105 ----------
 plugin.audio.kugoufm/kugou.py                 |  65 ------
 .../plugin.audio.kugoufm-1.0.1.zip            | Bin 14067 -> 12928 bytes
 plugin.audio.kuwo/addon.py                    |  84 +++++---
 plugin.audio.radiocn/addon.py                 | 191 ++++++++++++++++++
 plugin.audio.radiocn/addon.xml                |   9 +-
 plugin.audio.radiocn/changelog.txt            |   2 +-
 plugin.audio.radiocn/default.py               |  72 -------
 plugin.audio.radiocn/music.py                 |  86 --------
 ...1.0.zip => plugin.audio.radiocn-1.0.0.zip} | Bin 12582 -> 12280 bytes
 plugin.audio.ximalaya/addon.py                |  13 +-
 16 files changed, 395 insertions(+), 388 deletions(-)
 create mode 100644 plugin.audio.kugoufm/addon.py
 delete mode 100644 plugin.audio.kugoufm/default.py
 delete mode 100644 plugin.audio.kugoufm/kugou.py
 create mode 100644 plugin.audio.radiocn/addon.py
 delete mode 100644 plugin.audio.radiocn/default.py
 delete mode 100644 plugin.audio.radiocn/music.py
 rename plugin.audio.radiocn/{plugin.audio.radiocn-1.0.zip => plugin.audio.radiocn-1.0.0.zip} (71%)

diff --git a/addons.xml b/addons.xml
index 4a7ee0e..e99d066 100644
--- a/addons.xml
+++ b/addons.xml
@@ -165,9 +165,12 @@
 
 <addon id="plugin.audio.radiocn"
     name="中国广播(Radiocn)"
-    version="1.0"
-    provider-name="osfans,yfang1644">
-    <extension point="xbmc.python.pluginsource" library="default.py">
+    version="1.0.0"
+    provider-name="yfang1644">
+    <requires>
+        <import addon="script.module.xbmcswift2" version="2.4.0"/>
+    </requires>
+    <extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>audio</provides>
     </extension>
     <extension point="xbmc.addon.metadata">
@@ -229,8 +232,11 @@
 <addon id="plugin.audio.kugoufm"
 	name="酷狗电台(KugouFM)"
     version="1.0.1"
-    provider-name="keygle,osfans,yfang1644">
-	<extension point="xbmc.python.pluginsource" library="default.py">
+    provider-name="yfang1644">
+    <requires>
+        <import addon="script.module.xbmcswift2" version="2.4.0"/>
+    </requires>
+	<extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>audio</provides>
     </extension>
     <extension point="xbmc.addon.metadata">
diff --git a/addons.xml.md5 b/addons.xml.md5
index fe73a4e..13cb491 100644
--- a/addons.xml.md5
+++ b/addons.xml.md5
@@ -1 +1 @@
-b1e1535347dd8e27867d6c27a40c348e  addons.xml
+14f423fbec943540d4b2e2adb14c3cce  addons.xml
diff --git a/plugin.audio.kugoufm/addon.py b/plugin.audio.kugoufm/addon.py
new file mode 100644
index 0000000..986e8eb
--- /dev/null
+++ b/plugin.audio.kugoufm/addon.py
@@ -0,0 +1,118 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from xbmcswift2 import Plugin
+import time
+
+BANNER_PAGE = '[COLOR gold]%s[/COLOR]'
+
+plugin = Plugin()
+url_for = plugin.url_for
+
+userAgent = 'Opera/9.80 (Android 2.3.4; Linux; Opera Mobi/build-1107180945; U; en-GB) Presto/2.8.149 Version/11.10'
+HOST_URL = 'http://m.kugou.com'
+headers = {'User-Agent': userAgent, 'Referer': HOST_URL}
+
+def getHttpData(u, query):
+    import urllib2
+    import json
+    from urllib import urlencode
+
+    url = '%s/app/i/%s?%s' % (HOST_URL, u, urlencode(query))
+    req = urllib2.Request(url, headers=headers)
+    response = urllib2.urlopen(req)
+    httpdata = response.read()
+    response.close()
+    return json.loads(httpdata)
+
+def getSingerPic(title, size=200):
+    import re
+    # 根据歌手获得相应的信息
+    singerList = re.findall('(【.*?】)?(.*?)-', title)
+    if singerList:
+        query = {'singerName': singerList[0][1],
+                 'size': size,
+                 'd': time.time()*1000}
+        singerUrl = 'getSingerHead_new.php'
+        singerJson = getHttpData(singerUrl, query)
+        return singerJson.get('url', '')
+    return ''
+
+
+def getSongInfo(hashId):
+    #根据hash 获得mp3的相应信息
+    query = {'hash': hashId, 'cmd': 'playInfo'}
+    songUrl = 'getSongInfo.php'
+    songJson =  getHttpData(songUrl, query)
+    return songJson['url']
+
+
+#http://m.kugou.com/app/i/fmSongs.php?fmid=891&size=30
+def getSongs(fmid, t=None, size=30):
+    #只选取前80首歌(可以查询的歌曲相当的多！！！)  返回的是相应的json
+    listUrl = 'fmSongs.php'
+    offset = {"time": int(t if t else time.time())}
+    query = {'fmid': str(fmid), 'offset': str(offset),'size': size}
+    listJson = getHttpData(listUrl, query)
+    return listJson['data'][0]['songs']
+
+
+#http://m.kugou.com/app/i/fmList.php?pageindex=1&pagesize=30
+def getFmList(page, pagesize=30):
+    #获得酷狗Fm列表 json
+    query = {'pageindex': page, 'pagesize': pagesize}
+    url = 'fmList.php'
+    reqJson = getHttpData(url, query)
+    return reqJson
+
+
+# 获得相应电台的歌曲的列表
+@plugin.route('/getPlayList/<fmid>')
+def getPlayList(fmid):
+    plugin.set_content('music')
+    t = int(time.time())
+    songs = getSongs(fmid, t)
+    # 判断songs是否存在
+    if not songs: return []
+    items = [{
+        'label': song['name'],
+        'path': getSongInfo(song['hash']),
+        'is_playable': True,
+        'info': {'title': song['name'], 'duration': song['time']/1000}
+    } for song in songs]
+
+    return items
+
+@plugin.route('/')
+def index(page=1):
+    currpage = int(page)
+    pagesize = 30
+    lists = getFmList(page, pagesize)
+    totalPages = (lists['recordcount']-1)//pagesize + 1
+    items = []
+    for i in lists['data']:
+        items.append({
+            'label': i['fmname'],
+            'path': url_for('getPlayList', fmid=i['fmid']),
+            'thumbnail': 'http://imge.kugou.com/fmlogo/145/%s' % i['imgurl'],
+            'icon': 'http://imge.kugou.com/fmlogo/145/%s' % i['imgurl'],
+            'info': {'title': i['fmname']}
+        })
+
+    # 设置分页
+    if currpage > 1:
+        linkpage = currpage - 1
+        items.append({
+            'label': '上一页 【[COLOR FF00FF00]%s[/COLOR]/[COLOR FFFF0000]%s[/COLOR]】'%(linkpage,totalPages),
+            'path': url_for('index',page=linkpage)
+        })
+    if currpage < totalPages:
+        linkpage = currpage + 1
+        items.append({
+            'label': '下一页 【[COLOR FF00FF00]%s[/COLOR]/[COLOR FFFF0000]%s[/COLOR]】'%(linkpage,totalPages),
+            'path': url_for('index',page=linkpage)
+        })
+    return items
+
+if __name__ == '__main__':
+    plugin.run()
diff --git a/plugin.audio.kugoufm/addon.xml b/plugin.audio.kugoufm/addon.xml
index 3771cba..555c86f 100644
--- a/plugin.audio.kugoufm/addon.xml
+++ b/plugin.audio.kugoufm/addon.xml
@@ -2,8 +2,11 @@
 <addon id="plugin.audio.kugoufm"
 	name="酷狗电台(KugouFM)"
     version="1.0.1"
-    provider-name="keygle,osfans,yfang1644">
-	<extension point="xbmc.python.pluginsource" library="default.py">
+    provider-name="yfang1644">
+    <requires>
+        <import addon="script.module.xbmcswift2" version="2.4.0"/>
+    </requires>
+	<extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>audio</provides>
     </extension>
     <extension point="xbmc.addon.metadata">
diff --git a/plugin.audio.kugoufm/changelog.txt b/plugin.audio.kugoufm/changelog.txt
index bc69774..9d31ed7 100644
--- a/plugin.audio.kugoufm/changelog.txt
+++ b/plugin.audio.kugoufm/changelog.txt
@@ -1,11 +1,2 @@
-[B]1.0.1[/B] 2015/1/3 osfans
-- 修正无法获取歌手照片导致的脚本错误
-
-[B]1.0.0[/B] 2014/12 osfans
-- 歌手照片 电台图标
-- 所有电台
-- 动态歌曲列表，加速载入列表
-
-[B]0.0.1[/B] 2013/10 keygle
-- 插件实现的都是基本功能，连歌手、歌手图片也没提供;
-- 音频来源于酷狗的html5版，格式为m4a，感觉比mp3差点，连接速度还行。
+[B]1.0.1[/B] 2017.10.22
+- 基于 osfans 版本，重写函数结构
diff --git a/plugin.audio.kugoufm/default.py b/plugin.audio.kugoufm/default.py
deleted file mode 100644
index e044fc5..0000000
--- a/plugin.audio.kugoufm/default.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-import xbmc
-import xbmcplugin
-import xbmcgui
-import kugou
-import sys
-import urlparse
-import urllib
-import time
-
-
-# 显示 酷狗FM 的相应的专辑
-def index(page):
-    currpage = int(page)
-    pagesize = 30
-    lists = kugou.getFmList(page, pagesize)
-    totalPages = (lists['recordcount']-1)//pagesize + 1
-    for i in lists['data']:
-        li = xbmcgui.ListItem(i['fmname'])
-        li.setInfo(type="Music", infoLabels={"Title": i['fmname']})
-        icon = 'http://imge.kugou.com/fmlogo/145/%s' % i['imgurl']
-        li.setIconImage(icon)
-        query = {'act': 'list', 'fmid': i['fmid'], 'icon': icon}
-        url = "%s?%s" % (plugin_url, urllib.urlencode(query))
-        xbmcplugin.addDirectoryItem(handle, url, li, True)
-    # 设置分页
-    if currpage > 1:
-        linkpage = currpage - 1
-        prevLi = xbmcgui.ListItem('上一页 【[COLOR FF00FF00]%s[/COLOR]/[COLOR FFFF0000]%s[/COLOR]】'%(linkpage,totalPages))
-        u = "%s?act=index&page=%s" % (plugin_url, linkpage)
-        xbmcplugin.addDirectoryItem(handle, u, prevLi, True)
-    if currpage < totalPages:
-        linkpage = currpage + 1
-        nextLi = xbmcgui.ListItem('下一页 【[COLOR FF00FF00]%s[/COLOR]/[COLOR FFFF0000]%s[/COLOR]】'%(linkpage,totalPages))
-        u = "%s?act=index&page=%s" % (plugin_url, linkpage)
-        xbmcplugin.addDirectoryItem(handle, u, nextLi, True)
-    xbmcplugin.endOfDirectory(handle)
-
-
-# 获得相应电台的歌曲的列表
-def getPlayList(fmid, icon):
-    title = '播放当前专辑所有歌曲'
-    listitemAll = xbmcgui.ListItem(title, iconImage=icon)
-    listitemAll.setInfo(type="Music", infoLabels={"Title": title})
-    t = int(time.time())
-    query = {'act': 'playList', 'fmid': fmid, 'time': t}
-    listUrl = '%s?%s' % (plugin_url, urllib.urlencode(query))
-    xbmcplugin.addDirectoryItem(handle, listUrl, listitemAll, False)
-    songs = kugou.getSongs(fmid, t)
-    # 判断songs是否存在
-    if songs:
-        for song in songs:
-            listitem = xbmcgui.ListItem(song['name'])
-            listitem.setInfo(type="Music", infoLabels={"Title": song['name'], })
-            url = plugin_url+"?act=play&title="+song['name'].encode('utf-8')+"&hash="+urllib.quote_plus(song['hash'].encode('utf-8'))
-            xbmcplugin.addDirectoryItem(handle, url, listitem, False)
-        xbmcplugin.endOfDirectory(handle)
-
-
-#播放当前Fm列表里的歌曲
-def playList(fmid, t):
-    playlist = xbmc.PlayList(0)
-    playlist.clear()
-    for song in kugou.getSongs(fmid, t):
-        listitem = xbmcgui.ListItem(song['name'])
-        listitem.setInfo(type="Music", infoLabels={"Title": song['name']})
-        playlist.add(kugou.getSongInfo(song['hash']), listitem)
-    xbmc.Player().play(playlist)
-
-
-# 播放音乐
-def play(hashId, title):
-    playlist = xbmc.PlayList(0)
-    playlist.clear()          # 中止播放列表
-    xbmc.Player().stop()
-    mp3path = kugou.getSongInfo(hashId)
-    icon = kugou.getSingerPic(title, 100)
-    thumbnail = kugou.getSingerPic(title, 200)
-    listitem=xbmcgui.ListItem(title, iconImage=icon, thumbnailImage=thumbnail)
-    listitem.setInfo(type="Music", infoLabels={"Title": title})
-    xbmc.Player().play(mp3path, listitem)
-
-plugin_url = sys.argv[0]
-handle = int(sys.argv[1])
-params = sys.argv[2][1:]
-params = dict(urlparse.parse_qsl(params))
-
-act = params.get('act', 'index')
-fmid = params.get("fmid", '')
-
-if act == 'index':
-    page = params.get("page", 1)
-    index(page)
-elif act == 'list':
-    icon = params.get('icon', '')
-    getPlayList(fmid, icon)
-elif act == 'playList':
-    t = params.get('time', 0)
-    playList(fmid, t)
-elif act == 'play':
-    hashId = urllib.unquote_plus(params['hash'])
-    title = params.get('title', '')
-    play(hashId, title)
diff --git a/plugin.audio.kugoufm/kugou.py b/plugin.audio.kugoufm/kugou.py
deleted file mode 100644
index 130c379..0000000
--- a/plugin.audio.kugoufm/kugou.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import urllib2
-import urllib
-import re
-import json
-import time
-
-userAgent = 'Opera/9.80 (Android 2.3.4; Linux; Opera Mobi/build-1107180945; U; en-GB) Presto/2.8.149 Version/11.10'
-homepage = 'http://m.kugou.com'
-headers = {'User-Agent': userAgent, 'Referer': homepage}
-
-
-def getHttpData(u, query):
-    url = '%s/app/i/%s?%s' % (homepage, u, urllib.urlencode(query))
-    req = urllib2.Request(url, headers=headers)
-    response = urllib2.urlopen(req)
-    httpdata = response.read()
-    response.close()
-    return httpdata
-
-
-def getSingerPic(title, size=200):
-    # 根据歌手获得相应的信息
-    singerList = re.findall('(【.*?】)?(.*?)-', title)
-    if singerList:
-        query = {'singerName': singerList[0][1],
-                 'size': size,
-                 'd': time.time()*1000}
-        singerUrl = 'getSingerHead_new.php'
-        singerInfo = getHttpData(singerUrl, query)
-        return json.loads(singerInfo).get('url', '')
-    return ''
-
-
-def getSongInfo(hashId):
-    #根据hash 获得mp3的相应信息
-    query = {'hash': hashId, 'cmd': 'playInfo'}
-    songUrl = 'getSongInfo.php'
-    songStr =  getHttpData(songUrl, query)
-    songJson = json.loads(songStr)
-    return songJson['url']
-
-
-def getSongs(fmid, t=None, size=30):
-    #只选取前80首歌(可以查询的歌曲相当的多！！！)  返回的是相应的json
-    listUrl = 'fmSongs.php'
-    offset = {"time": int(t if t else time.time())}
-    query = {'fmid': str(fmid), 'offset': str(offset),'size': size}
-    listStr = getHttpData(listUrl, query)
-    listJson = json.loads(listStr)
-    return listJson['data'][0]['songs']
-
-
-def getFmList(page, pagesize=30):
-    #获得酷狗Fm列表 json
-    query = {'pageindex': page, 'pagesize': pagesize}
-    url = 'fmList.php'
-    reqStr = getHttpData(url, query)
-    reqJson = json.loads(reqStr)
-    return reqJson
-
-if __name__ == '__main__':
-    getSingerPic(" ")
diff --git a/plugin.audio.kugoufm/plugin.audio.kugoufm-1.0.1.zip b/plugin.audio.kugoufm/plugin.audio.kugoufm-1.0.1.zip
index f5712cd83ef2239c37e5a4698feb3721f22bd81f..73c6381f39273f0115f0ce85fd0709dad72b363e 100644
GIT binary patch
delta 2595
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

delta 3690
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
Y(|%^g6qLXBMS0#WNI{@@h2N`x0RauJ&Hw-a

diff --git a/plugin.audio.kuwo/addon.py b/plugin.audio.kuwo/addon.py
index f940768..a3567d5 100644
--- a/plugin.audio.kuwo/addon.py
+++ b/plugin.audio.kuwo/addon.py
@@ -2,10 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from xbmcswift2 import Plugin
-from urllib import urlencode
 import re
 from bs4 import BeautifulSoup
-from common import get_html, match1
+from common import get_html, r1
 
 # Plugin constants
 
@@ -16,6 +15,10 @@
 
 plugin = Plugin()
 
+@plugin.route('/stay')
+def stay():
+    pass
+
 @plugin.route('/musiclist/<url>')
 def musiclist(url):
     plugin.set_content('music')
@@ -26,28 +29,54 @@ def musiclist(url):
     tree = BeautifulSoup(html, 'html.parser')
     soup = tree.find_all('li', {'class': 'clearfix'})
 
+    musicList = []
+    mvList = []
     for music in soup:
         mid = music.input['mid']
-        title = music.find('p', {'class': 'm_name'})
-        title = title.text.strip()
-        albumname = music.find('p', {'class': 'a_name'})
-        albumname = albumname.text.strip()
+        song = music.find_all('p', {'class': ['m_name','a_name','video']})
+        title = song[0].a.text
+        albumname = song[1].a.text
 
         html = get_html(musicAPI + mid)
-        iconimage = match1(html, '<artist_pic240>(.*)</artist_pic240>')
-        artist = match1(html, '<artist>(.*)</artist>')
+        iconimage = r1('<artist_pic240>(.*)</artist_pic240>', html)
+        artist = r1('<artist>(.*)</artist>', html)
 
         for t in supported_stream_types:
             url = get_html(sourceAPI + '&format={}&rid=MUSIC_{}'.format(t, mid))
             if url:
+                musicList.append({
+                    'label': title +'-'+ albumname,
+                    'path': url,
+                    'thumbnail': iconimage,
+                    'is_playable': True,
+                    'info': {'title': title, 'artist': artist}
+                })
                 break
-        yield {
-            'label': title +'-'+ albumname,
-            'thumbnail': iconimage,
-            'path': url,
-            'is_playable': True,
-            'info': {'title': title, 'artist': artist}
-        }
+
+        if song[2].a is not None:
+            html = get_html(mv.a['href'])
+            mp4 = r1('var mp4url.+(http:.+?mp4)', html)
+            mvList.append({
+                'label': title +'-'+ albumname,
+                'path': mp4,
+                'is_playable': True,
+                'thumbnail': iconimage,
+                'info': {'title': title, 'artist': artist}
+            })
+
+    if len(musicList) > 0:
+        musicList.insert(0, {
+            'label': BANNER_FMT % u'音乐',
+            'path': plugin.url_for('stay')
+        })
+
+    if len(mvList) > 0:
+        mvList.insert(0, {
+            'label': BANNER_FMT % u'MV',
+            'path': plugin.url_for('stay')
+        })
+
+    return musicList + mvList
 
 @plugin.route('/albumlist/<url>')
 def albumlist(url):
@@ -75,13 +104,12 @@ def singeralbum(url, id, page):
 
     yield {
         'label': BANNER_FMT % u'专辑',
-        'path': plugin.url_for('singeralbum', url=url,id=id,page=page)
+        'path': plugin.url_for('stay')
     }
 
     html = get_html(SINGER + url.replace(' ', '%20')) # some singer name has ' '
     tree = BeautifulSoup(html, "html.parser")
 
-    print 'XXXXXXXXXXXXXXXXX', SINGER+url
     # ALBUM #######################################
     soup = tree.find_all('div', {'id': 'album'})
     li = soup[0].find_all('li')
@@ -100,12 +128,12 @@ def singeralbum(url, id, page):
     li = soup[0].find_all('li')
     yield {
         'label': BANNER_FMT % u'MV',
-        'path': plugin.url_for('singeralbum', url=url, id=id, page=page)
+        'path': plugin.url_for('stay')
     }
     for mv in li:
         name = mv.find('span', {'class': 'name'})
         html = get_html(name.a['href'])
-        mp4 = match1(html, 'var mp4url.+(http:.+?mp4)')
+        mp4 = r1('var mp4url.+(http:.+?mp4)', html)
         image = mv.find('div', {'class': 'cover'})
         image = image.img['src']
         yield {
@@ -117,13 +145,13 @@ def singeralbum(url, id, page):
         }
 
     # SONGS ###############################################
-    aurl = 'http://www.kuwo.cn/artist/contentMusicsAjax'
-    aurl += '?artistId=%s&pn=%d&rn=15' % (id, page)
-    html = get_html(aurl)
     yield {
         'label': BANNER_FMT % u'单曲',
-        'path': plugin.url_for('singeralbum', url=url, id=id, page=page)
+        'path': plugin.url_for('stay')
     }
+    aurl = 'http://www.kuwo.cn/artist/contentMusicsAjax'
+    aurl += '?artistId=%s&pn=%d&rn=15' % (id, page)
+    html = get_html(aurl)
     l = re.compile('"id":"MUSIC_(\d+)').findall(html)
     maxpage = re.compile('data-page="(\d+)"').findall(html)
     maxpage = int(maxpage[0])
@@ -141,8 +169,8 @@ def singeralbum(url, id, page):
         mid = re.compile('\d+').findall(song.a['href'])
         mid = mid[0]
         html = get_html(musicAPI + mid)
-        iconimage = match1(html, '<artist_pic240>(.*)</artist_pic240>')
-        artist = match1(html, '<artist>(.*)</artist>')
+        iconimage = r1('<artist_pic240>(.*)</artist_pic240>', html)
+        artist = r1('<artist>(.*)</artist>', html)
 
         for t in ['aac', 'wma', 'mp3']:
             url = get_html(sourceAPI + '&format={}&rid=MUSIC_{}'.format(t, mid))
@@ -212,7 +240,7 @@ def singerlist():
     for singer in soup:
         yield {
             'label': BANNER_FMT % singer.span.text,
-            'path': plugin.url_for('singerlist')
+            'path': plugin.url_for('stay')
         }
         li = singer.find_all('dd')
         for item in li:
@@ -257,7 +285,7 @@ def sortlist():
     for sdlist in soup:
         yield {
             'label': BANNER_FMT % sdlist.h1.text,
-            'path': plugin.url_for('sortlist')
+            'path': plugin.url_for('stay')
         }
         li = sdlist.find_all('li')
 
@@ -276,7 +304,7 @@ def category():
     for hotlist in soup:
         yield {
             'label': BANNER_FMT % hotlist.h1.text,
-            'path': plugin.url_for('category')
+            'path': plugin.url_for('stay')
         }
         x = hotlist.find_all('ul', {'class': 'clearfix'})
         li = x[0].find_all('li')
diff --git a/plugin.audio.radiocn/addon.py b/plugin.audio.radiocn/addon.py
new file mode 100644
index 0000000..2d3ea4b
--- /dev/null
+++ b/plugin.audio.radiocn/addon.py
@@ -0,0 +1,191 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from xbmcswift2 import Plugin
+from urllib import urlencode
+import urllib2
+from json import loads
+
+BaseHtml = 'http://www.radio.cn/pc-portal/erji'
+BaseAPI = 'http://tacc.radio.cn/pcpages'
+BANNER_FMT = '[B][COLOR gold][%s][/COLOR][/B]'
+
+UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:35.0) Gecko/20100101 Firefox/35.0"
+headers = {"Host": "www.radio.cn",
+           "User-Agent": UserAgent,
+           "Referer": "http://www.radio.cn/index.php?option=default,radio"}
+
+plugin = Plugin()
+url_for = plugin.url_for
+
+def request(url, js=True):
+    print('request', url)
+    req = urllib2.Request(url)
+    response = urllib2.urlopen(req)
+    cont = response.read()
+    response.close()
+    if js:
+        cont = loads(cont.strip("()"))
+    return cont
+
+@plugin.route('/stay')
+def stay():
+    pass
+
+@plugin.route('/station/<place_id>/<type_id>')
+def station(place_id, type_id):
+    #name, mode, icon, area, type
+    plugin.set_content('video')
+    req = {
+        'place_id': '' if place_id == '0' else place_id,
+        'type_id': '' if type_id == '0' else type_id
+    }
+    c = request(BaseAPI+'/radiopages?' + urlencode(req))
+    items = []
+
+    items.append({
+        'label': BANNER_FMT % '地区',
+        'path': plugin.url_for('stay')
+    })
+    for place in c['data']['place']:
+        items.append({
+            'label': place['name'],
+            'path': url_for('station', place_id=place['id'],type_id=type_id)
+        })
+    items.append({
+        'label': BANNER_FMT % '类型',
+        'path': url_for('stay')
+    })
+    for type in c['data']['type']:
+            items.append({
+                'label': type['name'],
+                'path': url_for('station', place_id=place_id,type_id=type['id'])
+            })
+
+    for top in c['data']['top']:
+        items.append({
+            'label': top['name'],
+            'path': top['streams'][0]['url'],
+            'thumbnail': top['icon'][0]['url'],
+            'is_playable': True,
+            'info': {'title': top['name']}
+        })
+    return items
+
+@plugin.route('/sections/<id>')
+def sections(id):
+    plugin.set_content('music')
+    req = {
+        'od_id': id,
+       # 'start': 1,
+        'rows': 2000
+    }
+    c = request(BaseAPI + '/odchannelpages?' + urlencode(req))
+    items = []
+    for item in c['data']['program']:
+        items.append({
+            'label': item['name'],
+            'path': item['streams'][0]['url'],
+            'thumbnail': item['imageUrl'][0]['url'],
+            'is_playable': True,
+            'info': {'title': item['name'],
+                     'plot': item['description'],
+                     'duration': int(item['duration'])
+                    }
+        })
+    return items
+
+@plugin.route('/classification/<cate_id>/<page>')
+def classification(cate_id, page):
+    req = {
+        'per_page': 16,
+        'page': page,
+        'cate_id': '' if cate_id == '0' else cate_id
+    }
+    c = request(BaseAPI + '/categorypages?'+urlencode(req))
+    items = []
+    for cat in c['data']['category']:
+        items.append({
+            'label': cat['name'],
+            'path': url_for('classification', cate_id=cat['id'], page='1')
+        })
+
+    for chn in c['data']['odchannel']:
+        items.append({
+            'label': chn['name'],
+            'path': url_for('sections', id=chn['id']),
+            'thumbnail': chn['imageUrl'][0]['url'],
+            'info': {'title': chn['name'],
+                     'plot': chn['description'],
+                     'artist': chn.get('source', '')}
+        })
+
+    items += [{'label': BANNER_FMT % u'分页', 'path': url_for('stay')}]
+    for i_page in range(int(c['data']['total_page'])):
+        if i_page == int(page)-1: continue
+        items.append({
+            'label': str(i_page+1),
+            'path': url_for('classification', cate_id=cate_id, page=i_page+1)
+        })
+    return items
+
+@plugin.route('/oneanchor/<id>')
+def oneanchor(id):
+    c = request(BaseAPI + '/oneanchor?' + 'anchorId=' + id)
+    items = [{
+        'label': item['name'],
+        'path': url_for('sections', id=item['id']),
+        'thumbnail': item['img'],
+    } for item in c['ondemands']]
+
+    return items
+
+@plugin.route('/podcast/<domain>')
+def podcast(domain):
+    c = request(BaseAPI + '/anchorpages?')
+    items = [{
+        'label': item['name'],
+        'path': url_for('podcast', domain=item['id'])
+    } for item in c['AnchorsLabeldomain']]
+    items.insert(0, {'label': BANNER_FMT  % u'主播分类',
+                     'path': url_for('stay')})
+
+    if domain == '0':
+        domain = c['allAnchors']['id']
+    req = {
+        'limit': 2000,
+        'offset': 1,
+        'labeldomainId': domain
+    }
+    c = request(BaseAPI + '/anchorsByDomain?' + urlencode(req))
+
+    for item in c['allAnchors']['anchors']:
+        items.append({
+            'label': item['name'],
+            'path': url_for('oneanchor', id=item['id']),
+            'thumbnail': item['img'],
+            'info': {'plot': item['description']},
+        })
+
+    return items
+
+@plugin.route('/')
+def root():
+    items = [
+        {
+            'label': '电台',
+            'path': url_for('station', place_id='0', type_id='0')
+        },
+        {
+            'label': '分类',
+            'path': url_for('classification', cate_id='0', page=1)
+        },
+        {
+            'label': '主播',
+            'path': url_for('podcast', domain = '0')
+        }
+    ]
+    return items
+
+if __name__ == '__main__':
+    plugin.run()
diff --git a/plugin.audio.radiocn/addon.xml b/plugin.audio.radiocn/addon.xml
index 5e85c81..81b04bd 100644
--- a/plugin.audio.radiocn/addon.xml
+++ b/plugin.audio.radiocn/addon.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.radiocn"
     name="中国广播(Radiocn)"
-    version="1.0"
-    provider-name="osfans,yfang1644">
-    <extension point="xbmc.python.pluginsource" library="default.py">
+    version="1.0.0"
+    provider-name="yfang1644">
+    <requires>
+        <import addon="script.module.xbmcswift2" version="2.4.0"/>
+    </requires>
+    <extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>audio</provides>
     </extension>
     <extension point="xbmc.addon.metadata">
diff --git a/plugin.audio.radiocn/changelog.txt b/plugin.audio.radiocn/changelog.txt
index ffecb85..e64992f 100644
--- a/plugin.audio.radiocn/changelog.txt
+++ b/plugin.audio.radiocn/changelog.txt
@@ -1,2 +1,2 @@
-[B]1.0[/B] (2015/01/20 osfans)
+[B]1.0.0[/B] (2017/10/20)
 - 初始版本
diff --git a/plugin.audio.radiocn/default.py b/plugin.audio.radiocn/default.py
deleted file mode 100644
index 7655e50..0000000
--- a/plugin.audio.radiocn/default.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-import music
-import xbmc
-import xbmcgui
-import xbmcplugin
-import urllib
-import urllib2
-import sys
-
-
-def addList(lists):
-    #name, mode, icon, area, type, channelId
-    n = len(lists)
-    plugin = sys.argv[0]
-    handle = int(sys.argv[1])
-    for item in lists:
-        name = item['name']
-        mode = item['mode']
-        isFolder = music.isFolder(mode)
-        li = xbmcgui.ListItem(name)
-        icon = item.get('icon', '')
-        if icon:
-            li.setIconImage(icon)
-        u = "%s?%s" % (plugin, urllib.urlencode(item))
-        xbmcplugin.addDirectoryItem(handle, u, li, isFolder, n)
-    xbmcplugin.endOfDirectory(handle)
-
-
-def play(params):
-    name = params.get("name", "")
-    icon = params.get("icon", "")
-    channelId = params.get("channelId", "")
-    if channelId:
-        li = xbmcgui.ListItem(name)
-        info = {'title': name}
-        li.setInfo(type='Video', infoLabels = info)
-        if icon:
-            li.setThumbnailImage(icon)
-        url = music.getStreamUrl(channelId)
-        xbmc.Player().play(url, li)
-
-
-def get_params():         # get part of the url, help to judge the param of the url, direcdory
-    param = {}
-    params = sys.argv[2]
-    if len(params) >= 2:
-        cleanedparams = params.rsplit('?',1)
-        if len(cleanedparams) == 2:
-            cleanedparams = cleanedparams[1]
-        else:
-            cleanedparams = params.replace('?','')
-        param = dict(urllib2.urlparse.parse_qsl(cleanedparams))
-    print(param)
-    return param
-
-
-params = get_params()
-mode = params.get("mode", music.MODE_MENU)
-
-l = []
-if mode == music.MODE_MENU:
-    l = music.getMenu()
-elif mode == music.MODE_CHANNELS:
-    area = params.get("area", "0")
-    type = params.get("type", "0")
-    l = music.getChannels(area, type)
-elif mode == music.MODE_PLAY:
-    play(params)
-if l:
-    addList(l)
diff --git a/plugin.audio.radiocn/music.py b/plugin.audio.radiocn/music.py
deleted file mode 100644
index 4d1d037..0000000
--- a/plugin.audio.radiocn/music.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import urllib2
-import urllib
-import re
-import json
-
-baseHtml = "http://bk2.radio.cn/mms4/videoPlay"
-typeHtml = baseHtml + "/getAreaAndType.jspa"
-channelHtml = baseHtml + "/pcGetChannels.jspa"
-playinfoHtml = baseHtml + "/getChannelPlayInfoJson.jspa"
-
-UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:35.0) Gecko/20100101 Firefox/35.0"
-headers = {"Host": "bk2.radio.cn",
-           "User-Agent": UserAgent,
-           "Referer": "http://www.radio.cn/index.php?option=default,radio"}
-
-MODE_NONE = "none"
-MODE_MENU = "menu"
-MODE_CHANNELS = "channels"
-MODE_PLAY = "play"
-
-
-def request(url, js=True):
-    print('request', url)
-    req = urllib2.Request(url, headers=headers)
-    response = urllib2.urlopen(req)
-    cont = response.read()
-    response.close()
-    if js:
-        cont = json.loads(cont.strip("()"))
-    return cont
-
-
-def isFolder(mode):
-    return mode in (MODE_MENU, MODE_CHANNELS)
-
-
-def getMenu():
-    #name, mode, icon, area, type
-    c = request(typeHtml)
-    d = {"area": "地区", "type": "类型"}
-    l = []
-    for i in sorted(d.keys()):
-        h = '[COLOR FFDEB887]【%s】[/COLOR]' % (d[i])
-        item = {'name': h, 'mode': MODE_NONE}
-        l.append(item)
-        for j in c[i]:
-            item = {'name': j['value'].encode('utf-8'),
-                    'mode': MODE_CHANNELS,
-                    'icon': j['url'].encode('utf-8')}
-            item[i] = j['key'].encode('utf-8')
-            l.append(item)
-    return l
-
-
-def getChannels(area=0, type=0):
-    url = channelHtml
-    query = {"area": area, "type": type, "callback": ""}
-    url = "%s?%s" % (url, urllib.urlencode(query))
-    c = request(url)
-    l = []
-    # name, mode, icon, param
-    for j in c:
-        item = {'name': j['channelName'].encode('utf-8'),
-                'mode': MODE_PLAY,
-                'icon': j['icon'].encode('utf-8'),
-                'channelId': j['channelId']}
-        l.append(item)
-    return l
-
-
-def getStreamUrl(channelId):
-    url = playinfoHtml
-    query = {"channelId": channelId,
-             "location": "http://www.radio.cn/index.php?option=default,radio",
-             "terminalType": "PC",
-             "callback": ""}
-    url = "%s?%s" % (url, urllib.urlencode(query))
-    c = request(url)
-    return c['streams'][0]['url']
-
-
-if __name__ == '__main__':
-    print(getStreamUrl(183))
diff --git a/plugin.audio.radiocn/plugin.audio.radiocn-1.0.zip b/plugin.audio.radiocn/plugin.audio.radiocn-1.0.0.zip
similarity index 71%
rename from plugin.audio.radiocn/plugin.audio.radiocn-1.0.zip
rename to plugin.audio.radiocn/plugin.audio.radiocn-1.0.0.zip
index 5f3a71500cc686432959d6a23f92b7bb4b862489..fe4f087ef976f37f80ec2df018ff736b810d9ca8 100644
GIT binary patch
delta 2891
zcmZXWc{CK<|Hp?h(PYcmVj4@fvCM+8WT}w#K^Qy9PQ;9mwXtR^kq||ekZpvKC0Ub@
zeJ4xGzKx26;X9t+Ilu4n+;cwnpL;*|p3fie^LiCJ?AtNj&;!ze0jEpF)-0Jxf<79u
zVd)RqNWOvv%C9X{rZo#fIBd=I+$mW%E&~C891s8i13*)7D9)5-<T=7w08o+I5kM`!
zfO7yEx)tiBzqe4VwaM^R_WR4`PJ23h+EMn<PWMQ|V}RDntbr&wM+8Rae8_^Cn}^46
z{1<S$b9~O#)@yWA?Dro|&ismNp7(nDG}a9!eHU>Ux*QU`_u)aO-y>cVNo&j_1@3u1
z8Ur+2VHr;sK_OuGN8kyhWirv}(-RjSUFct8a@?GU4o@VXpDF6bCyhz#jLsK4EX!;Z
zPA0SgLZN>cbwovveyUq|v?oYlRYJ%S9eh<$Vn}=DQ1>3FiF3!AYmum?@FhiZfEz=s
zy@CteTc)I7;xnUdNw%C+%sIVyppt#Dd(61LVm|zcupgWKX0ABDkH4;f_j?RO*1&c4
z<EV%5Z;1{A8i+e34<PjHk%oo}@ZovO+P4{%Y~XoWzYkB!;uIL_b(mwHj&6S7RCjk!
z>)#sM3pnoSN%HGRcIryb+xOQTKdV@z^NYw1jLmHbX`5HmOdREbG{l`KAE<&fEWDE>
zB7)~Agmbmk_@PPSmwSm=z7oBJ#MyNww3TY!R#3aQ+#o(0w9^Kc<U7fH;Q)2p;l5vb
zuxaRqhjDU+dZ#=azsby*ezeqDldk3Qr!W3oHT|0qX6xP@eBkD2p6Bu6<!)sA#?5~9
zma}?ql(a0>aBE%50|$)ltucXf)(@gf=Y2Ubgc+qUoDYz*NmHeDgqC>c25AH4?|N(1
z5$78qIx=ae`P|w_)IPkRYP)=4Owz0O+o&Z87Zq<3MXYXOn$dk@`m5jEezkfIVTAj*
z1>2uxLsMK*7f2ET_AHBiuZwDcJ)oy2VPl!s4)q4Sz8w_Il|cl>9rx%x(iZcp*6qd!
z4Dff?Eu_wvd(Cgnr_s;Y6v@T-Agm->X^Z~|H72jR^+<+C-`ZmwTP|)BP`$vACzWw_
zrO*E@0@oB<{cikbGI~~?ffPsKn7W2t`X~p7Z1WlI2zu64M$agQ47HU%$`<!zh-{N3
zVs6#b_PfTip?;?@W1s1C5G$Veyv}<?D7u}D;ezCu@MQcU_r}9Jb*2qL0>zh$KQp{U
z`Q_F+M#($vyx&sAe{Jf}gn=UKJ4}6bMnAwlRtwd@5rJRr#j4KBc3r?o**=whv=Pa>
zz8%U6X>&#HQO=wulbxDN2Ed_>nVvcl9j$x@0C43104@Tc0Gy|vtGgE><%<Y2HHT*i
zxIj}ZHH%<s4xRp)#d3=~3DcUa$3(lz-ScK!e<Tle)p33L+f#*SzdyPZ9)Wf-w3?pQ
zweqX!p4laj8@uJ+IH+Vl0D@OzuDTx^ROFuIRU?Cbc6keThQAt=sjim!`MIp|cXoO~
zo04N?x=lAh@o|=lFZr0}M_|jsB*57x2&bh3brlbYLi7n<QE@d1jJ0@*6Bw*UJ+GW-
z?A73|sy<>;9^_^;Dq?S0SC6DfFX9s!70()XDhj|u`SV$s&S&doFe+~!9W_d5w*-vS
zvrvE_(Oj*LbViS(o$45lI-w@J4pApf69DW=;19y&>i6Ss%V4F;7apqy9;~dwGj~wj
zkG%@MB^QBkDi<6(1Cx#M%K4Ra0qf|K2hjpMsvCPrhu514Tq+KD|L}=TrP^)59Un4H
zqkDdT@d?Lo=3ol!==Wf#$jVc@fHmiy3=_5+$r1IXW5De0F+fd;wTB-Rdt5VeKtDwT
z;3V{opo@HUK^)!2CS?}TfdnsU!>t_+X&4LevaqF?63?KOf<YdH9+AP=aEJbfOok7Q
z;7_6lC=uALJy0Q&smm30@zX51{*zm9PN*(jLP3HQ?LBPa^Z`?B%M1OG-z3@OW&;SU
zh!hbnVd%CIQP{d~vn&wf5Be}vUV4v`L?{{oPqH`ivR78EHGHty9ndeh6*uiOUGDFt
z=^{9$-T7x?%a;6?F;{T0P<mbYr5vxBkRBm@-d6F6StB;Kmj)K(<a<I$NT@lF5v#nG
zZxYC&Js2J5Mt{BKIkUsO3H|wrs_=}0-b{EZWKr5Qm(WGqjmIpRU#G)0vBUTu5==vU
zXn1HZ25}Fv8sAXBid*%ARSs=Ts-??GsI$Y9(iv~rXF9WqO1+)I+?(mW*F>jW42HDv
zPO|>p%LttuC~a-k%cK{BtS?Fi4mjJ!n;RRBzank$R|I^R-vpuGO}Jo{JP{=;yL;zZ
z+xWhQX-9Nkf+#2>65OM;FcqXB0z;|n0=_7*5@u>^)B$+dm4Ah_#=48|{OJG8T-)Ar
z@R*M#=&<wox?Qt3!@z@2uSe5q^EF26JY)5H;RVys>@2lc;x#;ckShOPe$TuwAj35I
z))d>j=fu}#N@)geiNzUP<kR=G7<lC@Dkt<gw1J<;uXvCpvswy~U6$I{2<m>b&R3Ne
z$xC285lrF2szbe}XY(+x*NXj!IgR1_eBI$H=~_1veSNWR<E4t*YRagrS3|e<lDdgW
z{F~+_#^j&u8Zqy0dWV{a%SEWb_V2QF%6@66{mzlA(G$fLBBD+5uoU}z(141a0k^Nb
zVc6SMyEbR<SLR>05ctWNhQQ>u);==wmre0`r#2i1DF;^Og0NX|Ij(i|I}l*JDd*gD
zk%X(cYqof$V*GM<4ZoW}SS2XruC6iKXxkJsOT_3%nWV>$WJ+r0hY}xYN=)a)a`=4g
zC@B9*k&@sZNdqg$lRQ9?vuT$~VODNE{^{y>)E-M+EEU-LHq|2jo{-(CcasY`JGmLy
zxcRE)A|uqSNnAw*IY#aedz&*S{mv}N6yKkucd2%PlcbYomAds%tyVu!WZriuoYoWR
zMK^`*QGMED`V-IJK0X(Exb0n$8oqS5C2vR^BZD2Ii*p?@{YBI_-WQYkexY_cmEGX3
zeopkz;E~b_%P&jbCPLnd!Q_LzRi5BO%HoGj<3eX7H|LW7x|(vK(B85QHpWRnvgmtv
zZmRljW82cPJqm01N3mi)xV@EFPw*BCQZigKom0TO)Q@)j$oWpTypXIAcEN>Zbsd-r
zsL>IBpC6_b)e-o*YyvaH)G9q#S-z9i@v#Ari#EWv4>$gHBy4IOXqP+sVp+QvoXNuC
zucp^?G`rpVD3s;rg!=~<pV7zQ8><v$htaNkBSD_7`Z~2XWiN#7-6*DXrtfZN2MHuR
zBNdhFlJ<SUTJH)XEiJZ=ax+7g{1bLuq@QKm+%LiKu(<1YRvn0F-#;X>xL(gWXGIkF
z>@vju+5uIjO3;<MJo>R3lq(rdw=8`E&*N9OzkOYZJpIzn?qnbA&66tMT$l4XehxmO
zUSR7lN1U?QoR;@||JG}al9h(RPLno#c&}!fq(=XmsS}WCY46fV9d*jfP{<IYbkU8g
zCTSGjw>)I|w=H6*PDtQenu1daMJ+mj;NMaxY)pla-zk9p2_b7WTQmZNKv^TzZ285c
zQD}K28ikZb!NF4ei?LaYMG4Dsu}d$?z&G@0Xkozrx6+hegd&itr6~hQXo@h>k?FsD
zG$j?OaH^oEr~LmUCHJY?0%)j33ZD^4@kVi-;u3s{OVHoAr1o)&{NG>yGZS^B|Ln#|
ZQM=)%!#zQBGlKviz$W$CU8&Re{{_QOIo1FG

delta 3146
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

diff --git a/plugin.audio.ximalaya/addon.py b/plugin.audio.ximalaya/addon.py
index 7e3e609..0d8f0e8 100644
--- a/plugin.audio.ximalaya/addon.py
+++ b/plugin.audio.ximalaya/addon.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 from xbmcswift2 import Plugin, xbmcaddon
-from urllib import urlencode
 import re
 from json import loads
 from bs4 import BeautifulSoup
@@ -97,7 +96,7 @@ def httphead(url):
 
 @plugin.route('/')
 def root():
-
+    plugin.set_content('music')
     html = get_html(HOST_URL + '/dq/all/')
     html = re.sub('\t|\r|\n', '', html)
     tree = BeautifulSoup(html, 'html.parser')
@@ -119,6 +118,7 @@ def root():
 
 @plugin.route('/sublist/<cid>')
 def sublist(cid):
+    plugin.set_content('music')
     html = get_html(HOST_URL + '/dq/all/')
     tree = BeautifulSoup(html, 'html.parser')
 
@@ -133,6 +133,7 @@ def sublist(cid):
 
 @plugin.route('/albumlist/<url>')
 def albumlist(url):
+    plugin.set_content('music')
     html = get_html(url)
     tree = BeautifulSoup(html, 'html.parser')
     soup = tree.find_all('div', {'class': 'discoverAlbum_wrapper'})
@@ -160,17 +161,11 @@ def albumlist(url):
             'path': plugin.url_for('albumlist', url=httphead(url.encode('utf-8')))
         }
 
-@plugin.route('/play/<url>')
-def play(url):
-    plugin.set_content('music')
-    plugin.resolved_url(url)
 
 @plugin.route('/playList/<url>/<page>/<order>')
 def playList(url, page, order):
     plugin.set_content('music')
-    pdata = {'page': page, 'order': order}
-    data = urlencode(pdata)
-    html = get_html(url + '?' + data)
+    html = get_html(url + '?page={}&order={}'.format(page, order))
     tree = BeautifulSoup(html, 'html.parser')
 
     info = tree.find_all('div', {'class': 'rich_intro'})