The branch, eden-pre has been updated
via 51bc1d88e41e6087ece32602577e9cec228fdce9 (commit)
from eb932555089eb468f234aeb192afbaae66f80948 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=51bc1d88e41e6087ece32602577e9cec228fdce9
commit 51bc1d88e41e6087ece32602577e9cec228fdce9
Author: spiff <[email protected]>
Date: Thu Jan 12 15:25:38 2012 +0100
[plugin.video.fox.news] updated to version 2.0.1
diff --git a/plugin.video.fox.news/addon.xml b/plugin.video.fox.news/addon.xml
index 96921ee..65b6342 100644
--- a/plugin.video.fox.news/addon.xml
+++ b/plugin.video.fox.news/addon.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.fox.news"
name="Fox News"
- version="2.0.0"
+ version="2.0.1"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.beautifulsoup" version="3.0.8"/>
+ <import addon="script.common.plugin.cache" version="0.9.0"/>
</requires>
<extension point="xbmc.python.pluginsource"
library="default.py">
diff --git a/plugin.video.fox.news/default.py b/plugin.video.fox.news/default.py
index 9338457..5fd49bb 100644
--- a/plugin.video.fox.news/default.py
+++ b/plugin.video.fox.news/default.py
@@ -1,5 +1,11 @@
-import urllib,urllib2,re,os
-import xbmcplugin,xbmcgui,xbmcaddon
+import urllib
+import urllib2
+import os
+import xbmcplugin
+import xbmcgui
+import xbmcaddon
+import xbmcvfs
+import StorageServer
from BeautifulSoup import BeautifulSoup
try:
import json
@@ -10,40 +16,48 @@ __settings__ = xbmcaddon.Addon(id='plugin.video.fox.news')
__language__ = __settings__.getLocalizedString
home = __settings__.getAddonInfo('path')
icon = xbmc.translatePath( os.path.join( home, 'icon.png' ) )
+cache = StorageServer.StorageServer()
+cache.table_name = "FoxNews"
def getCategories():
- addDir(__language__(30001),87485,2,icon)
- addDir(__language__(30002),0,1,icon)
- addDir(__language__(30003),1,1,icon)
- addDir(__language__(30004),2,1,icon)
- addDir(__language__(30005),3,1,icon)
- addDir(__language__(30006),4,1,icon)
- addDir(__language__(30007),5,1,icon)
- addDir(__language__(30008),6,1,icon)
- addDir(__language__(30009),7,1,icon)
- addDir(__language__(30010),8,1,icon)
- addDir(__language__(30011),9,1,icon)
- addDir(__language__(30012),10,1,icon)
- addDir(__language__(30013),11,1,icon)
- addDir(__language__(30014),12,1,icon)
-
-
-def getSubcategories(url):
- url = int(url)
- req = urllib2.Request('http://video.foxnews.com')
- req.addheaders = [('Referer', 'http://foxnews.com'),
- ('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3)
Gecko/20100401 Firefox/3.6.3')]
+ addDir(__language__(30001),0,1,icon)
+ addDir(__language__(30002),1,1,icon)
+ addDir(__language__(30003),2,1,icon)
+ addDir(__language__(30004),3,1,icon)
+ addDir(__language__(30005),4,1,icon)
+ addDir(__language__(30006),5,1,icon)
+ addDir(__language__(30007),6,1,icon)
+ addDir(__language__(30008),7,1,icon)
+ addDir(__language__(30009),8,1,icon)
+ addDir(__language__(30010),9,1,icon)
+ addDir(__language__(30011),10,1,icon)
+ addDir(__language__(30012),11,1,icon)
+ addDir(__language__(30013),12,1,icon)
+ addDir(__language__(30014),13,1,icon)
+
+
+def subcat_cache():
+ headers = {'User-agent' : 'Mozilla/5.0 (Windows NT 6.1; WOW64;
rv:9.0.1) Gecko/20100101 Firefox/9.0.1',
+ 'Referer' : 'http://foxnews.com'}
+ req = urllib2.Request('http://video.foxnews.com',None,headers)
response = urllib2.urlopen(req)
link=response.read()
response.close()
- soup = BeautifulSoup(link, convertEntities=BeautifulSoup.HTML_ENTITIES)
+ return(link, 200)
+
+
+def getSubcategories(url):
+ soup = BeautifulSoup(cache.cacheFunction(subcat_cache)[0],
convertEntities=BeautifulSoup.HTML_ENTITIES)
data = soup.find('div', attrs={'class' : 'playlist-2'})('ul')
- categories = data[url]
+ categories = data[int(url)]
for item in categories('a'):
name = item['title']
url=item['href']
- url = url.split('=')[1]
+ if url == '#':
+ url = '87485'
+ else:
+ url = url.split('-')[-1]
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode=2&name="+urllib.quote_plus(name)
ok=True
liz=xbmcgui.ListItem(name, iconImage="DefaultFolder.png",
thumbnailImage=icon)
@@ -52,10 +66,9 @@ def getSubcategories(url):
def getVideos(url):
- url='http://video.foxnews.com/v/feed/playlist/'+url+'.js?'
- req = urllib2.Request(url)
- req.addheaders = [('Referer', 'http://video.foxnews.com'),
- ('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3)
Gecko/20100401 Firefox/3.6.3')]
+ headers = {'User-agent' : 'Mozilla/5.0 (Windows NT 6.1; WOW64;
rv:9.0.1) Gecko/20100101 Firefox/9.0.1',
+ 'Referer' : 'http://video.foxnews.com'}
+ req =
urllib2.Request('http://video.foxnews.com/v/feed/playlist/'+url+'.js?',None,headers)
response = urllib2.urlopen(req)
link=response.read()
response.close()
@@ -66,7 +79,7 @@ def getVideos(url):
url = video['media-content']['mvn-fnc_mp4']
thumb = video['media-content']['media-thumbnail']
try:
- desc = str(video['media-content']['media-description'])+'
\n\n'+str(video['media-content']['mvn-airDate'])
+ desc = str(video['media-content']['media-description'])+'
\n\n'+str(video['media-content']['mvn-airDate'].split('T')[0])
except:
desc = ''
name = name.replace('&',' & ')
@@ -104,6 +117,9 @@ def get_params():
return param
+
+xbmcplugin.setContent(int(sys.argv[1]), 'movies')
+
params=get_params()
url=None
diff --git a/plugin.video.fox.news/resources/language/English/strings.xml
b/plugin.video.fox.news/resources/language/English/strings.xml
index 46f1515..f8b5c02 100644
--- a/plugin.video.fox.news/resources/language/English/strings.xml
+++ b/plugin.video.fox.news/resources/language/English/strings.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30001">Featured Videos</string>
- <string id="30002">Latest</string>
- <string id="30003">On Air</string>
- <string id="30004">Hot Topics</string>
- <string id="30005">US</string>
- <string id="30006">World</string>
- <string id="30007">Politics</string>
- <string id="30008">Entertainment</string>
+ <string id="30001">Latest</string>
+ <string id="30002">On Air</string>
+ <string id="30003">Hot Topics</string>
+ <string id="30004">US</string>
+ <string id="30005">World</string>
+ <string id="30006">Politics</string>
+ <string id="30007">Entertainment</string>
+ <string id="30008">Travel</string>
<string id="30009">Leisure</string>
<string id="30010">Health</string>
<string id="30011">SciTech</string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.fox.news/addon.xml | 3 +-
plugin.video.fox.news/default.py | 78 ++++++++++++--------
.../resources/language/English/strings.xml | 16 ++--
3 files changed, 57 insertions(+), 40 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
