The branch, frodo has been updated
via 9fc30768b9ef07375a53d3290c0b7368040f7f41 (commit)
via d135210691774e24c94659b357d2aefa83f7adbc (commit)
via 1d29fbba5cd11a078e6a4a6ce6d7217c3338eb8f (commit)
via 74fea67d8fd6fcce0fe6761ff9710909b8b16c6d (commit)
from 11ed6e465f8efe6ea385234524add6b35ce8dc40 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9fc30768b9ef07375a53d3290c0b7368040f7f41
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d135210691774e24c94659b357d2aefa83f7adbc
commit d135210691774e24c94659b357d2aefa83f7adbc
Author: beenje <[email protected]>
Date: Fri Apr 26 22:24:05 2013 +0200
[plugin.video.itbn_org] updated to version 1.2.0
diff --git a/plugin.video.itbn_org/addon.xml b/plugin.video.itbn_org/addon.xml
index fa35f09..b81a417 100644
--- a/plugin.video.itbn_org/addon.xml
+++ b/plugin.video.itbn_org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.itbn_org"
- version="1.1.6"
+ version="1.2.0"
name="iTBN"
provider-name="Romans I XVI"
>
diff --git a/plugin.video.itbn_org/changelog.txt
b/plugin.video.itbn_org/changelog.txt
index 9d352e0..c37fb86 100644
--- a/plugin.video.itbn_org/changelog.txt
+++ b/plugin.video.itbn_org/changelog.txt
@@ -7,4 +7,8 @@ Version 1.1.5
-fixed minor bug in name listing
Version 1.1.6
--cleaned up some bits of code
\ No newline at end of file
+-cleaned up some bits of code
+
+version 1.2.0
+-Removed the extra "Play Video" button before loading video.
+-All live streams now play in HD
\ No newline at end of file
diff --git a/plugin.video.itbn_org/default.py b/plugin.video.itbn_org/default.py
index acad367..e4bc4e4 100644
--- a/plugin.video.itbn_org/default.py
+++ b/plugin.video.itbn_org/default.py
@@ -1,4 +1,4 @@
-import urllib,urllib2,re,xbmcplugin,xbmcgui,os,xbmcaddon
+import urllib,urllib2,re,xbmcplugin,xbmcgui,os,xbmcaddon,sys
settings = xbmcaddon.Addon( id = 'plugin.video.itbn_org' )
next_thumb = os.path.join( settings.getAddonInfo( 'path' ), 'resources',
'media', 'nextpage.png' )
@@ -92,11 +92,15 @@ def GETSOURCE(url,name):
response.close()
match=re.compile('"is_source":true,"file_size":.+?,"audio_codec":".+?","video_codec":".+?","average_video_bitrate":.+?,"stream_type":"single","url":"(.+?)"').findall(link)
match = [w.replace('\\', '') for w in match]
+ liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage='')
+ liz.setInfo( type="Video", infoLabels={ "Title": name } )
for url in match:
- addLink('Play Video',url,'')
- if 1==1:
- xbmc.executebuiltin('Container.SetViewMode(50)')
-
+ xbmc.Player().play(url,liz)
+ xbmc.sleep(2500)
+ while xbmc.Player().isPlaying():
+ xbmc.sleep(250)
+ xbmc.Player().stop()
+ sys.exit()
def CATEGORIES(url):
addDir('Faith
Issues','http://www.tbn.org/watch/mobile_app/v3/itbnapi.php',4,'')
@@ -186,7 +190,7 @@ def LIVE(url):
response = urllib2.urlopen(req)
link=response.read()
response.close()
- match=re.compile('\"andsuperstreamurl\":\"(.+?)\"').findall(link)
+ match='rtmp://cp114430.live.edgefcs.net/live/
playpath=tbn_mbr_600@101613 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114428.live.edgefcs.net/live/
playpath=churchch_mbr_600@101620 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114432.live.edgefcs.net/live/
playpath=jctv_mbr_600@101615 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114426.live.edgefcs.net/live/
playpath=soac_mbr_600@101622 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114434.live.edgefcs.net/live/
playpath=enlace_mbr_600@101618 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114436.live.edgefcs.net/live/
playpath=enlacejuvenil_800@102106 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129063.live.edgefcs.net/live/
playpath=nejat_mbr_600@101623 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129064.live.edgefcs.net/live/
playpath=healing_mbr_600@101624 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129065.live.edgefcs.net/live/
playpath=tbnrussia-high@58776 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129066.live.edgefcs.net/live/
playpath=soacrussia-high@58777 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn/
playpath=juce_super.sdp
live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn_repeater/
playpath=tbnafrica.stream live=true'
title=re.compile('\"name\":\"(.+?)\"').findall(link)
thumbnail=re.compile('\"icon\":\"(.+?)\"').findall(link)
mylist=zip((match),(title),(thumbnail))
@@ -378,7 +382,6 @@ def get_params():
return param
-
def addLink(name,url,iconimage):
ok=True
liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
@@ -386,13 +389,12 @@ def addLink(name,url,iconimage):
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)
return ok
-
def addDir(name,url,mode,iconimage):
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)
+
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
return ok
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1d29fbba5cd11a078e6a4a6ce6d7217c3338eb8f
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=74fea67d8fd6fcce0fe6761ff9710909b8b16c6d
commit 74fea67d8fd6fcce0fe6761ff9710909b8b16c6d
Author: beenje <[email protected]>
Date: Fri Apr 26 22:22:29 2013 +0200
[plugin.video.tagesschauvideoblog] updated to version 0.1.1
diff --git a/plugin.video.tagesschauvideoblog/README.md
b/plugin.video.tagesschauvideoblog/README.md
index c22fc54..fa1b0fa 100644
--- a/plugin.video.tagesschauvideoblog/README.md
+++ b/plugin.video.tagesschauvideoblog/README.md
@@ -6,7 +6,7 @@ xbmc-plugin-tagesschauvideoblogs
License
=======
-The code is under GPLv3. See
[LICENSE](https://github.com/fisch42/xbmc-plugin-tageschauvideoblogs/blob/master/LICENSE.txt)
for more details.
+The code is under GPLv3. See
[LICENSE](https://github.com/fisch42/xbmc-plugin-tagesschauvideoblogs/blob/master/LICENSE.txt)
for more details.
We used the following extra software:
* [feedparser Addon](https://github.com/dersphere/script.module.feedparser),
packaged by [Tristan Fischer](https://github.com/dersphere) and written by
[Mark Pilgrim and Kurt McKee under MIT
License](https://github.com/dersphere/script.module.feedparser/blob/master/LICENSE.txt)
diff --git a/plugin.video.tagesschauvideoblog/addon.py
b/plugin.video.tagesschauvideoblog/addon.py
index df65a89..7d35dff 100644
--- a/plugin.video.tagesschauvideoblog/addon.py
+++ b/plugin.video.tagesschauvideoblog/addon.py
@@ -28,7 +28,7 @@ tagesschauURL = 'http://www.tagesschau.de/'
h264regexp = re.compile('http:\/\/[^"]+webl\.h264\.mp4')
videoregexp = re.compile(re.escape(tagesschauURL)+'videoblog\/[^"]+')
-blogsregexp = re.compile('leftNavL2(.*)sendungenLeft',
re.MULTILINE|re.DOTALL)
+blogsregexp = re.compile('leftNavL3(.*)sendungenLeft',
re.MULTILINE|re.DOTALL)
blogurlregexp = re.compile('a href="(\/videoblog\/[^"]+)"')
blogtitleregexp = re.compile('i2">([^<]+)<')
entriesregexp = re.compile('<h2><a[^>]href="\/([^"]+)[^>]+title="([^"]+)')
@@ -113,49 +113,58 @@ def index():
@plugin.route('/newest/')
def show_newest():
- feed = feedparser.parse('http://meta.tagesschau.de/tag/videoblog/feed')
- items = []
- for entry in feed.entries:
- item = {
- 'label': parseTitle(entry.title),
- 'path':
getH264Video(getVideoPageUrl(entry.description)),
- 'is_playable': True
- }
- if item['path'] == None:
- continue
- items.append(item)
-
- return items
+ try:
+ feed =
feedparser.parse('http://meta.tagesschau.de/tag/videoblog/feed')
+ items = []
+ for entry in feed.entries:
+ item = {
+ 'label': parseTitle(entry.title),
+ 'path':
getH264Video(getVideoPageUrl(entry.description)),
+ 'is_playable': True
+ }
+ if item['path'] == None:
+ continue
+ items.append(item)
+
+ return items
+ except:
+ return []
@plugin.route('/blogs/')
def show_all():
- items = []
- blogs = getBlogs()
- for blog in blogs:
- item = {
- 'label': blog['title'],
- 'path': plugin.url_for('show_blog',
blog=urllib.quote(blog['url']))
- }
- items.append(item)
-
- return items
+ try:
+ items = []
+ blogs = getBlogs()
+ for blog in blogs:
+ item = {
+ 'label': blog['title'],
+ 'path': plugin.url_for('show_blog',
blog=urllib.quote(blog['url']))
+ }
+ items.append(item)
+
+ return items
+ except:
+ return []
@plugin.route('/blogs/<blog>')
def show_blog(blog):
- items = []
- url = urllib.unquote(blog)
- entries = getEntries(url)
- for entry in entries:
- item = {
- 'label': entry['title'],
- 'path': getH264Video(entry['url']),
- 'icon': entry['teaser'],
- 'is_playable': True
- }
- if item['path'] == None:
- continue
- items.append(item)
- return items
+ try:
+ items = []
+ url = urllib.unquote(blog)
+ entries = getEntries(url)
+ for entry in entries:
+ item = {
+ 'label': entry['title'],
+ 'path': getH264Video(entry['url']),
+ 'icon': entry['teaser'],
+ 'is_playable': True
+ }
+ if item['path'] == None:
+ continue
+ items.append(item)
+ return items
+ except:
+ return []
if __name__ == '__main__':
plugin.run()
diff --git a/plugin.video.tagesschauvideoblog/addon.xml
b/plugin.video.tagesschauvideoblog/addon.xml
index c4e21ea..93b34f4 100644
--- a/plugin.video.tagesschauvideoblog/addon.xml
+++ b/plugin.video.tagesschauvideoblog/addon.xml
@@ -15,7 +15,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<addon id="plugin.video.tagesschauvideoblog" name="Tagesschau Videoblog"
version="0.1.0" provider-name="Fiona Schmidtke, Niclas Hoyer">
+<addon id="plugin.video.tagesschauvideoblog" name="Tagesschau Videoblog"
version="0.1.1" provider-name="Fiona Schmidtke, Niclas Hoyer">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcswift2" version="2.4.0"/>
@@ -27,6 +27,9 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<language>de</language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+
<website>https://github.com/fisch42/xbmc-plugin-tagesschauvideoblogs</website>
+
<source>https://github.com/fisch42/xbmc-plugin-tagesschauvideoblogs</source>
<summary lang="de">tagesschau.de Videoblog</summary>
<summary lang="en">videoblogs from tagesschau.de</summary>
<description lang="de">Die Videoblogs der ARD-Korrespondenten auf
tagesschau.de</description>
diff --git a/plugin.video.tagesschauvideoblog/changelog.txt
b/plugin.video.tagesschauvideoblog/changelog.txt
index a6bf87b..152055a 100644
--- a/plugin.video.tagesschauvideoblog/changelog.txt
+++ b/plugin.video.tagesschauvideoblog/changelog.txt
@@ -1,2 +1,6 @@
version 0.1.0:
* initial version
+
+
+version 0.1.1:
+ * fixed errors after changes on tagesschau.de
-----------------------------------------------------------------------
Summary of changes:
plugin.video.itbn_org/addon.xml | 2 +-
plugin.video.itbn_org/changelog.txt | 6 +-
plugin.video.itbn_org/default.py | 20 ++-
plugin.video.pixel.tv/.idea/modules.xml | 11 ++
.../.idea/plugin.video.pixel.tv.iml | 11 ++
.../.idea/scopes/scope_settings.xml | 5 +
.../LICENSE.txt | 0
plugin.video.pixel.tv/addon.py | 166 ++++++++++++++++++++
plugin.video.pixel.tv/addon.xml | 22 +++
plugin.video.pixel.tv/changelog.txt | 16 ++
plugin.video.pixel.tv/fanart.jpg | Bin 0 -> 80273 bytes
plugin.video.pixel.tv/icon.png | Bin 0 -> 47646 bytes
.../resources/language/Danish/strings.xml | 4 +
.../resources/language/English/strings.xml | 4 +
.../LICENSE.txt | 0
plugin.video.retro_tv/addon.xml | 18 ++
plugin.video.retro_tv/changelog.txt | 4 +
plugin.video.retro_tv/default.py | 106 +++++++++++++
plugin.video.retro_tv/fanart.jpg | Bin 0 -> 33376 bytes
plugin.video.retro_tv/icon.png | Bin 0 -> 15095 bytes
.../resources/language/English/strings.xml | 7 +
.../resources/language/German/strings.xml | 7 +
plugin.video.retro_tv/resources/settings.xml | 4 +
plugin.video.tagesschauvideoblog/README.md | 2 +-
plugin.video.tagesschauvideoblog/addon.py | 85 ++++++-----
plugin.video.tagesschauvideoblog/addon.xml | 5 +-
plugin.video.tagesschauvideoblog/changelog.txt | 4 +
27 files changed, 458 insertions(+), 51 deletions(-)
create mode 100644 plugin.video.pixel.tv/.idea/modules.xml
create mode 100644 plugin.video.pixel.tv/.idea/plugin.video.pixel.tv.iml
create mode 100644 plugin.video.pixel.tv/.idea/scopes/scope_settings.xml
copy {plugin.audio.abradio.cz => plugin.video.pixel.tv}/LICENSE.txt (100%)
create mode 100644 plugin.video.pixel.tv/addon.py
create mode 100644 plugin.video.pixel.tv/addon.xml
create mode 100644 plugin.video.pixel.tv/changelog.txt
create mode 100644 plugin.video.pixel.tv/fanart.jpg
create mode 100644 plugin.video.pixel.tv/icon.png
create mode 100644 plugin.video.pixel.tv/resources/language/Danish/strings.xml
create mode 100644 plugin.video.pixel.tv/resources/language/English/strings.xml
copy {plugin.audio.booksshouldbefree_com => plugin.video.retro_tv}/LICENSE.txt
(100%)
create mode 100644 plugin.video.retro_tv/addon.xml
create mode 100644 plugin.video.retro_tv/changelog.txt
create mode 100644 plugin.video.retro_tv/default.py
create mode 100644 plugin.video.retro_tv/fanart.jpg
create mode 100644 plugin.video.retro_tv/icon.png
create mode 100644 plugin.video.retro_tv/resources/language/English/strings.xml
create mode 100644 plugin.video.retro_tv/resources/language/German/strings.xml
create mode 100644 plugin.video.retro_tv/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
