The branch, eden has been updated
via b482409121d0d2482300c9a8c7e11cd6ed7c84a7 (commit)
from c49f1bd9398c83feb5ff246d01e7c659b7602ed2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b482409121d0d2482300c9a8c7e11cd6ed7c84a7
commit b482409121d0d2482300c9a8c7e11cd6ed7c84a7
Author: beenje <[email protected]>
Date: Thu Aug 8 22:29:18 2013 +0200
[plugin.video.mlbmc] updated to version 1.1.7
diff --git a/plugin.video.mlbmc/addon.xml b/plugin.video.mlbmc/addon.xml
index bf397f5..2426bbc 100644
--- a/plugin.video.mlbmc/addon.xml
+++ b/plugin.video.mlbmc/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.mlbmc"
name="MLBMC"
- version="1.1.6"
+ version="1.1.7"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.mlbmc/changelog.txt b/plugin.video.mlbmc/changelog.txt
index 360dda0..fd9f0bd 100644
--- a/plugin.video.mlbmc/changelog.txt
+++ b/plugin.video.mlbmc/changelog.txt
@@ -1,3 +1,6 @@
+Version 1.1.7
+fix full count, mlb.com playlist
+
Version 1.1.6
fix website changes, condensed games, MLB.com playlist
fix 'identity error' after selecting a coverage type in MLB.TV
diff --git a/plugin.video.mlbmc/default.py b/plugin.video.mlbmc/default.py
index b2309fc..f49bb16 100644
--- a/plugin.video.mlbmc/default.py
+++ b/plugin.video.mlbmc/default.py
@@ -217,7 +217,7 @@ if mode==27:
xbmcplugin.endOfDirectory(int(sys.argv[1]))
if mode==28:
- mlb.get_playlist_cats()
+ mlb.get_playlist_cats(False, url)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
if mode==29:
diff --git a/plugin.video.mlbmc/resources/mlb.py
b/plugin.video.mlbmc/resources/mlb.py
index 7f22b6f..6b50651 100644
--- a/plugin.video.mlbmc/resources/mlb.py
+++ b/plugin.video.mlbmc/resources/mlb.py
@@ -16,7 +16,6 @@ from mlb_common import *
addon = xbmcaddon.Addon(id='plugin.video.mlbmc')
language = addon.getLocalizedString
-addon = xbmcaddon.Addon('plugin.video.mlbmc')
profile = xbmc.translatePath(addon.getAddonInfo('profile'))
home = xbmc.translatePath(addon.getAddonInfo('path'))
icon = os.path.join(home, 'icon.png')
@@ -86,15 +85,13 @@ def get_mlb_playlist(url, name=None):
''' mode 18-19, adds a directory of playlist categories '''
thumb = 'http://mlbmc-xbmc.googlecode.com/svn/icons/playlist.png'
if url == 'http://wapc.mlb.com/play':
- data = cache.cacheFunction(cache_playlist_categories)
- main_page = 'True'
- addDir(language(30013), 'main_topic', 24, thumb, main_page)
+ # data = cache.cacheFunction(cache_playlist_categories)
+ addDir(language(30013), 'main_topic', 24, thumb, 'True')
# add teams dir
addDir(language(30010), 'get_playlist', 4, thumb)
get_playlist_cats()
else:
data = cache_current_playlist(url)
- main_page = 'False'
if name:
try:
team = [i for i in TeamCodes.values() if i[0] == name][0]
@@ -102,7 +99,7 @@ def get_mlb_playlist(url, name=None):
team = None
if team:
addDir(language(30012), team[1], 20, thumb)
- addDir(language(30013), 'main_topic', 24, thumb, main_page)
+ addDir(language(30013), 'main_topic', 24, thumb, 'False')
get_playlist_cats(True, False)
@@ -124,8 +121,10 @@ def get_playlist_cats(current=False, subcat=False):
thumb = 'http://mlbmc-xbmc.googlecode.com/svn/icons/playlist.png'
if current:
data = eval(cache.get('current'))
+ subcat_mode = 29
else:
data = cache.cacheFunction(cache_playlist_categories)
+ subcat_mode = 28
if subcat:
try:
items = data['sub_categories'][subcat]
@@ -139,7 +138,7 @@ def get_playlist_cats(current=False, subcat=False):
addDir(title, item_id, 1, thumb)
if not subcat:
for i in data['sub_categories'].keys():
- addDir(i , i, 29, thumb)
+ addDir(i , i, subcat_mode, thumb)
def get_players(team_ab):
@@ -640,7 +639,6 @@ def getGames(url):
liz.setInfo( type="Video", infoLabels={ "Title": name } )
liz.setProperty( "Fanart_Image", fanart1 )
liz.setProperty('IsPlayable', 'true')
- #
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=False)
diff --git a/plugin.video.mlbmc/resources/mlbtv.py
b/plugin.video.mlbmc/resources/mlbtv.py
index 0a05b19..b9011d7 100644
--- a/plugin.video.mlbmc/resources/mlbtv.py
+++ b/plugin.video.mlbmc/resources/mlbtv.py
@@ -267,7 +267,11 @@ def
getGameURL(name,event,content,session,cookieIp,cookieFp,scenario,live):
else:
subject = 'LIVE_EVENT_COVERAGE'
url =
'https://secure.mlb.com/pubajaxws/bamrest/MediaService2_0/op-findUserVerifiedEvent/v-2.1?'
-
+
+ try:
+ cookieFp = urllib.unquote(cookieFp)
+ except AttributeError:
+ pass
values = {
'subject': subject,
'sessionKey': session,
@@ -275,7 +279,7 @@ def
getGameURL(name,event,content,session,cookieIp,cookieFp,scenario,live):
'contentId': content,
'playbackScenario': scenario,
'eventId': event,
- 'fingerprint': urllib.unquote(cookieFp),
+ 'fingerprint': cookieFp,
'platform':'WEB_MEDIAPLAYER'
}
@@ -295,6 +299,7 @@ def
getGameURL(name,event,content,session,cookieIp,cookieFp,scenario,live):
cookie_jar.load(cookie_file, ignore_discard=True,
ignore_expires=True)
cookie_jar.set_cookie(new_cookie)
cookie_jar.save(cookie_file, ignore_discard=True,
ignore_expires=True)
+ cookieFp = new_fprt
except AttributeError:
addon_log('No New Fingerprint')
diff --git a/plugin.video.mlbmc/resources/settings.xml
b/plugin.video.mlbmc/resources/settings.xml
index 75277e0..e4e9124 100644
--- a/plugin.video.mlbmc/resources/settings.xml
+++ b/plugin.video.mlbmc/resources/settings.xml
@@ -1,4 +1,4 @@
-<settings>
+ <settings>
<category label="General">
<setting id="show_scores" type="bool" label="30061" default="false"/>
<setting id="debug" type="bool" label="30059" default="false"/>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mlbmc/addon.xml | 2 +-
plugin.video.mlbmc/changelog.txt | 3 +++
plugin.video.mlbmc/default.py | 2 +-
plugin.video.mlbmc/resources/mlb.py | 14 ++++++--------
plugin.video.mlbmc/resources/mlbtv.py | 9 +++++++--
plugin.video.mlbmc/resources/settings.xml | 2 +-
6 files changed, 19 insertions(+), 13 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
