The branch, dharma-pre has been updated
via 0699809a0d66647e7a84844d712b92db8da596ff (commit)
via 89b183eec66dd7049dec19d2910a47e564e67811 (commit)
from 5b4d21de2de802e27cfe94791a43531112ae1a6c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0699809a0d66647e7a84844d712b92db8da596ff
commit 0699809a0d66647e7a84844d712b92db8da596ff
Author: spiff <[email protected]>
Date: Fri Nov 5 10:13:08 2010 +0100
[plugin.video.twit] updated to version 0.0.4
diff --git a/plugin.video.twit/addon.xml b/plugin.video.twit/addon.xml
index d58d2e4..6658902 100644
--- a/plugin.video.twit/addon.xml
+++ b/plugin.video.twit/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.twit"
name="TWiT"
- version="0.0.3"
+ version="0.0.4"
provider-name="divingmule,thanks to Adam B.">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.twit/changelog.txt b/plugin.video.twit/changelog.txt
index dabb5bc..a7ce11b 100644
--- a/plugin.video.twit/changelog.txt
+++ b/plugin.video.twit/changelog.txt
@@ -6,4 +6,7 @@ updated icon.png
Version 0.0.3
added release date to title
-added subtitle as plot
\ No newline at end of file
+added subtitle as plot
+
+Version 0.0.4
+fixed an issue with TNT
\ No newline at end of file
diff --git a/plugin.video.twit/default.py b/plugin.video.twit/default.py
index fb7056b..3fde4f9 100644
--- a/plugin.video.twit/default.py
+++ b/plugin.video.twit/default.py
@@ -32,17 +32,18 @@ def INDEX(url):
response = urllib2.urlopen(req)
link=response.read()
response.close()
+ link=link.replace('&','&')
match=re.compile('url="(.+?)" fileSize=".+?" type="video/mp4"
medium="video" bitrate="1000" framerate="29.97" samplingrate="48" channels="1"
duration=".+?" width="864" height="480" mediafly:profile="H264b_864x480_1000"
/>\n').findall(link)
name=re.compile('<title>(.+?)</title>\n').findall(link)
-
plot=re.compile('<itunes:subtitle>(.+?)</itunes:subtitle>\n').findall(link)
+
desc=re.compile('<itunes:subtitle>(.+?)</itunes:subtitle>\n').findall(link)
date=re.compile('<pubDate>(.+?)</pubDate>\n').findall(link)
icon=re.compile('<img src="(.+?)"').findall(link)
- del name[0];del name[0];del plot[0];del date[0] # The first two strings
do not apply.
+ del name[0];del name[0];del desc[0];del date[0] # The first two strings
do not apply.
for index in range(len(match)):
- if len(match) == len(icon):
-
addLink(name[index],match[index],plot[index],date[index],icon[index])
+ if len(match) == len(desc) == len(icon):
+
addLink(name[index],match[index],desc[index],date[index],icon[index])
else:
-
addLink(name[index],match[index],plot[index],date[index],'')
+ addLink(name[index],match[index],'',date[index],'')
def get_params():
@@ -66,10 +67,11 @@ def get_params():
-def addLink(name,url,plot,date,iconimage):
+def addLink(name,url,desc,date,iconimage):
ok=True
- liz=xbmcgui.ListItem(name+' '+date, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
- liz.setInfo( type="Video", infoLabels={ "Title":name,"Plot":plot } )
+ liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
+ description = desc + "\n \n Published: " + date
+ liz.setInfo( type="Video", infoLabels={ "Title":
name,"Plot":description,"Date": date } )
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)
return ok
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=89b183eec66dd7049dec19d2910a47e564e67811
commit 89b183eec66dd7049dec19d2910a47e564e67811
Author: spiff <[email protected]>
Date: Fri Nov 5 10:12:29 2010 +0100
[plugin.video.funny.or.die] updated to version 0.0.3
diff --git a/plugin.video.funny.or.die/addon.xml
b/plugin.video.funny.or.die/addon.xml
index dce7a3f..8bc1962 100644
--- a/plugin.video.funny.or.die/addon.xml
+++ b/plugin.video.funny.or.die/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.funny.or.die"
name="Funny or Die"
- version="0.0.2"
+ version="0.0.3"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.funny.or.die/default.py
b/plugin.video.funny.or.die/default.py
index e6bf49c..75eb48e 100644
--- a/plugin.video.funny.or.die/default.py
+++ b/plugin.video.funny.or.die/default.py
@@ -1,4 +1,5 @@
import urllib,urllib2,re,xbmcplugin,xbmcgui,xbmcaddon
+from BeautifulSoup import BeautifulSoup
__settings__ = xbmcaddon.Addon(id='plugin.video.funny.or.die')
__language__ = __settings__.getLocalizedString
@@ -29,10 +30,10 @@ def INDEX(url):
response = urllib2.urlopen(req)
link=response.read()
response.close()
- link=link.replace('"','"').replace('&','&')
+
link=link.replace('"','"').replace('&','&').replace('medium_','fullsize_')
match=re.compile('<a href="/videos/(.+?)/.+?" class=".+?"
title=".+?"><img alt=".+?" class=".+?" height="90" src="(.+?)" title="(.+?)"
width="124" />').findall(link)
for url,thumbnail,name in match:
-
addLink(name,'http://videos0.ordienetworks.com/videos/'+url+'/sd.flv',thumbnail)
+ addDir(name, str(url), 2, thumbnail, False)
page=re.compile('Previous</span>.+?<span class="current">.+?</span> <a
href="(.+?)" rel="next">.+?</a>').findall(link)
if len(page)<1:
page=re.compile('Previous</a> <a href=".+?" rel="prev
start">.+?</a> <span class="current">.+?</span> <a href="(.+?)"
rel="next">.+?</a>').findall(link)
@@ -41,7 +42,31 @@ def INDEX(url):
for url in page:
addDir('Next Page','http://www.funnyordie.com'+url,1,'')
-
+def playVid(url):
+ name, url = get_smil(url)
+ info = xbmcgui.ListItem(name)
+ playlist = xbmc.PlayList(1)
+ playlist.clear()
+ playlist.add(url, info)
+ play=xbmc.Player().play(playlist)
+
+def get_smil(id):
+ req = urllib2.Request("http://www.funnyordie.com/player/"+id+"?v=3";)
+ response = urllib2.urlopen(req)
+ smil = response.read()
+ response.close()
+ soup = BeautifulSoup(smil)
+ title = soup.find('title').string
+ stream_list = soup.findAll('stream')
+ if len(stream_list) < 1:
+ stream = soup.find('location').contents[0]
+ return title, stream
+ streams = []
+ for stream in stream_list:
+ streams.append(stream.file.contents[0])
+ #if xbmcplugin.getSetting("hi-def") == "true":
+ return title, streams[0]
+
def get_params():
param=[]
paramstring=sys.argv[2]
@@ -60,21 +85,12 @@ def get_params():
return param
-
-def addLink(name,url,iconimage):
- ok=True
- liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
- liz.setInfo( type="Video", infoLabels={ "Title": name, } )
-
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)
- return ok
-
-
-def addDir(name,url,mode,iconimage):
+def addDir(name,url,mode,iconimage,isfolder=True):
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)
ok=True
liz=xbmcgui.ListItem(name, iconImage="DefaultFolder.png",
thumbnailImage=iconimage)
liz.setInfo( type="Video", infoLabels={ "Title": name } )
-
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
+
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=isfolder)
return ok
@@ -108,4 +124,8 @@ elif mode==1:
print ""+url
INDEX(url)
+elif mode==2:
+ print "NEW LINK: "+url
+ playVid(url)
+
xbmcplugin.endOfDirectory(int(sys.argv[1]))
-----------------------------------------------------------------------
Summary of changes:
plugin.video.funny.or.die/addon.xml | 2 +-
plugin.video.funny.or.die/changelog.txt | 9 ++++++
plugin.video.funny.or.die/default.py | 48 ++++++++++++++++++++++---------
plugin.video.twit/addon.xml | 2 +-
plugin.video.twit/changelog.txt | 5 ++-
plugin.video.twit/default.py | 18 ++++++-----
6 files changed, 59 insertions(+), 25 deletions(-)
create mode 100644 plugin.video.funny.or.die/changelog.txt
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
