The branch, eden has been updated
via 433504ecec39855ff6c761a556788ea486129ac3 (commit)
via 2c2686572133074b86099d3f634e0fc0a11e45d4 (commit)
via 2fcce0d65c9bfeb7730fe309c2a7f3ea948860ae (commit)
from c88ae41315578cefef447d3da2a5b774738bc7d3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=433504ecec39855ff6c761a556788ea486129ac3
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2c2686572133074b86099d3f634e0fc0a11e45d4
commit 2c2686572133074b86099d3f634e0fc0a11e45d4
Author: spiff <[email protected]>
Date: Wed May 30 08:55:50 2012 +0200
[plugin.video.twit] updated to version 1.0.6
diff --git a/plugin.video.twit/addon.xml b/plugin.video.twit/addon.xml
index 06a82d4..570ab23 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="1.0.5"
+ version="1.0.6"
provider-name="divingmule,thanks to Adam B.">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -15,5 +15,6 @@
<summary>TWiT</summary>
<description>Videos from the TWiT Network</description>
<platform>all</platform>
+ <language>en</language>
</extension>
</addon>
diff --git a/plugin.video.twit/changelog.txt b/plugin.video.twit/changelog.txt
index 348c89d..f96e90a 100644
--- a/plugin.video.twit/changelog.txt
+++ b/plugin.video.twit/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.0.6
+fix for UnicodeDecodeError
+added Trey's Variety Hour
+
Version 1.0.5
fix for site changes
new playback settings
diff --git a/plugin.video.twit/default.py b/plugin.video.twit/default.py
index 41a11c7..bf54606 100644
--- a/plugin.video.twit/default.py
+++ b/plugin.video.twit/default.py
@@ -45,6 +45,7 @@ def categories():
addDir(__language__(30026),'http://twit.tv/show/this-week-in-radio-tech',1,'http://static.mediafly.com/publisher/images/ab7b2412afa84674971e4c93665d0e06/icon-600x600.png')
addDir(__language__(30036),'http://twit.tv/show/before-you-buy',1,'http://static.mediafly.com/publisher/images/dee7de4f87034d4d917ed446df3616e4/icon-600x600.png')
addDir(__language__(30037),'http://twit.tv/show/game-on',1,'http://static.mediafly.com/publisher/images/3f551d9b6ef9476fb76f92ccd4b37826/icon-600x600.png')
+
addDir(__language__(30042),'http://twit.tv/show/treys-variety-hour',1,'http://leoville.tv/podcasts/coverart/tvh300video.jpg')
def index(url,iconimage):
@@ -56,7 +57,7 @@ def index(url,iconimage):
items = soup.findAll('div', attrs={'class' :
'view-content'})[3]('div', attrs={'class' : 'field-content'})
for i in items:
url = i.a['href']
- name = i.a.string
+ name = i.a.string.encode('ascii', 'ignore')
try:
description = i.p.string
except:
@@ -113,6 +114,7 @@ def indexTwitFeed():
episode_name = re.compile('<div class="field-item
odd">(.+?)</div></div>').findall(item_str)[0]
if episode_name.startswith('<img'):
episode_name = re.compile('<div class="field-item
odd"><p>(.+?)</p><p>').findall(item_str)[0]
+ episode_name = episode_name.replace('&',
'&').replace('"', '"').replace(''', "'").encode('ascii', 'ignore')
except:
episode_name = ''
try:
@@ -127,7 +129,7 @@ def indexTwitFeed():
description = desc.replace('&', '&').replace('"',
'"').replace(''', "'")
except:
description = ''
- name = title+' - '+episode_name.replace('&',
'&').replace('"', '"').replace(''', "'")
+ name = title+' - '+episode_name
addLink(name, url, description, date, 4, thumb)
else: print '--- There was a problem adding episode %s ---' % title
diff --git a/plugin.video.twit/resources/language/English/strings.xml
b/plugin.video.twit/resources/language/English/strings.xml
index 4c26ebc..15c4dbe 100644
--- a/plugin.video.twit/resources/language/English/strings.xml
+++ b/plugin.video.twit/resources/language/English/strings.xml
@@ -42,4 +42,5 @@
<string id='30039'>Seems the video is not up yet. Play the audio?</string>
<string id='30040'>TWiT</string>
<string id='30041'>Audio TWiT.am/listen</string>
+ <string id='30042'>Trey's Variety Hour</string>
</strings>
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2fcce0d65c9bfeb7730fe309c2a7f3ea948860ae
commit 2fcce0d65c9bfeb7730fe309c2a7f3ea948860ae
Author: spiff <[email protected]>
Date: Wed May 30 08:53:06 2012 +0200
[plugin.video.mlbmc] updated to version 1.0.8
diff --git a/plugin.video.mlbmc/addon.xml b/plugin.video.mlbmc/addon.xml
index c4820ab..fb1e06e 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.0.7"
+ version="1.0.8"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -15,5 +15,6 @@
<summary>Videos from mlb.com, Live games for MLB.tv subscribers.</summary>
<description>Video highlights from MLB.com. MLb.tv subscribers can watch
the live and archived games. Usually there is a free game of the day witch only
requires a mlb.com account.</description>
<platform>all</platform>
+ <language>en</language>
</extension>
</addon>
diff --git a/plugin.video.mlbmc/changelog.txt b/plugin.video.mlbmc/changelog.txt
index 0f7290f..05da1c0 100644
--- a/plugin.video.mlbmc/changelog.txt
+++ b/plugin.video.mlbmc/changelog.txt
@@ -1,3 +1,6 @@
+Version 1.0.8
+added game highlights patch from bunglebungle -
http://forum.xbmc.org/showthread.php?tid=104391&pid=1109006#pid1109006
+
Version 1.0.7
added Full Count, a daily live show
added a time delay for todays games
diff --git a/plugin.video.mlbmc/default.py b/plugin.video.mlbmc/default.py
index 36cb290..58aaf6b 100644
--- a/plugin.video.mlbmc/default.py
+++ b/plugin.video.mlbmc/default.py
@@ -21,6 +21,7 @@
# * Everyone from the fourm - http://fourm.xbmc.org
# * giftie - for the colored text code :) thanks.
# * theophile and the others from -
http://forum.xbmc.org/showthread.php?t=97251
+# * bunglebungle for game highlights patch -
http://forum.xbmc.org/showthread.php?tid=104391&pid=1109006#pid1109006
import urllib
@@ -103,7 +104,7 @@ TeamCodes = {
def addon_log(string):
- xbmc.log( "[addon.mlbmc.1.0.7]: %s" %string )
+ xbmc.log( "[addon.mlbmc.1.0.8]: %s" %string )
def categories():
@@ -153,6 +154,9 @@ def condensedGames():
def gameHighlights():
thumb = 'http://mlbmc-xbmc.googlecode.com/svn/icons/highlights.png'
+ addGameDir(__language__(30010),dateStr.day[0],26,thumb)
+ addGameDir(__language__(30011),dateStr.day[1],26,thumb)
+ addGameDir(__language__(30012),dateStr.day[3],26,thumb)
addGameDir(__language__(30036),'8879838',1,thumb)
addGameDir(__language__(30037),'9781914',1,thumb)
addGameDir(__language__(30038),'10025018',1,thumb)
@@ -249,8 +253,11 @@ def getRequest(url, data=None, headers=None,
cookies=False):
return
elif hasattr(e, 'code'):
addon_log( 'We failed with error code - %s.' % e.code )
-
xbmc.executebuiltin("XBMC.Notification("+__language__(30015)+","+__language__(30019)+str(e.code)+",10000,"+icon+")")
- return
+ if 'highlights.xml' in url:
+ return
+ else:
+
xbmc.executebuiltin("XBMC.Notification("+__language__(30015)+","+__language__(30019)+str(e.code)+",10000,"+icon+")")
+ return
def get_podcasts(url):
@@ -274,7 +281,7 @@ def getTeams():
addPlaylist(name,url,5,'http://mlbmc-xbmc.googlecode.com/svn/icons/tvideo.png')
-def getRealtimeVideo(url):
+def getRealtimeVideo(url, addYes=True):
try:
soup = BeautifulStoneSoup(getRequest(url),
convertEntities=BeautifulStoneSoup.XML_ENTITIES)
videos = soup.findAll('media')
@@ -287,7 +294,8 @@ def getRealtimeVideo(url):
addLink(name,'http://mlb.mlb.com/gen/multimedia/detail/'+url+'.xml',duration,2,thumb)
except:
pass
-
addDir(__language__(30017),'http://gdx.mlb.com/components/game/mlb/'+dateStr.day[1]+'/media/highlights.xml',8,icon)
+ if addYes:
+
addDir(__language__(30017),'http://gdx.mlb.com/components/game/mlb/'+dateStr.day[1]+'/media/highlights.xml',8,icon)
def getTeamVideo(url):
@@ -402,7 +410,28 @@ def getCondensedGames(url):
addLink(name, url, '', 2,
'http://mlbmc-xbmc.googlecode.com/svn/icons/condensed.png')
except:
continue
+
+def getGameSpecificHighlights(dstr):
+ base = 'http://www.mlb.com/gdcross/components/game/mlb/'
+ thumb = 'http://mlbmc-xbmc.googlecode.com/svn/icons/highlights.png'
+ try:
+ data = json.loads(getRequest(base + dstr +'/grid.json'))
+ items = data['data']['games']['game']
+ for i in items:
+ try:
+ gameId = i['id']
+ gid = gameId.replace('/','_')
+ gid = gid.replace('-','_')
+ glbl = TeamCodes[i['away_team_id']][0] + ' @ ' +
TeamCodes[i['home_team_id']][0]
+ gurl = 'http://gdx.mlb.com/components/game/mlb/' + dstr +
'/gid_' + gid + '/media/highlights.xml'
+ addon_log( "gsh item: " + str(gid) + ', lbl: ' + glbl + ',
url:' + gurl )
+ addDir(glbl, gurl, 27, thumb)
+ except:
+ continue
+ except:
+ return
+
def getVideoListXml(url):
url = 'http://mlb.mlb.com'+url
@@ -910,8 +939,6 @@ def
getGameURL(name,event,content,session,cookieIp,cookieFp,scenario,live):
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, item)
-
-
def get_smil(url):
soup = BeautifulStoneSoup(getRequest(url))
base = soup.meta['base']
@@ -1182,4 +1209,10 @@ if mode==24:
if mode==25:
mlbGame(event, True)
+if mode==26:
+ getGameSpecificHighlights(url)
+
+if mode==27:
+ getRealtimeVideo(url, False)
+
xbmcplugin.endOfDirectory(int(sys.argv[1]))
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mlbmc/addon.xml | 3 +-
plugin.video.mlbmc/changelog.txt | 3 +
plugin.video.mlbmc/default.py | 47 +++++-
plugin.video.twit/addon.xml | 3 +-
plugin.video.twit/changelog.txt | 4 +
plugin.video.twit/default.py | 6 +-
.../resources/language/English/strings.xml | 1 +
.../LICENSE.txt | 0
plugin.video.watch.it.later/addon.xml | 21 +++
.../changelog.txt | 0
plugin.video.watch.it.later/default.py | 161 ++++++++++++++++++++
plugin.video.watch.it.later/icon.png | Bin 0 -> 20403 bytes
plugin.video.watch.it.later/removeFromPlaylist.py | 15 ++
.../resources/language/English/strings.xml | 18 +++
.../resources/language/German/strings.xml | 18 +++
.../resources/settings.xml | 9 +-
16 files changed, 293 insertions(+), 16 deletions(-)
copy {plugin.audio.abradio.cz => plugin.video.watch.it.later}/LICENSE.txt
(100%)
create mode 100644 plugin.video.watch.it.later/addon.xml
copy {plugin.audio.einslive_de => plugin.video.watch.it.later}/changelog.txt
(100%)
create mode 100644 plugin.video.watch.it.later/default.py
create mode 100644 plugin.video.watch.it.later/icon.png
create mode 100644 plugin.video.watch.it.later/removeFromPlaylist.py
create mode 100644
plugin.video.watch.it.later/resources/language/English/strings.xml
create mode 100644
plugin.video.watch.it.later/resources/language/German/strings.xml
copy {plugin.video.mtv_de =>
plugin.video.watch.it.later}/resources/settings.xml (54%)
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
