The branch, eden has been updated
       via  52c928134c05f3c638895cd603d5ee0939e2448c (commit)
       via  7c8a8b4fd7e8d41bbc199a2e7e3746450478837d (commit)
       via  fb0ffd4b34688b564f5bcbb0332ebd545cbf82fc (commit)
       via  e930d3a6e42c34dbeadf8c77a5df0513d7f7f776 (commit)
       via  1bacd44e7be725f07b5374af25d25f401137a46e (commit)
      from  e61e8ab7809878eb82ab68b019040453fd180c61 (commit)

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


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


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


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

commit e930d3a6e42c34dbeadf8c77a5df0513d7f7f776
Author: spiff <[email protected]>
Date:   Mon Jul 9 11:01:15 2012 +0200

    [plugin.video.gronkh_de] updated to version 1.0.2

diff --git a/plugin.video.gronkh_de/addon.xml b/plugin.video.gronkh_de/addon.xml
index 1efa27e..e09f423 100644
--- a/plugin.video.gronkh_de/addon.xml
+++ b/plugin.video.gronkh_de/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.gronkh_de" name="Gronkh.de" version="1.0.0" 
provider-name="AddonScriptorDE">
+<addon id="plugin.video.gronkh_de" name="Gronkh.de" version="1.0.2" 
provider-name="AddonScriptorDE">
     <requires>
         <import addon="xbmc.python" version="2.0"/>
         <import addon="plugin.video.youtube" version="3.0.0"/>
diff --git a/plugin.video.gronkh_de/changelog.txt 
b/plugin.video.gronkh_de/changelog.txt
index 433a675..d84ccd9 100644
--- a/plugin.video.gronkh_de/changelog.txt
+++ b/plugin.video.gronkh_de/changelog.txt
@@ -1 +1,7 @@
-1.0.0 - First Try
+1.0.0
+- First Try
+1.0.1
+- Fixed site changes for "Latest videos"
+- Added xbox fix (thx@skatulskijean)
+1.0.2
+- Added option for forcing the view mode
\ No newline at end of file
diff --git a/plugin.video.gronkh_de/default.py 
b/plugin.video.gronkh_de/default.py
index 2ce7515..91aed11 100644
--- a/plugin.video.gronkh_de/default.py
+++ b/plugin.video.gronkh_de/default.py
@@ -1,21 +1,25 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-import xbmcaddon
-import xbmcplugin
-import xbmcgui
-import sys
-import urllib, urllib2
-import re
+import xbmcaddon,xbmcplugin,xbmcgui,sys,urllib,urllib2,re,socket
 
 pluginhandle = int(sys.argv[1])
-
+xbox = xbmc.getCondVisibility("System.Platform.xbox")
 settings = xbmcaddon.Addon(id='plugin.video.gronkh_de')
 translation = settings.getLocalizedString
 
+forceViewMode=settings.getSetting("forceViewMode")
+if forceViewMode=="true":
+  forceViewMode=True
+else:
+  forceViewMode=False
+viewMode=str(settings.getSetting("viewMode"))
+
 def index():
         addDir(translation(30001),"http://gronkh.de/","listVideos","";)
         addDir(translation(30002),"http://gronkh.de/lets-play","listGames","";)
         xbmcplugin.endOfDirectory(pluginhandle)
+        if forceViewMode==True:
+          xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
 
 def listVideos(url):
         content = getUrl(url)
@@ -25,7 +29,8 @@ def listVideos(url):
           match=re.compile('<a class="thumb" href="(.+?)" title=""><img 
src="(.+?)"', re.DOTALL).findall(entry)
           url=match[0][0]
           thumb=match[0][1]
-          match=re.compile('<strong>(.+?)</strong>', re.DOTALL).findall(entry)
+          temp=entry[entry.find('<div class="text">'):]
+          match=re.compile('title="(.+?)"', re.DOTALL).findall(temp)
           title=match[0]
           match=re.compile('<h2><a href="(.+?)" title="(.+?)">(.+?)</a></h2>', 
re.DOTALL).findall(entry)
           title2=match[0][2]
@@ -36,6 +41,8 @@ def listVideos(url):
           if len(match)>0:
             addDir(translation(30003),match[0],"listVideos","")
         xbmcplugin.endOfDirectory(pluginhandle)
+        if forceViewMode==True:
+          xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
 
 def listGames():
         content = getUrl("http://gronkh.de/lets-play";)
@@ -53,19 +60,28 @@ def listGames():
           title=cleanTitle(title)
           addDir(title,url,'listVideos',thumb)
         xbmcplugin.endOfDirectory(pluginhandle)
+        if forceViewMode==True:
+          xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
 
 def playVideo(url):
         content = getUrl(url)
         match=re.compile('src="http://www.youtube.com/embed/(.+?)\\?', 
re.DOTALL).findall(content)
         youtubeID=match[0]
-        fullData = 
"plugin://plugin.video.youtube/?path=/root/video&action=play_video&videoid=" + 
youtubeID
+        if xbox==True:
+          fullData = 
"plugin://video/YouTube/?path=/root/video&action=play_video&videoid=" + 
youtubeID
+        else:
+          fullData = 
"plugin://plugin.video.youtube/?path=/root/video&action=play_video&videoid=" + 
youtubeID
         listitem = xbmcgui.ListItem(path=fullData)
         return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
 
 def getUrl(url):
         req = urllib2.Request(url)
         req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0) 
