The branch, dharma has been updated
via 22267967774c0f8ff472f91c739f6b4a23d2f96c (commit)
via d3d9bd903b0af73596f62777363ed99cc1b5ff0e (commit)
from 989d000a0cd01f5a23ec9c81c119733e2ed2a6ed (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=22267967774c0f8ff472f91c739f6b4a23d2f96c
commit 22267967774c0f8ff472f91c739f6b4a23d2f96c
Author: spiff <[email protected]>
Date: Mon Apr 9 11:52:55 2012 +0200
[plugin.video.mlbmc] updated to version 0.0.8
diff --git a/plugin.video.mlbmc/addon.xml b/plugin.video.mlbmc/addon.xml
index 701fa7f..25416dd 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="0.0.7"
+ version="0.0.8"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.mlbmc/changelog.txt b/plugin.video.mlbmc/changelog.txt
index bfc0823..21df3d4 100644
--- a/plugin.video.mlbmc/changelog.txt
+++ b/plugin.video.mlbmc/changelog.txt
@@ -1,3 +1,6 @@
+Version 0.0.8
+fix for condensed games
+
Version 0.0.7
fixes and updates for the start of 2012 season
added initial support for Gameday Audio
diff --git a/plugin.video.mlbmc/default.py b/plugin.video.mlbmc/default.py
index 2c8b7f1..78824fc 100644
--- a/plugin.video.mlbmc/default.py
+++ b/plugin.video.mlbmc/default.py
@@ -102,7 +102,7 @@ TeamCodes = {
def addon_log(string):
- xbmc.log( "[addon.mlbmc.0.0.7]: %s" %string )
+ xbmc.log( "[addon.mlbmc.0.0.8]: %s" %string )
def categories():
@@ -141,11 +141,11 @@ def mlbTV():
def condensedGames():
- base = 'http://www.mlb.com/mediacenter/index.jsp?ymd='
+ base = 'http://www.mlb.com/gdcross/components/game/mlb/'
thumb = 'http://mlbmc-xbmc.googlecode.com/svn/icons/condensed.png'
-
addGameDir(__language__(30010),base+str(dateStr.today).replace('-',''),13,thumb)
-
addGameDir(__language__(30011),base+str(dateStr.yesterday).replace('-',''),13,thumb)
-
addGameDir(__language__(30012),base+str(dateStr.byesterday).replace('-',''),13,thumb)
+
addGameDir(__language__(30010),base+dateStr.day[0]+'/grid.json',13,thumb)
+
addGameDir(__language__(30011),base+dateStr.day[1]+'/grid.json',13,thumb)
+
addGameDir(__language__(30012),base+dateStr.day[3]+'/grid.json',13,thumb)
addGameDir(__language__(30014),'',15,'http://mlbmc-xbmc.googlecode.com/svn/icons/condensed.png')
@@ -388,17 +388,18 @@ def getVideoURL(url):
def getCondensedGames(url):
- soup = BeautifulSoup(getRequest(url),
convertEntities=BeautifulSoup.HTML_ENTITIES)
- videos = soup.findAll('tbody')[0]('tr')
- for video in videos:
+ data = json.loads(getRequest(url))
+ items = data['data']['games']['game']
+ for i in items:
try:
- name = video('td', attrs={'class' : "mmg_matchup"})[0].string
- content = video('td', attrs={'class' :
"mmg_condensed"})[0]('a')[0]['href'][-8:]
- content_id =
content[-3]+'/'+content[-2]+'/'+content[-1]+'/'+content
- url =
'http://mlb.mlb.com/gen/multimedia/detail/'+content_id+'.xml'
-
addLink(name,url,'',2,'http://mlbmc-xbmc.googlecode.com/svn/icons/condensed.png')
+ if i['game_media']['newsroom']['media']['type'] ==
'condensed_video':
+ content = i['game_media']['newsroom']['media']['id']
+ content_id =
content[-3]+'/'+content[-2]+'/'+content[-1]+'/'+content
+ url =
'http://mlb.mlb.com/gen/multimedia/detail/'+content_id+'.xml'
+ name = TeamCodes[i['away_team_id']][0] + ' @ ' +
TeamCodes[i['home_team_id']][0]
+ addLink(name, url, '', 2,
'http://mlbmc-xbmc.googlecode.com/svn/icons/condensed.png')
except:
- pass
+ continue
def getVideoListXml(url):
@@ -1077,8 +1078,8 @@ if mode==14:
condensedGames()
if mode==15:
- url = 'http://www.mlb.com/mediacenter/index.jsp?ymd='+\
-
getDate().split('/',7)[7].replace('/master_scoreboard.json','').replace('year_','').replace('/month_','').replace('/day_','')
+ url = 'http://www.mlb.com/gdcross/components/game/mlb/'+\
+ getDate().split('/',7)[7].replace('/master_scoreboard.json','/grid.json')
getCondensedGames(url)
if mode==16:
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d3d9bd903b0af73596f62777363ed99cc1b5ff0e
commit d3d9bd903b0af73596f62777363ed99cc1b5ff0e
Author: spiff <[email protected]>
Date: Mon Apr 9 11:46:57 2012 +0200
[plugin.video.jupiterbroadcasting] updated to version 1.6.0
diff --git a/plugin.video.jupiterbroadcasting/README.md
b/plugin.video.jupiterbroadcasting/README.md
index e68fbde..084a19f 100644
--- a/plugin.video.jupiterbroadcasting/README.md
+++ b/plugin.video.jupiterbroadcasting/README.md
@@ -6,8 +6,9 @@ Shows
-----
* [Live Show](http://jblive.tv)
* Linux Action Show
-* STOked
* TechSNAP
+* STOked
+* TORked
* SciByte
* In Depth Look
* FauxShow
@@ -20,4 +21,5 @@ Shows
Instructions
------------
1. Download the addon from the official XBMC Addon Repository
-2. Visit Video Addons, configure and load up Jupiter Broadcasting
\ No newline at end of file
+2. Visit Video Addons, configure and load up Jupiter Broadcasting
+
diff --git a/plugin.video.jupiterbroadcasting/addon.xml
b/plugin.video.jupiterbroadcasting/addon.xml
index c19fb74..8e92657 100644
--- a/plugin.video.jupiterbroadcasting/addon.xml
+++ b/plugin.video.jupiterbroadcasting/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.jupiterbroadcasting"
name="Jupiter Broadcasting"
- version="1.4.1"
+ version="1.6.0"
provider-name="Rob Loach">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.jupiterbroadcasting/changelog.txt
b/plugin.video.jupiterbroadcasting/changelog.txt
index bcc4c5a..b84d262 100644
--- a/plugin.video.jupiterbroadcasting/changelog.txt
+++ b/plugin.video.jupiterbroadcasting/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.6.0: April 4th, 2012[/B]
+- New show: TORked
+- Highlighting the most recent and live show titles
+
[B]Version 1.4.1: January 30th, 2012[/B]
- Initial XBMC Eden release
- Fix for thumbnail support
diff --git a/plugin.video.jupiterbroadcasting/default.py
b/plugin.video.jupiterbroadcasting/default.py
index 00ad8e7..c20ae49 100644
--- a/plugin.video.jupiterbroadcasting/default.py
+++ b/plugin.video.jupiterbroadcasting/default.py
@@ -117,6 +117,15 @@ def CATEGORIES():
'genre': 'Technology'
}
+ # TORked
+ shows[__language__(30015)] = {
+ 'feed': 'http://feeds.feedburner.com/TorkedHd?format=xml',
+ 'feed-low': 'http://feeds.feedburner.com/TorkedMobile?format=xml',
+ 'image':
'http://images3.wikia.nocookie.net/jupiterbroadcasting/images/e/ea/Torked.jpg',
+ 'plot': __language__(30215),
+ 'genre': 'Technology'
+ }
+
# Jupiter Broadcasting Live via the RTMP stream
addLink(__language__(30010),
'rtsp://videocdn-us.geocdn.scaleengine.net/jblive/jblive.stream', '',
'http://images2.wikia.nocookie.net/__cb20110118004527/jupiterbroadcasting/images/2/24/JupiterBadgeGeneric.jpg',
{
'title': __language__(30010),
diff --git
a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
index 19e2bbd..5f07bd4 100644
--- a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
+++ b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
@@ -19,8 +19,8 @@
<string id="30005">Jupiter Files</string>
<string id="30205">Bryan takes a peek into alien life.</string>
- <string id="30006">All Shows</string>
- <string id="30206">All the latest videos from Jupiter Broadcasting.</string>
+ <string id="30006">[ Most Recent ]</string>
+ <string id="30206">Lists all the latest shows from the Jupiter Broading
network.</string>
<string id="30007">The MMOrgue</string>
<string id="30207">The MMOrgue is a show presented by Jeremy about Massively
Multiplayer Online (MMO) games.</string>
@@ -31,8 +31,8 @@
<string id="30009">SciByte</string>
<string id="30209">SciByte is a show about science topics presented by
Heather and Jeremy.</string>
- <string id="30010">Live Show</string>
- <string id="30210">Watch Jupiter Broadcasting live!</string>
+ <string id="30010">[ Live Show ]</string>
+ <string id="30210">Watch the Jupiter Broadcasting live feed.</string>
<string id="30011">FauxShow</string>
<string id="30211">The FauxShow is not a real show, but a social experience.
Unlike most of the shows on the network, the FauxShow has no defined subject
and the topic varies week to week.</string>
@@ -40,6 +40,9 @@
<string id="30014">In Depth Look</string>
<string id="30214">Total focus on great topics, one episode at a time. Each
week Chris present another topic, from extreme hardware builds to beginner
video guides.</string>
+ <string id="30015">TORked</string>
+ <string id="30215">Star Wars: The Old Republic podcast that goes in-depth
into TOR updates and features on a weekly basis.</string>
+
<!-- Settings -->
<string id="30100">General</string>
<string id="30101">Video Quality</string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.jupiterbroadcasting/README.md | 6 ++-
plugin.video.jupiterbroadcasting/addon.xml | 2 +-
plugin.video.jupiterbroadcasting/changelog.txt | 4 ++
plugin.video.jupiterbroadcasting/default.py | 9 +++++
.../resources/language/English/strings.xml | 11 ++++--
plugin.video.mlbmc/addon.xml | 2 +-
plugin.video.mlbmc/changelog.txt | 3 ++
plugin.video.mlbmc/default.py | 33 ++++++++++---------
8 files changed, 46 insertions(+), 24 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
