update cntv-video,remove simplejson

addons.xml

@@ -6,7 +6,7 @@
     provider-name="yfang1644">
   	<requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension
         point="xbmc.python.pluginsource"
@@ -30,7 +30,7 @@
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>
@@ -74,7 +74,7 @@
     version="1.2.13"
     provider-name="Uranus Zhou,yfang1644">
     <requires>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
 	</requires>
 	<extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>
@@ -145,7 +145,7 @@
     provider-name="Taxigps,yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension
         point="xbmc.python.pluginsource"
@@ -311,7 +311,7 @@
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>
@@ -380,7 +380,7 @@
     provider-name="catro, yfang1644">
     <requires>
         <import addon="script.common.plugin.cache" version="0.9.1"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.script" library="addon.py">
         <provides>video</provides>
@@ -395,23 +395,23 @@
   </extension>
 </addon>
 
-<addon id="plugin.video.qiyi"
-    name="奇艺视频(QIYI)"
+<addon id="plugin.video.iqiyi"
+    name="爱奇艺视频(IQIYI)"
     version="2.2.9"
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>
     </extension>
     <extension point="xbmc.addon.metadata">
-        <summary lang="en">QIYI Video plugin</summary>
-        <summary lang="zh">奇艺视频插件</summary>
-        <description lang="en">QIYI (QIYI.COM) was founded by Baidu- world's the largest Chinese search engine, invested by Providence Equity Partners-U.S. private equity, QIYI is the first professional website dedicated to providing free, high-definition network video services.</description>
-        <description lang="zh">奇艺（QIYI.COM）是由百度创立的大型专业网站，专注于提供免费、高清网络视频服务。奇艺的优质版权视频丰富多元，涵盖了电影、电视剧、综艺、纪录片、动漫、旅游等众多内容形态。</description>
-        <source>https://github.com/yfang1644/kodi_plugins/plugin.video.qiyi</source>
+        <summary lang="en">IQIYI Video plugin</summary>
+        <summary lang="zh">爱奇艺视频插件</summary>
+        <description lang="en">IQIYI (iqiyi.com) was founded by Baidu- world's the largest Chinese search engine, invested by Providence Equity Partners-U.S. private equity, QIYI is the first professional website dedicated to providing free, high-definition network video services.</description>
+        <description lang="zh">爱奇艺(iqiyi.com)是由百度创立的大型专业网站，专注于提供免费、高清网络视频服务。奇艺的优质版权视频丰富多元，涵盖了电影、电视剧、综艺、纪录片、动漫、旅游等众多内容形态。</description>
+        <source>https://github.com/yfang1644/kodi_plugins/plugin.video.iqiyi</source>
 		<email>[email protected]</email>
         <platform>all</platform>
     </extension>
@@ -481,7 +481,7 @@
     provider-name="taxigps,yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>
@@ -503,7 +503,7 @@
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>
@@ -585,7 +585,7 @@
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension
         point="xbmc.python.pluginsource"
@@ -642,7 +642,7 @@
 
 <addon id="plugin.video.cntv-video"
     name="CNTV 视频"
-    version="1.0.5"
+    version="1.0.6"
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -730,7 +730,7 @@
     <requires>
         <import addon="script.module.xbmcswift2" version="2.4.0"/>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.1"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>

addons.xml.md5

@@ -1 +1 @@
-3c7c55f8bab8f94cf9500d8f6ef7ad61  addons.xml
+cba5969bbfcf17099b91ae11ad7e2683  addons.xml

plugin.audio.kuwo/addon.xml

@@ -5,7 +5,7 @@
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension
         point="xbmc.python.pluginsource" library="default.py">

plugin.audio.ximalaya/addon.xml

@@ -4,7 +4,7 @@
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>audio</provides>

plugin.video.bilibili/addon.xml

@@ -6,7 +6,7 @@
     <requires>
         <import addon="script.module.xbmcswift2" version="2.4.0"/>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.1"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>

plugin.video.bilibili2/addon.xml

@@ -5,7 +5,7 @@
     provider-name="Syndim,yfang1644">
     <requires>
         <import addon="script.module.xbmcswift2" version="2.4.0"/>
-        <import addon="plugin.video.cntv-video" version="1.0.1"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>video</provides>

plugin.video.cntv-video/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.cntv-video"
     name="CNTV 视频"
-    version="1.0.5"
+    version="1.0.6"
     provider-name="yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>

plugin.video.cntv-video/default.py

@@ -267,7 +267,7 @@ def list_by_jsondata(data):
         desc = jsdata[i].get('brief', '')
 
         li = ListItem(title,
-                              iconImage=p_thumb, thumbnailImage=p_thumb)
+                      iconImage=p_thumb, thumbnailImage=p_thumb)
         li.setInfo(type='Video', infoLabels={'Title': title, 'Plot': desc})
 
         u = sys.argv[0] + '?mode=playvideo&url=' + p_url

