rewrite some audio plugins

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

addons.xml.md5

@@ -1 +1 @@
-b1e1535347dd8e27867d6c27a40c348e  addons.xml
+14f423fbec943540d4b2e2adb14c3cce  addons.xml

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()

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

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 版本，重写函数结构