The branch, frodo has been updated
via 9ac1144fb52e9ea7d0580a8ee4dc1fe70fb898ae (commit)
via 3941c3209a72fa5724056efd0f089160ae205eb0 (commit)
via 93b23082fa56dcb2ff442ad1a1a38a44606b6c67 (commit)
from 9c02c17d903ac4da238198d33b4709e0e31e0d9c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9ac1144fb52e9ea7d0580a8ee4dc1fe70fb898ae
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3941c3209a72fa5724056efd0f089160ae205eb0
commit 3941c3209a72fa5724056efd0f089160ae205eb0
Author: beenje <[email protected]>
Date: Wed Feb 27 22:16:52 2013 +0100
[plugin.video.cbsnews_com] updated to version 2.0.7
diff --git a/plugin.video.cbsnews_com/addon.xml
b/plugin.video.cbsnews_com/addon.xml
index fb05776..7278a2b 100644
--- a/plugin.video.cbsnews_com/addon.xml
+++ b/plugin.video.cbsnews_com/addon.xml
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.cbsnews_com" name="CBSnews.com" version="1.0.6"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.cbsnews_com" name="CBSnews.com" version="2.0.7"
provider-name="AddonScriptorDE">
<requires>
- <import addon="xbmc.python" version="2.0"/>
+ <import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <summary lang="en">Various news and shows</summary>
+ <summary lang="en">Various news and shows (60 Minutes, 48 Hours, Face
the nation, ...)</summary>
<language>en</language>
- <description lang="en">Various news and shows</description>
- <platform>all</platform>
+ <description lang="en">Various news and shows (60 Minutes, 48 Hours,
Face the nation, ...)</description>
</extension>
</addon>
diff --git a/plugin.video.cbsnews_com/changelog.txt
b/plugin.video.cbsnews_com/changelog.txt
index 49b8590..40bb4c7 100644
--- a/plugin.video.cbsnews_com/changelog.txt
+++ b/plugin.video.cbsnews_com/changelog.txt
@@ -11,4 +11,7 @@
1.0.5
- Fixed site changes
1.0.6
-- Some small fixes
\ No newline at end of file
+- Some small fixes
+1.0.7
+- Changed navigation on 60 minutes and Evening news
+- Fixed search
diff --git a/plugin.video.cbsnews_com/default.py
b/plugin.video.cbsnews_com/default.py
index 37132b5..1b199c6 100644
--- a/plugin.video.cbsnews_com/default.py
+++ b/plugin.video.cbsnews_com/default.py
@@ -40,17 +40,59 @@ def index():
else:
pageType="1611"
url="http://www.cbsnews.com/"+pageType+"-"+noteId+"_162-1.html?nomesh";
- if title=="48 Hours":
+ if title=="Evening News":
+ addDir(title,"",'listEveningMain',"")
+ elif title=="60 Minutes":
+ addDir(title,"",'list60MinutesMain',"")
+ elif title=="48 Hours":
addDir(title,nextUrl,'listVideos',"")
else:
addDir(title,url+"#"+nextUrl,'listLatest',"")
- addDir("CBS Sunday
Morning","http://www.cbsnews.com/2076-3445_162-0.html";,'listVideos',"")
addDir("Up To The
Minute","http://www.cbsnews.com/2076-3455_162-0.html";,'listVideos',"")
addDir(translation(30002),"",'search',"")
xbmcplugin.endOfDirectory(pluginhandle)
if forceViewMode==True:
xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
+def listEveningMain():
+ addLink(translation(30004),"",'playEveningLatest',"")
+
addDir(translation(30005),"http://www.cbsnews.com/2003-503445_162-0.html";,'listVideos',"")
+
addDir(translation(30006),"http://www.cbsnews.com/video/eveningnews/";,'listVideos',"")
+ xbmcplugin.endOfDirectory(pluginhandle)
+ if forceViewMode==True:
+ xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
+
+def list60MinutesMain():
+ content = getUrl("http://www.cbsnews.com/60-minutes/";)
+ match=re.compile('<strong
class="sideScrollerTitle"><span>(.+?)</span></strong>',
re.DOTALL).findall(content)
+ for title in match:
+ addDir(title,title,'list60Minutes',"")
+
addDir(translation(30007),"http://www.cbsnews.com/video/60minutes/";,'listVideos',"")
+ xbmcplugin.endOfDirectory(pluginhandle)
+ if forceViewMode==True:
+ xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
+
+def list60Minutes(title):
+ content = getUrl("http://www.cbsnews.com/60-minutes/";)
+ content = content[content.find('<strong
class="sideScrollerTitle"><span>'+title+'</span></strong>'):]
+ content = content[:content.find('</ul>'):]
+ match=re.compile('<li class="promoBox"> <a
href="(.+?)"(.+?)loadsrc="(.+?)"(.+?)class="assetTitle">(.+?)</a> <p
class="storySub">(.+?)</p> </li>', re.DOTALL).findall(content)
+ for url, temp, thumb, temp2, title, date in match:
+ fullDate=date
+ date=date.strip().replace(",","")
+ dateTemp = time.strptime(date, '%B %d %Y')
+ dateShort = time.strftime("%m/%d", dateTemp)
+ title=dateShort+" - "+title
+ addLink(title,url,'playVideo',thumb,fullDate)
+ xbmcplugin.endOfDirectory(pluginhandle)
+ if forceViewMode==True:
+ xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
+
+def playEveningLatest():
+ content = getUrl("http://www.cbsnews.com/2003-503445_162-0.html";)
+ match=re.compile('<li> <a href="(.+?)"(.+?)alt="(.+?)"',
re.DOTALL).findall(content)
+ playVideo(match[0][0], match[0][2])
+
def listLatest(url):
spl=url.split("#")
url=spl[0]
@@ -76,7 +118,12 @@ def listLatest(url):
date=""
if len(match)>0:
length=match[0][0]
- date=match[0][1].strip()
+ length=str(int(length[:length.find(":")])+1)
+ date=match[0][1]
+ date=date[:date.find("|")].strip().replace(",","")
+ dateTemp = time.strptime(date, '%B %d %Y')
+ dateShort = time.strftime("%m/%d", dateTemp)
+ title=dateShort+" - "+title
desc=date+"\n"+desc
match=re.compile('src="(.+?)"', re.DOTALL).findall(entry)
thumb=match[0]
@@ -88,29 +135,40 @@ def listLatest(url):
xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
def listVideos(url):
+ if "http://"; not in url:
+ url="http://www.cbsnews.com"+url
+ urlMain=url
content = getUrl(url)
tempTitle=""
match=re.compile('http://www.cbsnews.com/video/(.+?)/',
re.DOTALL).findall(url)
if len(match)>0:
tempTitle=match[0]
- if content.find('<div style="background-image')>=0:
+ if content.find('<div style="background-image')>=0 and
"http://www.cbsnews.com/2003-503445_162-0"; not in urlMain:
spl=content.split('<div style="background-image')
for i in range(1,len(spl),1):
entry=spl[i]
+ match=re.compile('<h2 class="storyTitle"><a
href="(.+?)">(.+?)</a></h2>', re.DOTALL).findall(entry)
+ url=match[0][0]
+ title=match[0][1]
+ title=cleanTitle(title)
match=re.compile('<p class="datestamp">(.+?)</p>',
re.DOTALL).findall(entry)
- date=match[0].replace('<span class="separatorGrey">|</span> ','')
+ date=""
+ if len(match)>0:
+ date=match[0].replace('<span class="separatorGrey">','')
+ date=date[:date.find("|")].strip().replace(",","")
+ dateTemp = time.strptime(date, '%B %d %Y')
+ dateShort = time.strftime("%m/%d", dateTemp)
+ title=dateShort+" - "+title
match=re.compile('<p class="storyDek">(.+?)</p>',
re.DOTALL).findall(entry)
desc=""
if len(match)>0:
desc=match[0]
desc=cleanTitle(desc)
- match=re.compile('<h2 class="storyTitle"><a
href="(.+?)">(.+?)</a></h2>', re.DOTALL).findall(entry)
- url=match[0][0]
- title=match[0][1]
- title=cleanTitle(title)
+ if date!="":
+ desc=date+"\n"+desc
match=re.compile("url\\('(.+?)'\\)", re.DOTALL).findall(entry)
thumb=match[0]
- addLink(title,url,'playVideo',thumb,date+"\n"+desc)
+ addLink(title,url,'playVideo',thumb,desc)
elif content.find('<li> <a
href="http://www.cbsnews.com/video/watch/')>=0 or content.find('<li> <a
href="/video/watch/')>=0:
if content.find('<li> <a
href="http://www.cbsnews.com/video/watch/')>=0:
spl=content.split('<li> <a
href="http://www.cbsnews.com/video/watch/')
@@ -118,17 +176,24 @@ def listVideos(url):
spl=content.split('<li> <a href="/video/watch/')
for i in range(1,len(spl),1):
entry=spl[i]
+ match=re.compile('alt=(.+?)/>', re.DOTALL).findall(entry)
+ title=match[0]
+ title=cleanTitle(title).replace('"','')
url="http://www.cbsnews.com/video/watch/"+entry[:entry.find('"')]
match=re.compile('<p class="datestamp">(.+?)</p>',
re.DOTALL).findall(entry)
- date=match[0].replace('<span class="separatorGrey">|</span> ','')
+ date=""
+ if len(match)>0:
+ date=match[0].replace('<span class="separatorGrey">','')
+ date=date[:date.find("|")].strip().replace(",","")
+ dateTemp = time.strptime(date, '%B %d %Y')
+ dateShort = time.strftime("%m/%d", dateTemp)
+ if "http://www.cbsnews.com/2003-503445_162-0"; not in urlMain:
+ title=dateShort+" - "+title
match=re.compile('<p class="storyDek">(.+?)</p>',
re.DOTALL).findall(entry)
desc=""
if len(match)>0:
desc=match[0]
desc=cleanTitle(desc)
- match=re.compile('alt=(.+?)/>', re.DOTALL).findall(entry)
- title=match[0]
- title=cleanTitle(title).replace('"','')
match=re.compile('src="(.+?)"', re.DOTALL).findall(entry)
thumb=match[0]
addLink(title,url,'playVideo',thumb,date+"\n"+desc)
@@ -152,34 +217,30 @@ def search():
keyboard.doModal()
if keyboard.isConfirmed() and keyboard.getText():
search_string = keyboard.getText().replace(" ","+")
-
listSearchResults('http://www.cbsnews.com/1770-5_162-0.html?query='+search_string+'&searchtype=cbsSearch&rpp=10&pageType=14&tag=ltcol;narrow;mt')
+
listSearchResults('http://www.cbsnews.com/1770-5_162-0.html?query='+search_string+'&searchtype=cbsSearch&pageType=14&rpp=30')
def listSearchResults(url):
content = getUrl(url)
spl=content.split('<li section=')
for i in range(1,len(spl),1):
entry=spl[i]
- match=re.compile('<p class="storyDek">(.+?)</p>',
re.DOTALL).findall(entry)
- desc=match[0]
- match=re.compile('<p class="datestamp">(.+?)</p>',
re.DOTALL).findall(entry)
+ match=re.compile('<span class="date">(.+?)<',
re.DOTALL).findall(entry)
date=match[0]
match=re.compile('href="(.+?)"', re.DOTALL).findall(entry)
url=match[0]
- match=re.compile('class="storyTitle">(.+?)</a>',
re.DOTALL).findall(entry)
+ match=re.compile('class="title">(.+?)<', re.DOTALL).findall(entry)
title=match[0]
title=cleanTitle(title)
match=re.compile('src="(.+?)"', re.DOTALL).findall(entry)
- thumb=match[0]
- addLink(title,url,'playVideo',thumb,date+"\n"+desc)
- matchPage=re.compile('<li class="next"> <a href="(.+?)">',
re.DOTALL).findall(content)
- if len(matchPage)>0:
- urlNext="http://www.cbsnews.com"+matchPage[0]
- addDir(translation(30001),urlNext,'listSearchResults',"")
+ thumb=""
+ if len(match)>0:
+ thumb=match[0]
+ addLink(title,url,'playVideo',thumb,date)
xbmcplugin.endOfDirectory(pluginhandle)
if forceViewMode==True:
xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
-def playVideo(url):
+def playVideo(url,title=""):
content = getUrl(url)
match=re.compile('setVideoId\\("(.+?)"\\)', re.DOTALL).findall(content)
match2=re.compile('setVideoId\\((.+?)\\)', re.DOTALL).findall(content)
@@ -202,6 +263,8 @@ def playVideo(url):
finalUrl=match[0]
if finalUrl!="":
listitem = xbmcgui.ListItem(path=finalUrl)
+ if title!="":
+ listitem.setInfo( type="Video", infoLabels={ "Title": title } )
xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
def cleanTitle(title):
@@ -256,8 +319,16 @@ if mode == 'listVideos':
listVideos(url)
elif mode == 'listLatest':
listLatest(url)
+elif mode == 'listEveningMain':
+ listEveningMain()
+elif mode == 'list60MinutesMain':
+ list60MinutesMain()
+elif mode == 'list60Minutes':
+ list60Minutes(url)
elif mode == 'listSearchResults':
listSearchResults(url)
+elif mode == 'playEveningLatest':
+ playEveningLatest()
elif mode == 'playVideo':
playVideo(url)
elif mode == 'search':
diff --git a/plugin.video.cbsnews_com/resources/language/English/strings.xml
b/plugin.video.cbsnews_com/resources/language/English/strings.xml
index d0faf90..3c33265 100644
--- a/plugin.video.cbsnews_com/resources/language/English/strings.xml
+++ b/plugin.video.cbsnews_com/resources/language/English/strings.xml
@@ -3,6 +3,10 @@
<string id="30001">Next Page</string>
<string id="30002">Search</string>
<string id="30003">All Videos</string>
+ <string id="30004">Play latest episode</string>
+ <string id="30005">Show all episodes</string>
+ <string id="30006">Show all clips</string>
+ <string id="30007">Older videos</string>
<string id="30101">Maximum Bitrate</string>
<string id="30102">Force View</string>
<string id="30103">ViewID</string>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=93b23082fa56dcb2ff442ad1a1a38a44606b6c67
commit 93b23082fa56dcb2ff442ad1a1a38a44606b6c67
Author: beenje <[email protected]>
Date: Wed Feb 27 22:16:51 2013 +0100
[plugin.video.euronews_com] updated to version 2.0.1
diff --git a/plugin.video.euronews_com/addon.xml
b/plugin.video.euronews_com/addon.xml
index 7bc382f..e2b3b03 100644
--- a/plugin.video.euronews_com/addon.xml
+++ b/plugin.video.euronews_com/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.euronews_com" name="euronews.com" version="2.0.0"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.euronews_com" name="euronews.com" version="2.0.1"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
@@ -12,6 +12,5 @@
<language></language>
<description lang="en">Livestream and latest news videos from
euronews.com | Available languages: English, Greek, French, German, Italian,
Spanish, Portuguese, Polish, Russian, Ukrainian, Turkish, Arabic and
Persian</description>
<disclaimer lang="en">Some parts of this addon may not be legal in
your country of residence - please check with your local laws before
installing.</disclaimer>
- <platform>all</platform>
</extension>
</addon>
diff --git a/plugin.video.euronews_com/changelog.txt
b/plugin.video.euronews_com/changelog.txt
index b47131e..b196431 100644
--- a/plugin.video.euronews_com/changelog.txt
+++ b/plugin.video.euronews_com/changelog.txt
@@ -1 +1,4 @@
-1.0.0 - Initial release
+1.0.0
+- Initial release
+1.0.1 / 2.0.1
+- Fixed livestream
diff --git a/plugin.video.euronews_com/default.py
b/plugin.video.euronews_com/default.py
index 7738ca3..b2c8717 100644
--- a/plugin.video.euronews_com/default.py
+++ b/plugin.video.euronews_com/default.py
@@ -228,7 +228,8 @@ def playLive():
content = content[content.find('"'+language+'":'):]
match=re.compile('"server":"(.+?)"', re.DOTALL).findall(content)
server=match[0].replace("\\","")
- listitem =
xbmcgui.ListItem(path=server+language+"_video750_flash_all.sdp
swfUrl=http://www.euronews.com/media/player_live_1_14.swf";)
+ url = server.replace("rtmp","rtsp")+language+"_video750_flash_all.sdp"
+ listitem = xbmcgui.ListItem(path=url)
return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
def cleanTitle(title):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cbsnews_com/addon.xml | 9 +-
plugin.video.cbsnews_com/changelog.txt | 5 +-
plugin.video.cbsnews_com/default.py | 123 +++-
.../resources/language/English/strings.xml | 4 +
plugin.video.euronews_com/addon.xml | 3 +-
plugin.video.euronews_com/changelog.txt | 5 +-
plugin.video.euronews_com/default.py | 3 +-
plugin.video.filmon/LICENSE.txt | 339 -----------
plugin.video.filmon/addon.xml | 17 -
plugin.video.filmon/changelog.txt | 134 ----
plugin.video.filmon/default.py | 633 --------------------
plugin.video.filmon/icon.png | Bin 63343 -> 0 bytes
.../resources/language/english/strings.xml | 314 ----------
plugin.video.filmon/resources/settings.xml | 18 -
plugin.video.filmon/settings.py | 16 -
15 files changed, 116 insertions(+), 1507 deletions(-)
delete mode 100644 plugin.video.filmon/LICENSE.txt
delete mode 100644 plugin.video.filmon/addon.xml
delete mode 100644 plugin.video.filmon/changelog.txt
delete mode 100644 plugin.video.filmon/default.py
delete mode 100644 plugin.video.filmon/icon.png
delete mode 100644 plugin.video.filmon/resources/language/english/strings.xml
delete mode 100644 plugin.video.filmon/resources/settings.xml
delete mode 100644 plugin.video.filmon/settings.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
