The branch, eden has been updated
via f6ddb678d550777d00f88d952312385b676a12bc (commit)
from 3508c982efc1664be9326dcb2314d99490ae0cae (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f6ddb678d550777d00f88d952312385b676a12bc
commit f6ddb678d550777d00f88d952312385b676a12bc
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date: Sat Aug 4 20:02:25 2012 +0200
[plugin.video.nasa] -v1.0.2
diff --git a/plugin.video.nasa/addon.py b/plugin.video.nasa/addon.py
index 158e23c..ea011f1 100644
--- a/plugin.video.nasa/addon.py
+++ b/plugin.video.nasa/addon.py
@@ -158,12 +158,13 @@ def search():
keyboard.doModal()
if keyboard.isConfirmed() and keyboard.getText():
query = keyboard.getText()
- log('search gots a string: "%s"' % query)
- Scraper = videos_scraper.Scraper()
- videos, count = Scraper.search_videos(query)
- items = __format_videos(videos)
- log('search end')
- return plugin.add_items(items)
+ if len(query) > 3:
+ log('search gots a string: "%s"' % query)
+ Scraper = videos_scraper.Scraper()
+ videos, count = Scraper.search_videos(query)
+ items = __format_videos(videos)
+ log('search end')
+ return plugin.add_items(items)
def __format_videos(videos):
diff --git a/plugin.video.nasa/addon.xml b/plugin.video.nasa/addon.xml
index 126a2cb..9056abc 100644
--- a/plugin.video.nasa/addon.xml
+++ b/plugin.video.nasa/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.nasa" name="Nasa Videos, TV and Vodcasts"
version="1.0.1" provider-name="Tristan Fischer (sph...@dersphere.de)">
+<addon id="plugin.video.nasa" name="Nasa Videos, TV and Vodcasts"
version="1.0.2" provider-name="Tristan Fischer (sph...@dersphere.de)">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.xbmcswift" version="0.2.0"/>
@@ -10,6 +10,7 @@
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
+ <language>en</language>
<platform>all</platform>
<summary lang="en">Video plugin to access content from nasa.gov</summary>
<description lang="en">This video plugin provides access to more than 1800
videos, 8 vodcasts and 4 nasa-tv livestreams[CR]All content is dynamic and
should be always up to date.</description>
diff --git a/plugin.video.nasa/changelog.txt b/plugin.video.nasa/changelog.txt
index 54ae09e..53f7dfb 100644
--- a/plugin.video.nasa/changelog.txt
+++ b/plugin.video.nasa/changelog.txt
@@ -1 +1,5 @@
-unreleased
+1.0.2
+ fix all live streams
+
+1.0.1
+ initial release
diff --git a/plugin.video.nasa/resources/lib/streams_scraper.py
b/plugin.video.nasa/resources/lib/streams_scraper.py
index eb11709..03a49bd 100644
--- a/plugin.video.nasa/resources/lib/streams_scraper.py
+++ b/plugin.video.nasa/resources/lib/streams_scraper.py
@@ -42,15 +42,14 @@ def __generate_rtmp(id):
response = urlopen(amf_url).read()
tc_url = re.search('rtmp://(.+?)\x00', response).group(1)
page_url = re.search('url\W\W\W(.+?)\x00', response).group(1)
+ playpath = re.search('streamName(?:\W+)([^\x00]+)', response).group(1)
if tc_url.count('/') > 1:
log('__generate_rtmp guessing rtmp without verification')
- playpath = 'streams/live'
app = tc_url.split('/', 1)[1]
- url = ('rtmp://%s playpath=%s pageUrl=%s app=%s live=1'
+ url = ('rtmp://%s playpath=%s
swfUrl=http://www.ustream.tv/flash/viewer.swf pageUrl=%s app=%s live=1'
% (tc_url, playpath, page_url, app))
else:
log('__generate_rtmp guessing rtmp with verification')
- playpath = re.search('streamName\W\W\W(.+?)\x00', response).group(1)
swf_url = urlopen('http://www.ustream.tv/flash/viewer.swf').geturl()
url = ('rtmp://%s playpath=%s swfUrl=%s pageUrl=%s swfVfy=1 live=1'
% (tc_url, playpath, swf_url, page_url))
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nasa/addon.py | 13 +++++++------
plugin.video.nasa/addon.xml | 3 ++-
plugin.video.nasa/changelog.txt | 6 +++++-
plugin.video.nasa/resources/lib/streams_scraper.py | 5 ++---
4 files changed, 16 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
