The branch, eden has been updated
       via  c0f0449c4852d09b53cbf36bfcac51a28db5a1a6 (commit)
       via  feca3359e5a3859c01e81dda380c0d64dca153ae (commit)
       via  b2fb00f2c549e53980881e2ece2297f745880a23 (commit)
       via  7f7b282738befee5d719cef852382f62748f15b0 (commit)
      from  b1874ffd9455867ef5ff44516b882772208aec9e (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c0f0449c4852d09b53cbf36bfcac51a28db5a1a6

commit c0f0449c4852d09b53cbf36bfcac51a28db5a1a6
Author: spiff <[email protected]>
Date:   Mon Apr 9 11:53:04 2012 +0200

    [plugin.video.mlbmc] updated to version 1.0.6

diff --git a/plugin.video.mlbmc/addon.xml b/plugin.video.mlbmc/addon.xml
index 8c0945e..624ea4a 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.5"

+       version="1.0.6"

        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 17daaa7..53d6357 100644
--- a/plugin.video.mlbmc/changelog.txt
+++ b/plugin.video.mlbmc/changelog.txt
@@ -1,3 +1,6 @@
+Version 1.0.6

+fix for condensed games

+

 Version 1.0.5

 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 6b93df3..33ee404 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.1.0.5]: %s" %string )
+    xbmc.log( "[addon.mlbmc.1.0.6]: %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=feca3359e5a3859c01e81dda380c0d64dca153ae

commit feca3359e5a3859c01e81dda380c0d64dca153ae
Author: spiff <[email protected]>
Date:   Mon Apr 9 11:52:16 2012 +0200

    [plugin.video.national.geographic] mark as broken

diff --git a/plugin.video.national.geographic/addon.xml 
b/plugin.video.national.geographic/addon.xml
index a32da21..8c279ce 100644
--- a/plugin.video.national.geographic/addon.xml
+++ b/plugin.video.national.geographic/addon.xml
@@ -15,5 +15,6 @@
     <summary>National Geographic: Inspiring people to care about the 
planet.</summary>
     <description>View full episodes and video clips from the National 
Geographic Channel and Nat Geo Wild.</description>
     <platform>all</platform>
+    <broken>Site changes</broken>
   </extension>
 </addon>

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b2fb00f2c549e53980881e2ece2297f745880a23


http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7f7b282738befee5d719cef852382f62748f15b0

commit 7f7b282738befee5d719cef852382f62748f15b0
Author: spiff <[email protected]>
Date:   Mon Apr 9 11:46:52 2012 +0200

    [plugin.video.jupiterbroadcasting] updated to version 2.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 edf4716..e42789a 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="2.5.0"

+       version="2.6.0"

        provider-name="Rob Loach">

   <requires>

     <import addon="xbmc.python" version="2.0"/>

diff --git a/plugin.video.jupiterbroadcasting/changelog.txt 
b/plugin.video.jupiterbroadcasting/changelog.txt
index 360259b..6bce461 100644
--- a/plugin.video.jupiterbroadcasting/changelog.txt
+++ b/plugin.video.jupiterbroadcasting/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.6.0: April 4th, 2012[/B]

+- New show: TORked

+- Highlighting the most recent and live show titles

+

 [B]Version 2.5.0: January 31th, 2012[/B]

 - Initial XBMC Eden release

 

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 ++--
 plugin.video.national.geographic/addon.xml         |    1 +
 .../LICENSE.txt => plugin.video.tvvn/COPYING       |    0
 plugin.video.tvvn/README                           |    5 +
 plugin.video.tvvn/addon.xml                        |   22 +++
 plugin.video.tvvn/changelog.txt                    |   16 ++
 plugin.video.tvvn/fanart.jpg                       |  Bin 0 -> 265020 bytes
 plugin.video.tvvn/htv7.png                         |  Bin 0 -> 56459 bytes
 plugin.video.tvvn/htv9.png                         |  Bin 0 -> 59499 bytes
 plugin.video.tvvn/icon.png                         |  Bin 0 -> 44723 bytes
 plugin.video.tvvn/sctv.png                         |  Bin 0 -> 53162 bytes
 plugin.video.tvvn/tvvn.py                          |  163 ++++++++++++++++++++
 plugin.video.tvvn/vov.png                          |  Bin 0 -> 56345 bytes
 plugin.video.tvvn/vov1.png                         |  Bin 0 -> 59218 bytes
 plugin.video.tvvn/vov2.png                         |  Bin 0 -> 62670 bytes
 plugin.video.tvvn/vov3.png                         |  Bin 0 -> 63609 bytes
 plugin.video.tvvn/vov5.png                         |  Bin 0 -> 62715 bytes
 plugin.video.tvvn/vtc1.png                         |  Bin 0 -> 58082 bytes
 plugin.video.tvvn/vtc10.png                        |  Bin 0 -> 60594 bytes
 plugin.video.tvvn/vtc2.png                         |  Bin 0 -> 59817 bytes
 plugin.video.tvvn/vtv1.png                         |  Bin 0 -> 35914 bytes
 plugin.video.tvvn/vtv2.png                         |  Bin 0 -> 39806 bytes
 plugin.video.tvvn/vtv3.png                         |  Bin 0 -> 50834 bytes
 plugin.video.tvvn/vtv4.png                         |  Bin 0 -> 38644 bytes
 plugin.video.tvvn/vtv6.png                         |  Bin 0 -> 50727 bytes
 plugin.video.tvvn/vtv9.png                         |  Bin 0 -> 40875 bytes
 33 files changed, 253 insertions(+), 24 deletions(-)
 copy plugin.audio.groove/LICENSE.txt => plugin.video.tvvn/COPYING (100%)
 create mode 100644 plugin.video.tvvn/README
 create mode 100644 plugin.video.tvvn/addon.xml
 create mode 100644 plugin.video.tvvn/changelog.txt
 create mode 100644 plugin.video.tvvn/fanart.jpg
 create mode 100644 plugin.video.tvvn/htv7.png
 create mode 100644 plugin.video.tvvn/htv9.png
 create mode 100644 plugin.video.tvvn/icon.png
 create mode 100644 plugin.video.tvvn/sctv.png
 create mode 100644 plugin.video.tvvn/tvvn.py
 create mode 100644 plugin.video.tvvn/vov.png
 create mode 100644 plugin.video.tvvn/vov1.png
 create mode 100644 plugin.video.tvvn/vov2.png
 create mode 100644 plugin.video.tvvn/vov3.png
 create mode 100644 plugin.video.tvvn/vov5.png
 create mode 100644 plugin.video.tvvn/vtc1.png
 create mode 100644 plugin.video.tvvn/vtc10.png
 create mode 100644 plugin.video.tvvn/vtc2.png
 create mode 100644 plugin.video.tvvn/vtv1.png
 create mode 100644 plugin.video.tvvn/vtv2.png
 create mode 100644 plugin.video.tvvn/vtv3.png
 create mode 100644 plugin.video.tvvn/vtv4.png
 create mode 100644 plugin.video.tvvn/vtv6.png
 create mode 100644 plugin.video.tvvn/vtv9.png


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

Reply via email to