The branch, frodo has been updated
via 122f88490a6c8e47fc6b07e349710234c2aae0be (commit)
via 1003689671f3222e05486be8e274f68b3c5e71ac (commit)
via e498bf24c12cafed25f05827b3d45b7b6a8a6028 (commit)
from 13fdffbd9e2baa377cf4ec510a64ef582e53e6e7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=122f88490a6c8e47fc6b07e349710234c2aae0be
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1003689671f3222e05486be8e274f68b3c5e71ac
commit 1003689671f3222e05486be8e274f68b3c5e71ac
Author: Martijn Kaijser <[email protected]>
Date: Sat Jun 7 10:22:10 2014 +0200
[plugin.video.i24News] 1.0.2
diff --git a/plugin.video.i24News/README.txt b/plugin.video.i24News/README.txt
index e960db4..606786b 100644
--- a/plugin.video.i24News/README.txt
+++ b/plugin.video.i24News/README.txt
@@ -4,4 +4,6 @@ plugin.video.i24News
XBMC Addon for i24News
+version 1.0.2 updated for website changes
+
version 1.0.1 initial release
diff --git a/plugin.video.i24News/addon.xml b/plugin.video.i24News/addon.xml
index f8b0ca9..6931b4a 100644
--- a/plugin.video.i24News/addon.xml
+++ b/plugin.video.i24News/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.i24News"
name="i24 News"
- version="1.0.1"
+ version="1.0.2"
provider-name="t1m">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -18,8 +18,8 @@
<platform>all</platform>
<language>en</language>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
- <forum></forum>
- <website></website>
+ <forum>http://forum.xbmc.org/showthread.php?tid=187224</forum>
+ <website>http://www.i24news.tv/en/</website>
<email></email>
<source>https://github.com/learningit/plugin.video.i24News</source>
</extension>
diff --git a/plugin.video.i24News/changelog.txt
b/plugin.video.i24News/changelog.txt
index fc67a09..0aff1bb 100644
--- a/plugin.video.i24News/changelog.txt
+++ b/plugin.video.i24News/changelog.txt
@@ -2,3 +2,5 @@ Change Log for plugin.video.i24News
Version 1.0.1 Initial release
+Version 1.0.2 Updated for website changes
+
diff --git a/plugin.video.i24News/default.py b/plugin.video.i24News/default.py
index f117b17..3a223df 100644
--- a/plugin.video.i24News/default.py
+++ b/plugin.video.i24News/default.py
@@ -32,37 +32,12 @@ def log(txt):
message = '%s: %s' % (__addonname__, txt.encode('ascii', 'ignore'))
xbmc.log(msg=message, level=xbmc.LOGDEBUG)
-
-def _parse_argv():
-
- global url,name,iconimage, mode,
playlist,fchan,fres,fhost,fname,fepg,fanArt
-
- params = {}
- try:
- params = dict( arg.split( "=" ) for arg in
((sys.argv[2][1:]).split( "&" )) )
- except:
- params = {}
-
- url = demunge(params.get("url",None))
- name = demunge(params.get("name",""))
- iconimage = demunge(params.get("iconimage",""))
- fanArt = demunge(params.get("fanart",""))
- playlist = demunge(params.get("playlist",""))
- fchan = demunge(params.get("fchan",""))
- fres = demunge(params.get("fres",""))
- fhost = demunge(params.get("fhost",""))
- fname = demunge(params.get("fname",""))
- fepg = demunge(params.get("fepg",None))
-
- try:
- playlist=eval(playlist.replace('|',','))
- except:
- pass
-
- try:
- mode = int(params.get( "mode", None ))
- except:
- mode = None
+def deuni(a):
+ a = a.replace('&#039;',"'")
+ a = a.replace('&','&')
+ a = a.replace(''',"'")
+ a = a.replace('"','"')
+ return a
def demunge(munge):
try:
@@ -96,34 +71,34 @@ def getRequest(url):
def getSources(replay_url):
if replay_url == '/ar/tv-ar/revoir-ar':
-
addLink("plugin://plugin.video.i24News/?url=#2552000981001&mode=20",__language__(30000)+"
"+__language__(30003),icon,fanart,__language__(30000)+"
"+__language__(30003),GENRE_NEWS,"")
- getCategory(replay_url)
+
addLink("plugin://plugin.video.i24News/?url=#2552000981001&mode=PV",__language__(30000)+"
"+__language__(30003),icon,fanart,__language__(30000)+"
"+__language__(30003),GENRE_NEWS,"")
+ getCats(replay_url)
else:
if replay_url == '/en/tv/replay':
-
addDir(__language__(30002),'/fr/tv/revoir',25,icon,fanart,__language__(30002),GENRE_NEWS,"",False)
-
addDir(__language__(30003),'/ar/tv-ar/revoir-ar',25,icon,fanart,__language__(30003),GENRE_NEWS,"",False)
-
addLink("plugin://plugin.video.i24News/?url=#2552000984001&mode=20",__language__(30000)+"
"+__language__(30001),icon,fanart,__language__(30000)+"
"+__language__(30001),GENRE_NEWS,"")
+
addDir(__language__(30002),'/fr/tv/revoir','GX',icon,fanart,__language__(30002),GENRE_NEWS,"",False)
+
addDir(__language__(30003),'/ar/tv-ar/revoir-ar','GX',icon,fanart,__language__(30003),GENRE_NEWS,"",False)
+
addLink("plugin://plugin.video.i24News/?url=#2552000984001&mode=PV",__language__(30000)+"
"+__language__(30001),icon,fanart,__language__(30000)+"
"+__language__(30001),GENRE_NEWS,"")
else:
-
addLink("plugin://plugin.video.i24News/?url=#2552024981001&mode=20",__language__(30000)+"
"+__language__(30002),icon,fanart,__language__(30000)+"
"+__language__(30002),GENRE_NEWS,"")
+
addLink("plugin://plugin.video.i24News/?url=#2552024981001&mode=PV",__language__(30000)+"
"+__language__(30002),icon,fanart,__language__(30000)+"
"+__language__(30002),GENRE_NEWS,"")
link=getRequest(BASE_URL+replay_url)
- match = re.compile('<li class="" id=.+?<a
href="(.+?)">(.+?)</a>').findall(link)
+ match = re.compile('<li id=.+?<a
href="(.+?)">(.+?)</a>').findall(link)
for pchoice, pname in match:
- addDir(pname,pchoice,21,icon,fanart,pname,GENRE_NEWS,"",False)
+
addDir(deuni(pname),pchoice,'GC',icon,fanart,deuni(pname),GENRE_NEWS,"",False)
-def getCategory(Category_url):
+def getCats(Category_url):
log("main page")
link = getRequest(BASE_URL+Category_url)
- match = re.compile('<li
class="results-item">.+?href="(.+?)".+?<img src="(.+?)".+?<a.+?>(.+?)</a>.+?<p
class="entry-date"><span>(.+?)<.+?<p>(.+?)</p>.+?</li>').findall(link)
+ match = re.compile('<li
class="results-item">.+?href="(.+?)".+?<img
src="(.+?)".+?video">(.+?)<.+?<span>(.+?)<.+?description">(.+?)<.+?</li>').findall(link)
for pid, pimage, pname, pdate, pdesc in match:
pname = pname.strip()
pdesc = pdate.strip()+'\n'+pdesc.strip()
pid = pid.replace(Category_url,'')
pid = re.findall('\d+',pid)[0]
- caturl =
"plugin://plugin.video.i24News/?url=#"+str(pid)+"&mode=20"
+ caturl =
"plugin://plugin.video.i24News/?url=#"+str(pid)+"&mode=PV"
try:
-
addLink(caturl.encode(UTF8),pname,pimage,fanart,pdesc,GENRE_NEWS,"")
+
addLink(caturl.encode(UTF8),deuni(pname),pimage,fanart,deuni(pdesc),GENRE_NEWS,"")
except:
log("Problem adding directory")
@@ -140,11 +115,14 @@ def play_playlist(name, list):
def
addDir(name,url,mode,iconimage,fanart,description,genre,date,showcontext=True,playlist=None,autoplay=False):
- u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)
+ u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+mode
dir_playable = False
+ cm = []
- if mode != 12:
- u +=
"&name="+urllib.quote_plus(name)+"&fanart="+urllib.quote_plus(fanart)
+ if mode != 'SR':
+ u += "&name="+urllib.quote_plus(name)
+ if (fanart is None) or fanart == '': fanart = addonfanart
+ u += "&fanart="+urllib.quote_plus(fanart)
dir_image = "DefaultFolder.png"
dir_folder = True
else:
@@ -158,22 +136,18 @@ def
addDir(name,url,mode,iconimage,fanart,description,genre,date,showcontext=Tru
liz.setProperty( "Fanart_Image", fanart )
if dir_playable == True:
- liz.setProperty('IsPlayable', 'true')
+ liz.setProperty('IsPlayable', 'true')
if not playlist is None:
playlist_name = name.split(') ')[1]
- contextMenu_ = [('Play '+playlist_name+'
PlayList','XBMC.RunPlugin(%s?mode=13&name=%s&playlist=%s)' %(sys.argv[0],
urllib.quote_plus(playlist_name),
urllib.quote_plus(str(playlist).replace(',','|'))))]
- liz.addContextMenuItems(contextMenu_)
-
- if autoplay == True:
- xbmc.PlayList(1).add(u, liz)
- else:
-
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=dir_folder)
- return ok
+ cm.append(('Play '+playlist_name+'
PlayList','XBMC.RunPlugin(%s?mode=PP&name=%s&playlist=%s)' %(sys.argv[0],
playlist_name, urllib.quote_plus(str(playlist).replace(',','|')))))
+ liz.addContextMenuItems(cm)
+ return
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=dir_folder)
def
addLink(url,name,iconimage,fanart,description,genre,date,showcontext=True,playlist=None,
autoplay=False):
- return
addDir(name,url,12,iconimage,fanart,description,genre,date,showcontext,playlist,autoplay)
+ return
addDir(name,url,'SR',iconimage,fanart,description,genre,date,showcontext,playlist,autoplay)
+
-def play_video(video_url):
+def playVideo(video_url):
video_player_key = "AQ~~,AAACL1AyZ1k~,hYvoCrzvEtv6DS-0RQ1DkpOvkcvXlQ-g"
page_url = "http://www.i24news.tv/en/tv/replay/culture/3121368590001";
video_player_id = "2430996734001"
@@ -319,67 +293,30 @@ def get_swf_url(flash_experience_id, player_id,
publisher_id, video_id):
location = base.replace("BrightcoveBootloader.swf",
"federatedVideo/BrightcovePlayer.swf")
return location
+
# MAIN EVENT PROCESSING STARTS HERE
xbmcplugin.setContent(int(sys.argv[1]), 'movies')
-try:
- xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)
-except:
- pass
-try:
- xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_LABEL)
-except:
- pass
-try:
- xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_DATE)
-except:
- pass
-try:
- xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_GENRE)
-except:
- pass
-
-
-url=name=iconimage=mode=playlist=fchan=fres=fhost=fname=fepg=None
-
-_parse_argv()
-
-
-log("Mode: "+str(mode))
-if not url is None:
- try:
- log("URL: "+str(url.encode(UTF8)))
- except:
- pass
+parms = {}
try:
- log("Name: "+str(name))
+ parms = dict( arg.split( "=" ) for arg in ((sys.argv[2][1:]).split( "&" ))
)
+ for key in parms:
+ parms[key] = demunge(parms[key])
except:
- pass
-
-auto_play = False
-
-if mode==None:
- log("getSources")
- getSources('/en/tv/replay')
-
-elif mode==12:
- log("setResolvedUrl")
- item = xbmcgui.ListItem(path=url)
- xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, item)
+ parms = {}
-elif mode==13:
- log("play_playlist")
- play_playlist(name, playlist)
+p = parms.get
-elif mode==20:
- play_video(url)
+mode = p('mode',None)
-elif mode==21:
- getCategory(url)
+if mode== None: getSources('/en/tv/replay')
+elif mode=='SR': xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
xbmcgui.ListItem(path=p('url')))
+elif mode=='PP': play_playlist(p('name'), p('playlist'))
+elif mode=='GC': getCats(p('url'))
+elif mode=='PV': playVideo(p('url'))
+elif mode=='GX': getSources(p('url'))
-elif mode==25:
- getSources(url)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e498bf24c12cafed25f05827b3d45b7b6a8a6028
-----------------------------------------------------------------------
Summary of changes:
plugin.video.i24News/README.txt | 2 +
plugin.video.i24News/addon.xml | 6 +-
plugin.video.i24News/changelog.txt | 2 +
plugin.video.i24News/default.py | 153 +++++----------
.../LICENSE.txt | 0
plugin.video.npr/README.txt | 10 +
plugin.video.npr/addon.xml | 26 +++
plugin.video.npr/changelog.txt | 5 +
plugin.video.npr/default.py | 192 ++++++++++++++++++
plugin.video.npr/fanart.jpg | Bin 0 -> 638502 bytes
plugin.video.npr/icon.png | Bin 0 -> 59954 bytes
.../resources/language/English/strings.xml | 7 +
.../resources/settings.xml | 0
.../LICENSE.txt | 0
plugin.video.realtimetvitalia/addon.xml | 27 +++
plugin.video.realtimetvitalia/changelog.txt | 5 +
plugin.video.realtimetvitalia/default.py | 205 ++++++++++++++++++++
plugin.video.realtimetvitalia/icon.png | Bin 0 -> 14069 bytes
18 files changed, 529 insertions(+), 111 deletions(-)
copy {plugin.audio.abradio.cz => plugin.video.npr}/LICENSE.txt (100%)
create mode 100644 plugin.video.npr/README.txt
create mode 100644 plugin.video.npr/addon.xml
create mode 100644 plugin.video.npr/changelog.txt
create mode 100644 plugin.video.npr/default.py
create mode 100644 plugin.video.npr/fanart.jpg
create mode 100644 plugin.video.npr/icon.png
create mode 100644 plugin.video.npr/resources/language/English/strings.xml
copy {plugin.video.foodnetwork => plugin.video.npr}/resources/settings.xml
(100%)
copy {plugin.audio.hvsc => plugin.video.realtimetvitalia}/LICENSE.txt (100%)
create mode 100644 plugin.video.realtimetvitalia/addon.xml
create mode 100644 plugin.video.realtimetvitalia/changelog.txt
create mode 100644 plugin.video.realtimetvitalia/default.py
create mode 100644 plugin.video.realtimetvitalia/icon.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