plugin.video.cntv-video/lib/common.py

@@ -4,6 +4,7 @@
 import urllib2
 import re
 import gzip
+import zlib
 import StringIO
 import socket
 cookies = None
@@ -79,6 +80,8 @@ def get_html(url,
         if data[-1] == '\n':
             data = data[:-1]
         data = gzip.GzipFile(fileobj=StringIO.StringIO(data)).read()
+    elif content_encoding == 'deflate':
+        data = zlib.decompressobj(-zlib.MAX_WBITS).decompress(data)
 
     # Decode the response body
     if decoded:

plugin.video.cntv-video/lib/sohu.py

@@ -47,9 +47,12 @@ class Sohu():
     v_api1 = 'http://hot.vrs.sohu.com/vrs_flash.action?vid=%s'
     v_api2 = 'http://my.tv.sohu.com/play/videonew.do?vid=%s&referer=http://my.tv.sohu.com'
 
-    def real_url(self, host, vid, tvid, new, clipURL, ck):
-        url = 'http://'+host+'/?prot=9&prod=flash&pt=1&file='+clipURL+'&new='+new +'&key='+ ck+'&vid='+str(vid)+'&uid='+str(int(time.time()*1000))+'&t='+str(random())+'&rb=1'
-        return loads(get_html(url))['url']
+    def real_url(self, host, vid, new, clipURL, ck):
+        url = 'http://'+host+'/?prot=9&prod=flash&pt=1&file='+clipURL+'&new='+new +'&key='+ck+'&vid='+str(vid)+'&uid='+str(int(time.time()*1000))+'&t='+str(random())+'&rb=1'
+        try:
+            return loads(get_html(url))['url']
+        except:
+            return ''
 
     def video_from_url(self, url, **kwargs):
         if re.match(r'http://share.vrs.sohu.com', url):
@@ -59,18 +62,19 @@ def video_from_url(self, url, **kwargs):
             vid = r1(r'\Wvid\s*[\:=]\s*[\'"]?(\d+)[\'"]?', html)
         assert vid
 
-        if re.match(r'http://tv.sohu.com/', url):
+        return video_from_vid(self, vid, **kwargs)
+
+    def video_from_vid(self, vid, **kwargs):
+        vidlist = ['oriVid', 'superVid', 'highVid', 'norVid', 'relativeId']
+        level = kwargs.get('level', 0)
+        qtyp = vidlist[level]
+
+        #if re.match(r'http://tv.sohu.com/', url):
             # if extractor_proxy:
             #     set_proxy(tuple(extractor_proxy.split(":")))
+        try:
             info = loads(get_html(self.v_api1 % vid))
 
-            vidlist = ['oriVid',
-                       'superVid',
-                       'highVid',
-                       'norVid',
-                       'relativeId']
-            level = kwargs.get('level', 0)
-            qtyp = vidlist[level]
             if 'data' in info:
                 hqvid = info['data'][qtyp]
             else:
@@ -79,26 +83,26 @@ def video_from_url(self, url, **kwargs):
                 info = loads(get_html(self.v_api1 % hqvid))
             # if extractor_proxy:
             #     unset_proxy()
-
-        else:
+        except:
             info = loads(get_html(self.v_api2 % vid))
 
         host = info['allot']
         prot = info['prot']
-        tvid = info['tvid']
-        urls = []
+        tvId = info['tvid']
         data = info['data']
         title = data['tvName']
         size = sum(map(int, data['clipsBytes']))
+        urls = []
         assert len(data['clipsURL']) == len(data['clipsBytes']) == len(data['su'])
         for new, clip, ck, in zip(data['su'], data['clipsURL'], data['ck']):
             clipURL = urlparse.urlparse(clip).path
-            url = self.real_url(host, vid, tvid, new, clipURL, ck)
-            url += '|RANGE='
-            urls.append(url)
+            url = self.real_url(host, vid, new, clipURL, ck)
+            if url:
+                urls.append(url + '|RANGE=')
             # assert data['clipsURL'][0].endswith('.mp4')
 
         return urls
 
 site = Sohu()
 video_from_url = site.video_from_url
+video_from_vid = site.video_from_vid

plugin.video.funshion/addon.xml

@@ -5,7 +5,7 @@
     provider-name="taxigps,yfang1644">
     <requires>
         <import addon="script.module.beautifulsoup4" version="4.3.2"/>
-        <import addon="plugin.video.cntv-video" version="1.0.0"/>
+        <import addon="plugin.video.cntv-video" version="1.0.6"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="default.py">
         <provides>video</provides>