[Xbmc-addons] Plugins branch, eden, updated. 81f573be012a70438842d8c11289569fbc4cf323

Tue, 30 Oct 2012 05:37:55 -0700 

The branch, eden has been updated
       via  81f573be012a70438842d8c11289569fbc4cf323 (commit)
       via  b17f326f9a2a8589e405b41b04b6c85b63a8561e (commit)
       via  9c877c43e71fee0cf984e1ae71880a3b602b1b1c (commit)
      from  5283fffd9892a1a6c5e33526f3b5fd3110be1967 (commit)

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

commit 81f573be012a70438842d8c11289569fbc4cf323
Author: spiff <[email protected]>
Date:   Tue Oct 30 13:36:25 2012 +0100

    [plugin.video.redux_com] updated to version 1.0.2

diff --git a/plugin.video.redux_com/addon.xml b/plugin.video.redux_com/addon.xml
index 4bcea7b..08e4c16 100644
--- a/plugin.video.redux_com/addon.xml
+++ b/plugin.video.redux_com/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.redux_com" name="Redux.com" version="1.0.1" 
provider-name="AddonScriptorDE">
+<addon id="plugin.video.redux_com" name="Redux.com" version="1.0.2" 
provider-name="AddonScriptorDE">
     <requires>
         <import addon="xbmc.python" version="2.0"/>
         <import addon="plugin.video.youtube" version="3.1.0"/>
diff --git a/plugin.video.redux_com/changelog.txt 
b/plugin.video.redux_com/changelog.txt
index 83cc374..da717ba 100644
--- a/plugin.video.redux_com/changelog.txt
+++ b/plugin.video.redux_com/changelog.txt
@@ -2,3 +2,5 @@
 - First Try
 1.0.1
 - Added TV Mode
+1.0.2
+- Fixed important bug
\ No newline at end of file
diff --git a/plugin.video.redux_com/default.py 
b/plugin.video.redux_com/default.py
index 91f3bb0..90f867e 100644
--- a/plugin.video.redux_com/default.py
+++ b/plugin.video.redux_com/default.py
@@ -6,6 +6,7 @@ from random import shuffle
 socket.setdefaulttimeout(30)
 pluginhandle = int(sys.argv[1])
 xbox = xbmc.getCondVisibility("System.Platform.xbox")
+addon = xbmcaddon.Addon(id='plugin.video.redux_com')
 
 forceViewMode=addon.getSetting("forceViewMode")
 if forceViewMode=="true":

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

commit b17f326f9a2a8589e405b41b04b6c85b63a8561e
Author: spiff <[email protected]>
Date:   Tue Oct 30 13:35:11 2012 +0100

    [plugin.video.wired_com] updated to version 1.0.1

diff --git a/plugin.video.wired_com/addon.xml b/plugin.video.wired_com/addon.xml
index 8a838d2..321c7b6 100644
--- a/plugin.video.wired_com/addon.xml
+++ b/plugin.video.wired_com/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.wired_com" name="Wired.com" version="1.0.0" 
provider-name="AddonScriptorDE">
+<addon id="plugin.video.wired_com" name="Wired.com" version="1.0.1" 
provider-name="AddonScriptorDE">
     <requires>
         <import addon="xbmc.python" version="2.0"/>
         <import addon="script.module.pyamf" version="0.6.1"/>
diff --git a/plugin.video.wired_com/changelog.txt 
b/plugin.video.wired_com/changelog.txt
index 21d8488..3d3c90c 100644
--- a/plugin.video.wired_com/changelog.txt
+++ b/plugin.video.wired_com/changelog.txt
@@ -1,2 +1,4 @@
 1.0.0
 - First Try
+1.0.1
+- Fixed site changes
\ No newline at end of file
diff --git a/plugin.video.wired_com/default.py 
b/plugin.video.wired_com/default.py
index feaf8da..211bc30 100644
--- a/plugin.video.wired_com/default.py
+++ b/plugin.video.wired_com/default.py
@@ -3,18 +3,18 @@
 import 
urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon,base64,httplib,socket,time
 from pyamf import remoting
 
+socket.setdefaulttimeout(30)
 pluginhandle = int(sys.argv[1])
-xbox = xbmc.getCondVisibility("System.Platform.xbox")
-settings = xbmcaddon.Addon(id='plugin.video.wired_com')
-translation = settings.getLocalizedString
+addon = xbmcaddon.Addon(id='plugin.video.wired_com')
+translation = addon.getLocalizedString
 
-maxBitRate=settings.getSetting("maxBitRate")
-forceViewMode=settings.getSetting("forceViewMode")
+maxBitRate=addon.getSetting("maxBitRate")
+forceViewMode=addon.getSetting("forceViewMode")
 if forceViewMode=="true":
   forceViewMode=True
 else:
   forceViewMode=False
-viewMode=str(settings.getSetting("viewMode"))
+viewMode=str(addon.getSetting("viewMode"))
 
 qual=[512000,1024000,2048000,3072000,4096000,5120000]
 maxBitRate=qual[int(maxBitRate)]
