The branch, frodo has been updated
via 2124027dffdb2116f59e915b6ed09d059446feb5 (commit)
from 3500c91721f2de2b1fa4a22ffaa3f5426fd80936 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2124027dffdb2116f59e915b6ed09d059446feb5
commit 2124027dffdb2116f59e915b6ed09d059446feb5
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date: Sun May 18 12:39:07 2014 +0200
[plugin.video.mlslive] 1.0.9
diff --git a/plugin.video.mlslive/addon.xml b/plugin.video.mlslive/addon.xml
index 80eff2d..ad4515c 100644
--- a/plugin.video.mlslive/addon.xml
+++ b/plugin.video.mlslive/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.mlslive" name="MLS Live" version="1.0.8"
provider-name="Micah Galizia">
+<addon id="plugin.video.mlslive" name="MLS Live" version="1.0.9"
provider-name="Micah Galizia">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/plugin.video.mlslive/changelog.txt
b/plugin.video.mlslive/changelog.txt
index 1301cc3..d714995 100644
--- a/plugin.video.mlslive/changelog.txt
+++ b/plugin.video.mlslive/changelog.txt
@@ -1,3 +1,9 @@
+[B]Version 1.0.9[/B]
+
+- don't preload live or upcoming match URIs (should be faster)
+- add error when no stream can be found for live or preloaded matches
+- add state for half-time in the game title
+
[B]Version 1.0.8[/B]
- don't simplify m3u8 URL because it causes problems with authentication
diff --git a/plugin.video.mlslive/default.py b/plugin.video.mlslive/default.py
index eef3498..e78bae7 100644
--- a/plugin.video.mlslive/default.py
+++ b/plugin.video.mlslive/default.py
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
'''
-import xbmcplugin, xbmcgui, xbmcaddon, urllib, urlparse, mlslive
+import xbmc, xbmcplugin, xbmcgui, xbmcaddon, urllib, urlparse, mlslive
__settings__ = xbmcaddon.Addon(id='plugin.video.mlslive')
__language__ = __settings__.getLocalizedString
@@ -139,18 +139,11 @@ def createWeekMenu(my_mls, values_string,
final_only=True):
else:
li = xbmcgui.ListItem(game_str)
- if my_mls.isGameLive(game):
- stream = my_mls.getGameLiveStream(game['gameID'])
-
- li.setInfo( type="Video", infoLabels={"Title" : game_str})
- xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
- url=stream,
- listitem=li,
- isFolder=False)
- elif my_mls.isGameUpcoming(game):
+ if my_mls.isGameLive(game) or my_mls.isGameUpcoming(game):
li.setInfo( type="Video", infoLabels={"Title" : game_str})
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
- url="",
+ url=sys.argv[0] + "?" +
urllib.urlencode({'game' : game['gameID'],
+
'title' : game_str }),
listitem=li,
isFolder=False)
else:
@@ -246,4 +239,16 @@ elif sys.argv[2][:3] == '?id':
createFinalMenu(my_mls, sys.argv[2][1:])
elif sys.argv[2][:5] == '?week':
createWeekMenu(my_mls, sys.argv[2][1:])
-
+elif sys.argv[2][:5] == "?game":
+ values = urlparse.parse_qs(sys.argv[2][1:])
+ game = values['game'][0]
+ title = values['title'][0]
+ stream = my_mls.getGameLiveStream(game)
+ if stream == '':
+ dialog = xbmcgui.Dialog()
+ dialog.ok(__language__(30015), __language__(30016))
+ else:
+ li = xbmcgui.ListItem(title)
+ li.setInfo( type="Video", infoLabels={"Title" : title})
+ p = xbmc.Player()
+ p.play(stream, li)
diff --git a/plugin.video.mlslive/mlslive.py b/plugin.video.mlslive/mlslive.py
index 53e1918..ecfc33f 100644
--- a/plugin.video.mlslive/mlslive.py
+++ b/plugin.video.mlslive/mlslive.py
@@ -289,7 +289,8 @@ class MLSLive:
game_str = game['visitorTeamName'] + " " + separator + " " + \
game['homeTeamName']
- if game['gameStatus'] == 'FINAL' or game['gameStatus'][:4] == 'LIVE':
+ if game['gameStatus'] == 'FINAL' or game['gameStatus'][:4] == 'LIVE'
or \
+ game['gameStatus'] == 'HALF':
game_str += ' (' + game['gameStatus'].title() + ')'
else:
game_str += ' (' + self.getGameDateTimeStr(game['gameDateTime']) +
')'
diff --git a/plugin.video.mlslive/resources/language/English/strings.xml
b/plugin.video.mlslive/resources/language/English/strings.xml
index 11b4b25..b07630a 100644
--- a/plugin.video.mlslive/resources/language/English/strings.xml
+++ b/plugin.video.mlslive/resources/language/English/strings.xml
@@ -16,4 +16,6 @@
<string id="30012">Video Channels</string>
<string id="30013">User Name</string>
<string id="30014">Password</string>
+ <string id="30015">Playback failure</string>
+ <string id="30016">Unable to get stream address</string>
</strings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mlslive/addon.xml | 2 +-
plugin.video.mlslive/changelog.txt | 6 ++++
plugin.video.mlslive/default.py | 29 +++++++++++--------
plugin.video.mlslive/mlslive.py | 3 +-
.../resources/language/English/strings.xml | 2 +
5 files changed, 28 insertions(+), 14 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