Gecko/20100101 Firefox/11.0')
-        response = urllib2.urlopen(req)
+        if xbox==True:
+          socket.setdefaulttimeout(30)
+          response = urllib2.urlopen(req)
+        else:
+          response = urllib2.urlopen(req,timeout=30)
         link=response.read()
         response.close()
         return link
diff --git a/plugin.video.gronkh_de/resources/language/English/strings.xml 
b/plugin.video.gronkh_de/resources/language/English/strings.xml
index 596e0a2..fe33d35 100644
--- a/plugin.video.gronkh_de/resources/language/English/strings.xml
+++ b/plugin.video.gronkh_de/resources/language/English/strings.xml
@@ -3,4 +3,6 @@
   <string id="30001">New Videos</string>
   <string id="30002">All Games</string>
   <string id="30003">Next Page</string>
+  <string id="30102">Force ViewMode</string>
+  <string id="30103">ViewMode</string>
 </strings>
diff --git a/plugin.video.gronkh_de/resources/language/German/strings.xml 
b/plugin.video.gronkh_de/resources/language/German/strings.xml
index ac7ac4a..891591c 100644
--- a/plugin.video.gronkh_de/resources/language/German/strings.xml
+++ b/plugin.video.gronkh_de/resources/language/German/strings.xml
@@ -3,4 +3,5 @@
   <string id="30001">Neue Videos</string>
   <string id="30002">Alle Spiele</string>
   <string id="30003">Nächste Seite</string>
+  <string id="30102">ViewMode erzwingen</string>
 </strings>

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

commit 1bacd44e7be725f07b5374af25d25f401137a46e
Author: spiff <[email protected]>
Date:   Mon Jul 9 10:59:20 2012 +0200

    [plugin.video.jupiterbroadcasting] updated to version 2.8.0

diff --git a/plugin.video.jupiterbroadcasting/README.md 
b/plugin.video.jupiterbroadcasting/README.md
index 084a19f..cb00fab 100644
--- a/plugin.video.jupiterbroadcasting/README.md
+++ b/plugin.video.jupiterbroadcasting/README.md
@@ -15,6 +15,8 @@ Shows
 * Jupiter@Nite
 * The MMOrgue
 * LOTSO
+* Unfiltered
+* Coder Radio
 * Beer Is Tasty
 * Jupiter Files
 
diff --git a/plugin.video.jupiterbroadcasting/addon.xml 
b/plugin.video.jupiterbroadcasting/addon.xml
index 7cd6209..84cfb7d 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.7.1"

+       version="2.8.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 1d6347d..779da13 100644
--- a/plugin.video.jupiterbroadcasting/changelog.txt
+++ b/plugin.video.jupiterbroadcasting/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 2.8.0: July 7th, 2012[/B]

+- New show: Coder Radio

+

 [B]Version 2.7.1: June 5th, 2012[/B]

 - New show: Unfilter

 - Switched to the faster HLS live stream

diff --git a/plugin.video.jupiterbroadcasting/default.py 
b/plugin.video.jupiterbroadcasting/default.py
index 3483e7c..c1b700b 100644
--- a/plugin.video.jupiterbroadcasting/default.py
+++ b/plugin.video.jupiterbroadcasting/default.py
@@ -135,6 +135,15 @@ def CATEGORIES():
         'genre': 'Technology'

     }

 

+    # Coder Radio

+    shows[__language__(30017)] = {

+        'feed': 'http://feeds.feedburner.com/coderradiovideo?format=xml',

+        'feed-low': 
'http://www.jupiterbroadcasting.com/feeds/coderradioogg.xml?format=xml',

+        'image': 'http://www.jupiterbroadcasting.com/images/CR-rssBadge.jpg',

+        'plot': __language__(30217),

+        'genre': 'Technology'

+    }