@@ -22,12 +22,12 @@ maxBitRate=qual[int(maxBitRate)]
 def index():
         addDir("Latest","http://www.wired.com/video/";,'listVideos',"")
         content = getUrl("http://www.wired.com/video/";)
-        content = content[content.find("<li class='bc_topics 
bc_otherChannels'>"):]
+        content = content[content.find('<li class="bc_topics 
bc_otherChannels">'):]
         content = content[:content.find("</div>")]
         match=re.compile('<li><a href="(.+?)">(.+?)</a></li>', 
re.DOTALL).findall(content)
         for url,title in match:
           if title!="Nebula":
-            addDir(title,url,'listVideos',"")
+            addDir(title,"http://www.wired.com"+url,'listVideos',"")
         xbmcplugin.endOfDirectory(pluginhandle)
         if forceViewMode==True:
           xbmc.executebuiltin('Container.SetViewMode('+viewMode+')')
@@ -39,17 +39,17 @@ def listVideos(url):
         spl=content.split('<div class="lineupThumb">')
         for i in range(1,len(spl),1):
             entry=spl[i]
-            match=re.compile("_popDesc_1' class='bc_popDesc'>(.+?)</div>", 
re.DOTALL).findall(entry)
+            match=re.compile('_popDesc_1" class="bc_popDesc">(.+?)</div>', 
re.DOTALL).findall(entry)
             desc=""
             if len(match)>0:
               desc=match[0]
               desc=cleanTitle(desc)
-            match=re.compile("alt='(.+?)'", re.DOTALL).findall(entry)
+            match=re.compile('alt="(.+?)"', re.DOTALL).findall(entry)
             title=match[0]
             title=cleanTitle(title)
-            match=re.compile("<div id='bc_(.+?)_", re.DOTALL).findall(entry)
+            match=re.compile('<div id="bc_(.+?)_', re.DOTALL).findall(entry)
             id=match[0]
-            match=re.compile("_thumbUrl_1' class='bc_popDesc'>(.+?)</div>", 
re.DOTALL).findall(entry)
+            match=re.compile('_thumbUrl_1" class="bc_popDesc">(.+?)</div>', 
re.DOTALL).findall(entry)
             thumb=""
            thumb=""ompile('_thumbUrl_1" class="bc_popDesc">(.+?)</div>', 
re.DOTALL).findall(entry)b63a8561erÉL¾'+P¹ÇÿÀ¹ÇÿuJL¾'+€jM¾'+em¾'+’Xi¿'+À¹Çÿ€p‹¿'+°®Çÿ€­Çÿk`L¾'+6
 
èè!è!P¹ÇÿÀ¹Çÿxi¿'+°¯Çÿ’BL¾'+†`L¾'+P¹Çÿ`BL¾'+¹ÇÿÀÍ¿'+uJL¾'+Í¿'+ØÍ¿'+¨
        
Í¿'+€jM¾'+xi¿'+°¯Çÿ€®Çÿk`L¾'+à!à!P¹ÇÿÀ¹ÇÿHÞH¿'+°Çÿ’BL¾'+†`L¾'+P¹Çÿ`BL¾'+¹Çÿ€¹Çÿx¹Çÿ8km¾'+Œp˜À¹ÇÿuJL¾'+€jM¾'+°Çÿ`¯Çÿk`L¾'+GHIJKMNOPP¹ÇÿÀ¹ÇÿH•¿'+0²Çÿ’BL¾'+†`L¾'+P¹Çÿ0Í¿'+uJL¾'+
 i¿'+ Éü¾'+Í¿'+ØÍ¿'+¨ 
Í¿'+€jM¾'+H•¿'+0²Çÿp°Çÿk`L¾'+8•¿'+0²Çÿ °Çÿk`L¾'+(•¿'+0²ÇÿаÇÿk`L¾'+•¿'+0²Çÿ±Çÿk`L¾'+
  ¨Í¿'+uJL¾'+¨        
Í¿'+€«ÇÿŠý¾'+eIL¾'+ØÍ¿'+ ±Çÿyý¾'+eIL¾'+Í¿'+бÇÿZý¾'+eIL¾'+ØÄü¾'+
 i¿'+ Éü¾'+Í¿'+Ø$i¿'+ØÍ¿'+¨ 
Í¿'+€jM¾'+8km¾'+È¾'+À¹Çÿp[ü¾'+€³ÇÿP²Çÿk`L¾'+5678:<=>?@BDP¹ÇÿÀ¹ÇÿàÅ¾'+À¹ÇÿuJL¾'+em¾'+²ÇÿÈ¾'+eIL¾'+em¾'+Õ_@fÆS
 
Qöl±íÁ£”¾'+À¹ÇÿàÅ¾'+´Çÿ`³Çÿk`L¾'+u]ÞÓ
      
4Q ÷U^Qʉ§¶uª¹ñìò*ēvP¹ÇÿÀ¹ÇÿHޑ¾'+$ξ'+»Çÿ¦00À'+¦00À'+v˾'+¹ÇÿÀºÇÿx¹ÇÿàµÇÿ/i¿'+uJL¾'+Ø$i¿'+@¼Çÿ¢00À'+»Çÿ ¶Çÿÿÿÿÿÿÿÿÿ¢00À'+ȹÇÿ
    if len(match)>0:
               thumb=match[0]
@@ -112,12 +112,8 @@ def cleanTitle(title):
 
 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/13.0')
-        if xbox==True:
-          socket.setdefaulttimeout(30)
-          response = urllib2.urlopen(req)
-        else:
-          response = urllib2.urlopen(req,timeout=30)
+        req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:15.0) 
Gecko/20100101 Firefox/15.0.1')
+        response = urllib2.urlopen(req)
         link=response.read()
         response.close()
         return link
diff --git a/plugin.video.wired_com/resources/language/English/strings.xml 
b/plugin.video.wired_com/resources/language/English/strings.xml
index c12af8f..730b49b 100644
--- a/plugin.video.wired_com/resources/language/English/strings.xml
+++ b/plugin.video.wired_com/resources/language/English/strings.xml
@@ -2,6 +2,6 @@
 <strings>
   <string id="30001">Next Page</string>
   <string id="30101">Maximum bitrate</string>
-  <string id="30102">Force ViewMode</string>
-  <string id="30103">ViewMode</string>
+  <string id="30102">Force View</string>
+  <string id="30103">ViewID</string>
 </strings>
diff --git a/plugin.video.wired_com/resources/language/German/strings.xml 
b/plugin.video.wired_com/resources/language/German/strings.xml
index 83cb82f..77b0add 100644
--- a/plugin.video.wired_com/resources/language/German/strings.xml
+++ b/plugin.video.wired_com/resources/language/German/strings.xml
@@ -2,5 +2,5 @@
 <strings>
   <string id="30001">Nächste Seite</string>
   <string id="30101">Maximale Bitrate</string>
-  <string id="30102">ViewMode erzwingen</string>
+  <string id="30102">View erzwingen</string>
 </strings>

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

commit 9c877c43e71fee0cf984e1ae71880a3b602b1b1c
Author: spiff <[email protected]>
Date:   Tue Oct 30 13:32:47 2012 +0100

    [plugin.video.sarpur] updated to version 2.0.1

diff --git a/plugin.video.sarpur/addon.xml b/plugin.video.sarpur/addon.xml
index 3f90562..e937243 100755
--- a/plugin.video.sarpur/addon.xml
+++ b/plugin.video.sarpur/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.sarpur"
        name="Sarpur"
-       version="2.0.0"
+       version="2.0.1"
        provider-name="Dagur">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.sarpur/changelog.txt 
b/plugin.video.sarpur/changelog.txt
index 55aa8c7..9a9a1ba 100644
--- a/plugin.video.sarpur/changelog.txt
+++ b/plugin.video.sarpur/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 2.0.1[/B]
+- Changed ip-address for live feed
+
 [B]Version 2.0.0[/B]
 - Changing version number for Eden.
 
diff --git a/plugin.video.sarpur/default.py b/plugin.video.sarpur/default.py
index 2c9429a..ed5b3fa 100755
--- a/plugin.video.sarpur/default.py
+++ b/plugin.video.sarpur/default.py
@@ -76,7 +76,7 @@ def spila_live(stod):
     #if stod == 'ruv':
     #stream_info['playpath'] = 
'http://194.144.162.36:1935/ruv/beint-2/playlist.m3u8?key=%d' % 
int(math.floor(random.random() * 9999)) 
     stream_info['playpath'] = 'beint-2' 
-    stream_info['rtmp_url'] = 'rtmp://178.19.48.171/ruv?key=%d' % 
int(math.floor(random.random() * 9999))
+    stream_info['rtmp_url'] = 'rtmp://212.30.206.129/ruv?key=%d' % 
int(math.floor(random.random() * 9999))
     stream_info['page_url'] = 'http://ruv.is/ruv'
 
     item = xbmcgui.ListItem("RTL")

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

Summary of changes:
 plugin.video.redux_com/addon.xml                   |    2 +-
 plugin.video.redux_com/changelog.txt               |    2 +
 plugin.video.redux_com/default.py                  |    1 +
 plugin.video.sarpur/addon.xml                      |    2 +-
 plugin.video.sarpur/changelog.txt                  |    3 ++
 plugin.video.sarpur/default.py                     |    2 +-
 plugin.video.wired_com/addon.xml                   |    2 +-
 plugin.video.wired_com/changelog.txt               |    2 +
 plugin.video.wired_com/default.py                  |   32 ++++++++-----------
 .../resources/language/English/strings.xml         |    4 +-
 .../resources/language/German/strings.xml          |    2 +-
 11 files changed, 29 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Plugins


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to