+

     # Jupiter Broadcasting Live via the RTMP stream

     addLink(__language__(30010), 
'http://videocdn-us.geocdn.scaleengine.net/jblive-iphone/live/jblive.stream/playlist.m3u8',
 '', 
'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 fb0ecce..11932bd 100644
--- a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
+++ b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
@@ -46,6 +46,9 @@
   <string id="30016">Unfilter</string>
   <string id="30216">We're living in historic times. Don't waste it on TV. 
Unplug from the distractions and propaganda, and unfilter your life!</string>
 
+  <string id="30017">Coder Radio</string>
+  <string id="30217">A weekly talk show taking a pragmatic look at the art and 
business of Software Development and related technologies.</string>
+
   <!-- Settings -->
   <string id="30100">General</string>  
        <string id="30101">Video Quality</string>

-----------------------------------------------------------------------

Summary of changes:
 .../LICENSE.txt                                    |    0
 plugin.video.ebaumsworld_com/addon.xml             |   16 ++
 plugin.video.ebaumsworld_com/changelog.txt         |    4 +
 plugin.video.ebaumsworld_com/default.py            |  139 ++++++++++++
 plugin.video.ebaumsworld_com/icon.png              |  Bin 0 -> 39875 bytes
 .../resources/language/English/strings.xml         |   13 ++
 .../resources/language/German/strings.xml          |   11 +
 .../resources/settings.xml                         |    4 +
 plugin.video.gronkh_de/addon.xml                   |    2 +-
 plugin.video.gronkh_de/changelog.txt               |    8 +-
 plugin.video.gronkh_de/default.py                  |   36 +++-
 .../resources/language/English/strings.xml         |    2 +
 .../resources/language/German/strings.xml          |    1 +
 plugin.video.gronkh_de/resources/settings.xml      |    4 +
 plugin.video.jupiterbroadcasting/README.md         |    2 +
 plugin.video.jupiterbroadcasting/addon.xml         |    2 +-
 plugin.video.jupiterbroadcasting/changelog.txt     |    3 +
 plugin.video.jupiterbroadcasting/default.py        |    9 +
 .../resources/language/English/strings.xml         |    3 +
 .../LICENSE.txt                                    |    0
 plugin.video.mpora_com/addon.xml                   |   16 ++
 plugin.video.mpora_com/changelog.txt               |    6 +
 plugin.video.mpora_com/default.py                  |  158 ++++++++++++++
 plugin.video.mpora_com/icon.png                    |  Bin 0 -> 20111 bytes
 .../resources/language/English/strings.xml         |   26 +++
 .../resources/language/German/strings.xml          |    7 +
 plugin.video.mpora_com/resources/settings.xml      |    5 +
 .../LICENSE.txt                                    |    0
 plugin.video.redbull_tv/addon.xml                  |   18 ++
 plugin.video.redbull_tv/changelog.txt              |    7 +
 plugin.video.redbull_tv/default.py                 |  220 ++++++++++++++++++++
 plugin.video.redbull_tv/icon.png                   |  Bin 0 -> 33608 bytes
 .../resources/language/English/strings.xml         |   10 +
 .../resources/language/German/strings.xml          |    9 +
 plugin.video.redbull_tv/resources/settings.xml     |    5 +
 35 files changed, 733 insertions(+), 13 deletions(-)
 copy {plugin.audio.einslive_de => plugin.video.ebaumsworld_com}/LICENSE.txt 
(100%)
 create mode 100644 plugin.video.ebaumsworld_com/addon.xml
 create mode 100644 plugin.video.ebaumsworld_com/changelog.txt
 create mode 100644 plugin.video.ebaumsworld_com/default.py
 create mode 100644 plugin.video.ebaumsworld_com/icon.png
 create mode 100644 
plugin.video.ebaumsworld_com/resources/language/English/strings.xml
 create mode 100644 
plugin.video.ebaumsworld_com/resources/language/German/strings.xml
 create mode 100644 plugin.video.ebaumsworld_com/resources/settings.xml
 create mode 100644 plugin.video.gronkh_de/resources/settings.xml
 copy {plugin.audio.einslive_de => plugin.video.mpora_com}/LICENSE.txt (100%)
 create mode 100644 plugin.video.mpora_com/addon.xml
 create mode 100644 plugin.video.mpora_com/changelog.txt
 create mode 100644 plugin.video.mpora_com/default.py
 create mode 100644 plugin.video.mpora_com/icon.png
 create mode 100644 
plugin.video.mpora_com/resources/language/English/strings.xml
 create mode 100644 plugin.video.mpora_com/resources/language/German/strings.xml
 create mode 100644 plugin.video.mpora_com/resources/settings.xml
 copy {plugin.audio.einslive_de => plugin.video.redbull_tv}/LICENSE.txt (100%)
 create mode 100644 plugin.video.redbull_tv/addon.xml
 create mode 100644 plugin.video.redbull_tv/changelog.txt
 create mode 100644 plugin.video.redbull_tv/default.py
 create mode 100644 plugin.video.redbull_tv/icon.png
 create mode 100644 
plugin.video.redbull_tv/resources/language/English/strings.xml
 create mode 100644 
plugin.video.redbull_tv/resources/language/German/strings.xml
 create mode 100644 plugin.video.redbull_tv/resources/settings.xml


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

Reply via email to