[Xbmc-addons] Plugins branch, dharma, updated. c3fe2ee0037bf84880f64c4c2ecf4a0cbf59235c

Mon, 19 Sep 2011 00:14:32 -0700 

The branch, dharma has been updated
       via  c3fe2ee0037bf84880f64c4c2ecf4a0cbf59235c (commit)
       via  ead25f60bcbbe99828cdfb2ae88756bca4b9fc08 (commit)
       via  a9b56c5bb00e35e5aae9d70da703ee6a560b6189 (commit)
       via  2638f297ec9dcda57b5962d8d4d6002bacaaa3df (commit)
      from  866ef140eabe8766e03949ef50b97c0edcb7e1db (commit)

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

commit c3fe2ee0037bf84880f64c4c2ecf4a0cbf59235c
Author: spiff <[email protected]>
Date:   Mon Sep 19 09:08:59 2011 +0200

    [plugin.video.gametrailers.exclusives] updated to version 1.0.3

diff --git a/plugin.video.gametrailers.exclusives/addon.xml 
b/plugin.video.gametrailers.exclusives/addon.xml
index c5b0388..931db4c 100644
--- a/plugin.video.gametrailers.exclusives/addon.xml
+++ b/plugin.video.gametrailers.exclusives/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <addon id="plugin.video.gametrailers.exclusives"

-       name="GameTrailers.com - Original Shows"

-       version="1.0.2"

+       name="GameTrailers.com: Exclusive Shows"

+       version="1.0.3"

        provider-name="AssChin79">

     <requires>

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

@@ -13,6 +13,6 @@
         <platform>all</platform>

         <license>GPL 2.0</license>

         <summary lang="en">GTTV HD Video Game Programming</summary>

-        <description lang="en">High-definition GTTV video game 
programming</description>

+        <description lang="en">High-definition GTTV video game programming. (* 
Some content requires login.)</description>

     </extension>

 </addon>
\ No newline at end of file
diff --git a/plugin.video.gametrailers.exclusives/changelog.txt 
b/plugin.video.gametrailers.exclusives/changelog.txt
index 141246b..8e5ffbf 100644
--- a/plugin.video.gametrailers.exclusives/changelog.txt
+++ b/plugin.video.gametrailers.exclusives/changelog.txt
@@ -6,5 +6,15 @@
   - Added Spotlight categories

 

 1.0.2

-- Fixed bug with Spotlight: DS/3DS

-- Fixed bug with Spotlight: Wii
\ No newline at end of file
+  - Fixed bug with Spotlight: DS/3DS

+  - Fixed bug with Spotlight: Wii

+

+1.0.3

+  - Added support for user login / cookie handling

+  - Added new content: Top 100 Trailers of all time 

+  - Added new content: GT Countdown (requires GT account)

+  - Added new content: GT Retrospectives (requires GT account)

+  - Added new content: GT Top 20 Today (requires GT account)

+  - Added new content: Pop Fiction (requires GT account)

+  - Added new content: Science of Games (requires GT account)

+  - Added new content: ScrewAttack (requires GT account)

diff --git a/plugin.video.gametrailers.exclusives/default.py 
b/plugin.video.gametrailers.exclusives/default.py
index 3d93053..641b5be 100644
--- a/plugin.video.gametrailers.exclusives/default.py
+++ b/plugin.video.gametrailers.exclusives/default.py
@@ -1,33 +1,117 @@
-import urllib,urllib2,re,xbmcplugin,xbmcgui,sys

+import urllib,urllib2,re,xbmcplugin,xbmcgui,xbmcaddon,os,sys

 

 __scriptname__ = "GameTrailers_Bonus"

 __author__ = "AssChin79"

 __scriptid__ = "plugin.video.gametrailers.exclusives"

-__version__ = "1.0.2"

+__version__ = "1.0.3"

+__cwd__ = os.getcwd()

+__cookies__ = os.path.join( __cwd__, 'resources', 'cookies' )

+__cookie__ = os.path.join( __cookies__, 'cookies.lwp' )

+

+doLogin = False

+

+BASE_RESOURCE_PATH = os.path.join( __cwd__, 'resources', 'lib' )

+sys.path.append(BASE_RESOURCE_PATH)

+

+import weblogin

+import gethtml

+

+def Notify(title,message,times,icon):

+        
xbmc.executebuiltin("XBMC.Notification("+title+","+message+","+times+","+icon+")")

+

+

+def STARTUP():

+        #check if user has enabled login setting

+        usrsettings = xbmcaddon.Addon(id=__scriptid__)

+        use_account = usrsettings.getSetting('use-account')

+

+        if use_account == 'true':

+             #Get username/password, do login, and get whether to hide login 
notification

+             username = usrsettings.getSetting('username')

+             password = usrsettings.getSetting('password')

+             hidesuccess = 
usrsettings.getSetting('hide-successful-login-messages')

+

+             LOGIN(username,password,hidesuccess)

+             

+        else:

+            if os.path.exists(__cookie__) == True:

+                os.unlink(__cookie__)

+             

+

+def LOGIN(username,password,hidesuccess):

+    logged_in = weblogin.doLogin(__cookies__, username, password)

+    if logged_in == True:

+        doLogin=True

+        if hidesuccess == 'false':

+            Notify('User login Status','Successfully acquired GT 
cookie','4000','')

+

+    elif logged_in == False:

+            Notify('Login Failure', 'Could not acquire GT cookie','4000','')

+

+

+def COOKIE_EXIST():

+    try:

+        file = open(__cookie__)

+        file.close()

+        return True

+    except:

+        return False

+    

+

+def URLENCODECOOKIE():

+    cf = open(__cookie__, 'r')

+    cookie_send = cf.read()

+    cf.close()

+    

+    sidMatch = re.search('gtsid_vgs=(.+?);', cookie_send, re.S).group(0)

+    usrMatch = re.search('mosesuser="(.+?)"', cookie_send, re.S).group(0)

+    

+    encodedCookie = '|Cookie=Cookie:' + sidMatch + usrMatch.replace('"', '')

+    return encodedCookie

+    

 

 def CATEGORIES():

-       # Uri Sources: http://www.gametrailers.com/podcasts.php

-        addDir('Bonus 
Round','http://feeds.gametrailers.com/rss_ipod_br_season3.php',1,'http://www.gametrailers.com/images/podcast_bonusround.jpg')

-        addDir('Electronic Entertainment Expo (E3)', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=e311ms',1,'http://gametrailers.mtvnimages.com/images/podcasts/GTE3_2011_big.jpg')

-        addDir('Epic Battle Axe', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=eba',1,'http://gametrailers.mtvnimages.com/images/podcasts/600x600_PodCast_EBA.jpg')

-        addDir('Game Interviews', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=interviews',1,'http://gametrailers.mtvnimages.com/images/podcasts/VideoInterviews.jpg')

-        addDir('Game of the Year Awards', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=gtgoty2010',1,'http://gametrailers.mtvnimages.com/images/podcasts/600x600_GT_GOTY.jpg')

-        addDir('Game Previews', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=previews',1,'http://gametrailers.mtvnimages.com/images/podcasts/VideoPreviews.jpg')

-        addDir('Game 
Reviews','http://feeds.gametrailers.com/rss_ipod_gen.php',1,'http://gametrailers.mtvnimages.com/images/podcasts/VideoReviews.jpg')

-        addDir('GT Motion', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=gtmotion',1,'http://gametrailers.mtvnimages.com/images/podcasts/GTMotion.jpg')

-        addDir('Invisible Walls', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=iw',1,'http://gametrailers.mtvnimages.com/images/podcasts/IW.jpg')

-        addDir('Pach Attack', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=pa',1,'http://gametrailers.mtvnimages.com/images/podcasts/PachAttack.jpg')

-       addDir('Spotlight: Microsoft XBOX360', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=xb360',1,'http://gametrailers.mtvnimages.com/images/podcasts/Xbox360.jpg')

-       addDir('Spotlight: Nintendo 3DS', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=3ds',1,'http://gametrailers.mtvnimages.com/images/podcasts/600x600_PodCast_3DS.jpg')

-       addDir('Spotlight: Nintendo DS', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=ds',1,'http://gametrailers.mtvnimages.com/images/podcasts/DS.jpg')

-       addDir('Spotlight: Nintendo Wii', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=wii',1,'http://gametrailers.mtvnimages.com/images/podcasts/PodCast_Wii.jpg')

-       addDir('Spotlight: Sony PS3', 
'http://www.gametrailers.com/gtps3_podcast.xml',1,'http://gametrailers.mtvnimages.com/images/podcasts/SonyPS3.jpg')

-       addDir('Spotlight: Sony PSP', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=psp',1,'http://gametrailers.mtvnimages.com/images/podcasts/PSP.jpg')

+    # Uri Sources: http://www.gametrailers.com/podcasts.php

+    addDir('Bonus 
Round','http://feeds.gametrailers.com/rss_ipod_br_season3.php',1,'http://www.gametrailers.com/images/podcast_bonusround.jpg')

+    addDir('Electronic Entertainment Expo (E3)', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=e311ms',1,'http://gametrailers.mtvnimages.com/images/podcasts/GTE3_2011_big.jpg')

+    addDir('Epic Battle Axe', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=eba',1,'http://gametrailers.mtvnimages.com/images/podcasts/600x600_PodCast_EBA.jpg')

+    addDir('Game Interviews', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=interviews',1,'http://gametrailers.mtvnimages.com/images/podcasts/VideoInterviews.jpg')

+    addDir('Game of the Year Awards', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=gtgoty2010',1,'http://gametrailers.mtvnimages.com/images/podcasts/600x600_GT_GOTY.jpg')

+    addDir('Game Previews', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=previews',1,'http://gametrailers.mtvnimages.com/images/podcasts/VideoPreviews.jpg')

+    addDir('Game 
Reviews','http://feeds.gametrailers.com/rss_ipod_gen.php',1,'http://gametrailers.mtvnimages.com/images/podcasts/VideoReviews.jpg')

+    

+    # Protected resource

+    if (COOKIE_EXIST()) == True:

+        addDir('GT 
Countdown','http://www.msoftinfosystems.com/news/mirror/rss/gt/gt_countdown.xml',1,'http://www.msoftinfosystems.com/news/mirror/rss/gt/gt_countdown.jpg')
    

+

+    addDir('GT Motion', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=gtmotion',1,'http://gametrailers.mtvnimages.com/images/podcasts/GTMotion.jpg')

+    

+    # Protected resource

+    if (COOKIE_EXIST()) == True:

+        addDir('GT 
Retrospectives','http://www.msoftinfosystems.com/news/mirror/rss/gt/gt_retrospectives.xml',1,'http://www.msoftinfosystems.com/news/mirror/rss/gt/gt_retrospectives.jpg')

+        addDir('GT Top 20 
Today','http://www.msoftinfosystems.com/news/mirror/rss/gt/gt_top20.xml',1,'http://www.msoftinfosystems.com/news/mirror/rss/gt/gt_top20.jpg')

+    

+    addDir('Invisible Walls', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=iw',1,'http://gametrailers.mtvnimages.com/images/podcasts/IW.jpg')

+    addDir('Pach Attack', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=pa',1,'http://gametrailers.mtvnimages.com/images/podcasts/PachAttack.jpg')

+

+    # Protected resource

+    if (COOKIE_EXIST()) == True:

+        addDir('Pop 
Fiction','http://www.msoftinfosystems.com/news/mirror/rss/gt/pop_fiction.xml',1,'http://www.msoftinfosystems.com/news/mirror/rss/gt/pop_fiction.jpg')

+        addDir('Science of 
Games','http://www.msoftinfosystems.com/news/mirror/rss/gt/science_of_games.xml',1,'http://www.msoftinfosystems.com/news/mirror/rss/gt/science_of_games.jpg')

+        
addDir('ScrewAttack','http://www.msoftinfosystems.com/news/mirror/rss/gt/screwattack.xml',1,'http://www.msoftinfosystems.com/news/mirror/rss/gt/screwattack.jpg')

+

+    addDir('Spotlight: Microsoft XBOX360', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=xb360',1,'http://gametrailers.mtvnimages.com/images/podcasts/Xbox360.jpg')

+    addDir('Spotlight: Nintendo 3DS', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=3ds',1,'http://gametrailers.mtvnimages.com/images/podcasts/600x600_PodCast_3DS.jpg')

+    addDir('Spotlight: Nintendo DS', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=ds',1,'http://gametrailers.mtvnimages.com/images/podcasts/DS.jpg')

+    addDir('Spotlight: Nintendo Wii', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=wii',1,'http://gametrailers.mtvnimages.com/images/podcasts/PodCast_Wii.jpg')

+    addDir('Spotlight: Sony PS3', 
'http://www.gametrailers.com/gtps3_podcast.xml',1,'http://gametrailers.mtvnimages.com/images/podcasts/SonyPS3.jpg')

+    addDir('Spotlight: Sony PSP', 
'http://feeds.gametrailers.com/rss_ipod_gen.php?source=psp',1,'http://gametrailers.mtvnimages.com/images/podcasts/PSP.jpg')

+    addDir('Top 100 Trailers of all 
Time','http://www.msoftinfosystems.com/news/mirror/rss/gt/top100trailers.xml',1,'http://gametrailers.mtvnimages.com/images//moses/xmassives/platform_images/88x69_Top100.jpg')

                        

 def INDEX(url):

        req = urllib2.Request(url)

-       #req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; 
en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')

-       req.add_header('User-Agent', 'iTunes/9.0.2 (Windows; U)')

+       req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; 
en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')

+       #req.add_header('User-Agent', 'iTunes/9.0.2 (Windows; U)')

        response = urllib2.urlopen(req)

        oStream = response.read()

        response.close()

@@ -42,8 +126,8 @@ def INDEX(url):
 

 def VIDEOLINKS(url,name):

         req = urllib2.Request(url)

-        #req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 
5.1; en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')

-        req.add_header('User-Agent', 'iTunes/9.0.2 (Windows; U)')

+        req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; 
en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')

+        #req.add_header('User-Agent', 'iTunes/9.0.2 (Windows; U)')

         response = urllib2.urlopen(req)

         link=response.read()

         response.close()

@@ -75,22 +159,25 @@ def get_params():
 

 

 def addLink(name,url,iconimage):

-        ok=True

-        liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png", 
thumbnailImage=iconimage)

-        liz.setInfo( type="Video", infoLabels={ "Title": name } )

-        
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)

-        return ok

+    if (COOKIE_EXIST()) == True:

+        url = url + URLENCODECOOKIE()

+        

+    ok=True

+    liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png", 
thumbnailImage=iconimage)

+    liz.setInfo( type="Video", infoLabels={ "Title": name } )

+    
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)

+    return ok

 

 

 def addDir(name,url,mode,iconimage):

-        
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)

-        ok=True

-        liz=xbmcgui.ListItem(name, iconImage="DefaultFolder.png", 
thumbnailImage=iconimage)

-        liz.setInfo( type="Video", infoLabels={ "Title": name } )

-        
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)

-        return ok

+    
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)

+    ok=True

+    liz=xbmcgui.ListItem(name, iconImage="DefaultFolder.png", 
thumbnailImage=iconimage)

+    liz.setInfo( type="Video", infoLabels={ "Title": name } )

+    
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)

+    return ok

         

-              

+  

 params=get_params()

 url=None

 name=None

@@ -114,16 +201,17 @@ print "URL: "+str(url)
 print "Name: "+str(name)

 

 if mode==None or url==None or len(url)<1:

-        print ""

-        CATEGORIES()

+    STARTUP()

+    print ""

+    CATEGORIES()

        

 elif mode==1:

-        print ""+url

-        INDEX(url)

+    print ""+url

+    INDEX(url)

         

 elif mode==2:

-        print ""+url

-        VIDEOLINKS(url,name)

+    print ""+url

+    VIDEOLINKS(url,name)

 

 

 

diff --git a/plugin.video.gametrailers.exclusives/icon.png 
b/plugin.video.gametrailers.exclusives/icon.png
index 8e99d10..a4a0639 100644
Binary files a/plugin.video.gametrailers.exclusives/icon.png and 
b/plugin.video.gametrailers.exclusives/icon.png differ

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

commit ead25f60bcbbe99828cdfb2ae88756bca4b9fc08
Author: spiff <[email protected]>
Date:   Mon Sep 19 09:06:42 2011 +0200

    [plugin.video.mediathek] updated to version 0.2.3

diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index 2fd3595..52aa013 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="plugin.video.mediathek"
-  version="0.2.2"
+  version="0.2.3"
   name="Mediathek"
   provider-name="Raptor 2101 [[email protected]]">
   <requires>
diff --git a/plugin.video.mediathek/changelog.txt 
b/plugin.video.mediathek/changelog.txt
index 2b99a13..6158d79 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.2.3 - ADD: BR-Alpha
 0.2.2 - ADD: WDR Mediathek
         FIX: ZDF Mediathek will now ignore mp3 files
         FIX: OfflineCache removed
diff --git a/plugin.video.mediathek/html.py b/plugin.video.mediathek/html.py
index c70c2ec..efccdd8 100644
--- a/plugin.video.mediathek/html.py
+++ b/plugin.video.mediathek/html.py
@@ -23,6 +23,7 @@ def transformHtmlCodes(string):
     (u'Ö', u'&Ouml;'),
     (u'ä', u'&auml;'),
     (u'ü', u'&uuml;'),
+    (u'ü', u'&#252;'),
     (u'ö', u'&ouml;'),
     (u'ß', u'&szlig;'),
     (u'\"',u'&#034;'),
diff --git a/plugin.video.mediathek/mediathek/factory.py 
b/plugin.video.mediathek/mediathek/factory.py
index ce6acac..6d3f488 100644
--- a/plugin.video.mediathek/mediathek/factory.py
+++ b/plugin.video.mediathek/mediathek/factory.py
@@ -22,6 +22,7 @@ from mediathek.arte import *
 from mediathek.dreisat import *
 from mediathek.bayerisches import *
 from mediathek.orf import *
+from mediathek.bralpha import *
 
 class MediathekFactory(object):
   def __init__(self):
@@ -33,6 +34,7 @@ class MediathekFactory(object):
        BayerischesFSMediathek.name():BayerischesFSMediathek,
        ORFMediathek.name():ORFMediathek,
        WDRMediathek.name():WDRMediathek,
+       BRAlphaMediathek.name():BRAlphaMediathek,
       }
   def getAvaibleMediathekTypes(self):
     return sorted(self.avaibleMediathekes.keys())
diff --git a/plugin.video.mediathek/simplexbmc.py 
b/plugin.video.mediathek/simplexbmc.py
index a0a1e77..3c5075f 100644
--- a/plugin.video.mediathek/simplexbmc.py
+++ b/plugin.video.mediathek/simplexbmc.py
@@ -82,13 +82,16 @@ class SimpleXbmcGui(object):
           listItem.setProperty("PlayPath", link.playPath);
 
         self.log("URL:"+ link.basePath);
-        listItem.setInfo("video",{
-          "size": link.size,
-          "date": time.strftime("%d.%m.%Y",displayObject.date),
-          "year": int(time.strftime("%Y",displayObject.date)),
-          "title": title,
-          "plot": transformHtmlCodes(displayObject.description)
-        });
+        try:
+          listItem.setInfo("video",{
+            "size": link.size,
+            "date": time.strftime("%d.%m.%Y",displayObject.date),
+            "year": int(time.strftime("%Y",displayObject.date)),
+            "title": title,
+            "plot": transformHtmlCodes(displayObject.description)
+          }); 
+        except:
+          pass;
       
       
         listItem.setProperty('IsPlayable', 'true');

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

commit a9b56c5bb00e35e5aae9d70da703ee6a560b6189
Author: spiff <[email protected]>
Date:   Mon Sep 19 09:05:24 2011 +0200

    [plugin.video.nos] initial version (1.0.0). thanks to ErwinJunge

diff --git a/.gitignore b/.gitignore
index 2a29e83..1048bf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ plugin.video.onside.tv/.git
 plugin.video.onside.tv/.idea
 plugin.video.gametest.dk/.git
 plugin.video.gametest.dk/.idea
+plugin.video.nos/.git

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

commit 2638f297ec9dcda57b5962d8d4d6002bacaaa3df
Author: spiff <[email protected]>
Date:   Mon Sep 19 09:02:02 2011 +0200

    [plugin.video.musicvideojukebox] updated to version 1.1.0

diff --git a/plugin.video.musicvideojukebox/Default.py 
b/plugin.video.musicvideojukebox/Default.py
index 4a4b8f3..872a41c 100644
--- a/plugin.video.musicvideojukebox/Default.py
+++ b/plugin.video.musicvideojukebox/Default.py
@@ -118,62 +118,13 @@ def playVideo(params):
     

     videoId = params.get("videoId")

     

-    response = 
getHttpResponse("http://www.youtube.com/watch?v=%s&safeSearch=none&hl=en_us"; % 
videoId)

-    

-    ''' get urls from response '''

-    ''' fmturlmaps = re.findall('"fmt_url_map": "([^"]+)"', response); '''

-    fmturlmaps = re.findall('"url_encoded_fmt_stream_map": "([^"]+)"', 
response);

-        

-    ''' we only need the first fmturlmaps '''

-    fmturlmaps = fmturlmaps[0].split(',')

-    

-    urls = {}    

-    for fmturlmap in fmturlmaps:

-        fmturlmap = fmturlmap.replace("url=", "");

-                

-        ''' itag= '''

-        itag = fmturlmap[fmturlmap.rfind("itag=") + 5:];

-        

-        ''' split by | '''

-        ''' fmtinfo = fmturlmap.split( '|' ) '''

-        ''' urls[int(fmtinfo[0])] = fmtinfo[1].replace('\/', '/') '''

-        

-        ''' cut last part '''

-        urlparts = fmturlmap.split('\u0026');

-        

-        urls[int(itag)] = urllib.unquote_plus(urlparts[0]);

-        

+    ''' call the youtube player '''

+    url = 
"plugin://plugin.video.youtube?path=/root&action=play_video&videoid=%s" % 
params.get( "videoId")

         

-    

-    ''' get highest available format:

-        SD videos: 35, 34, 18, 5

-        HD videos: 22 (720p), 37 (1080p)

-    

-    '''    

-        

-    ''' get preferred format from settings '''

-    quality = int(__settings__.getSetting("quality"))

-    

-    if urls.get(37) and quality==2:

-        url = urls.get(37)

-    elif urls.get(22) and quality>=1:

-        url = urls.get(22)

-    elif urls.get(35):

-        url = urls.get(35)

-    elif urls.get(34):

-        url = urls.get(34)

-    elif urls.get(18):

-        url = urls.get(18)

-    elif urls.get(5):

-        url = urls.get(5)

-        

-    ''' url = url.replace('\u0026', '&'); '''

-                

-    listitem=xbmcgui.ListItem(label=params.get('title'), 
iconImage=params.get('thumbnail'), thumbnailImage=params.get('thumbnail'), 
path=url);    

-    ''' listitem.setInfo(type='Video', infoLabels=labels) '''

-

+    listitem=xbmcgui.ListItem(label=params.get('title'), 
iconImage=params.get('thumbnail'), thumbnailImage=params.get('thumbnail'), 
path=url)

     xbmcplugin.setResolvedUrl(handle=int(sys.argv[1]), succeeded=True, 
listitem=listitem)

     

+        

 def playAll(params):

     showMessage(__language__(30302), __language__(30301))

     

diff --git a/plugin.video.musicvideojukebox/addon.xml 
b/plugin.video.musicvideojukebox/addon.xml
index 84af91c..fc8128a 100644
--- a/plugin.video.musicvideojukebox/addon.xml
+++ b/plugin.video.musicvideojukebox/addon.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.musicvideojukebox"
        name="Music Video Jukebox"
-       version="1.0.2"
+       version="1.1.0"
        provider-name="iZE">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
+    <import addon="plugin.video.youtube" version="2.1.0" />
   </requires>
   <extension point="xbmc.python.pluginsource"
             library="Default.py">
diff --git a/plugin.video.musicvideojukebox/changelog.txt 
b/plugin.video.musicvideojukebox/changelog.txt
index bbe788a..d336e83 100644
--- a/plugin.video.musicvideojukebox/changelog.txt
+++ b/plugin.video.musicvideojukebox/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.1.0

+-------------

+- now uses the plugin.video.youtube plugin to play videos from youtube

+

 Version 1.0.2

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

 - fixed problem with the plugin not being able to play the videos due to 
changes on the Youtube website

diff --git a/plugin.video.musicvideojeing able to play the videos due to 
changes on the Youtube website
=params.get('thumbnail'), path=url)
  
om/images//moses/xmassives/platform_images/88x69_Top100.jpg')
€0cM©+Ðù«ÿ ù«ÿk $L©+6 
èè!è!pù«ÿàù«ÿxÔ@M©+Ðù«ÿ’$L©+†
 $L©+pù«ÿ`$L©+¯ù«ÿÀϤM©+u
$L©+À¤M©+ØĤM©+¨É¤M©+€*%L©+xÔ@M©+Ðù«ÿ ù«ÿk
 $L©+à!à!pù«ÿàù«ÿHž 
M©+°ù«ÿ’$L©+† 
$L©+pù«ÿ`$L©+¯ù«ÿ ù«ÿ˜ù«ÿ8+EL©+Œp˜àù«ÿu
$L©+€*%L©+°ù«ÿ€ù«ÿk 
$L©+GHIJKMNOPpù«ÿàù«ÿHU÷L©+Pù«ÿ’$L©+†
 $L©+pù«ÿ0ϤM©+u
$L©+à@M©+ ‰ÔL©+À¤M©+ØĤM©+¨É¤M©+€*%L©+HU÷L©+Pù«ÿù«ÿk
 $L©+8U÷L©+Pù«ÿÀù«ÿk 
$L©+(U÷L©+Pù«ÿðù«ÿk 
$L©+U÷L©+Pù«ÿ ù«ÿk $L©+  ¨Î¤M©+u
$L©+¨É¤M©+ ù«ÿŠØÔL©+e 
$L©+ØĤM©+Àù«ÿyØÔL©+e 
$L©+À¤M©+ðù«ÿZØÔL©+e 
$L©+؄ÔL©+à@M©+ ‰ÔL©+À¤M©+Øä@M©+ØĤM©+¨É¤M©+€*%L©+8+EL©+M L©+àù«ÿpÔL©+ ù«ÿpù«ÿk
 
$L©+5678:<=>?@BDpù«ÿàù«ÿàML©+àù«ÿu
$L©+%EL©+ ù«ÿM L©+e $L©+%EL©+Õ_@fÆS 
Qöl±íÁclL©+àù«ÿàML©+°ù«ÿ€ù«ÿk 
$L©+u]ÞÓ      
4Q ÷U^Qʉ§¶uª¹ñìò*ēvpù«ÿàù«ÿHžiL©+ä¥L©+ 
!ù«ÿ¦ðN©+¦ðN©+6£L©+¯ù«ÿà ù«ÿ˜ù«ÿù«ÿï@M©+u
$L©+Øä@M©+`"ù«ÿ¢ðN©+0!ù«ÿÀù«ÿÿÿÿÿÿÿÿÿ¢ðN©+èù«ÿukebox/resources/language/English/strings.xml
 b/plugin.video.musicvideojukebox/resources/language/English/strings.xml
index d5febfe..1f912df 100644
--- a/plugin.video.musicvideojukebox/resources/language/English/strings.xml
+++ b/plugin.video.musicvideojukebox/resources/language/English/strings.xml
@@ -17,4 +17,5 @@
        <string id="30305">No videos found</string>
        <string id="30306">No videos found for %s</string> 
     
+    
 </strings>
diff --git a/plugin.video.musicvideojukebox/resources/settings.xml 
b/plugin.video.musicvideojukebox/resources/settings.xml
index 4646255..a8c259e 100644
--- a/plugin.video.musicvideojukebox/resources/settings.xml
+++ b/plugin.video.musicvideojukebox/resources/settings.xml
@@ -3,7 +3,6 @@
 
   <!-- General -->
   <category label="30001">
-    <setting id="quality" type="enum" label="30101" values="480p|720p|1080p" 
default="0" />
     <setting id="shuffle" type="bool" label="30102" default="false" />
     <setting id="maxsearches" type="enum" label="30103" 
values="10|20|40|60|80" default="0" />
   </category>

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

Summary of changes:
 .gitignore                                         |    1 +
 .../__init__.py                                    |    0
 plugin.video.gametrailers.exclusives/addon.xml     |    6 +-
 plugin.video.gametrailers.exclusives/changelog.txt |   14 ++-
 plugin.video.gametrailers.exclusives/default.py    |  170 +++++++++++++----
 plugin.video.gametrailers.exclusives/icon.png      |  Bin 80720 -> 55454 bytes
 .../resources}/__init__.py                         |    0
 .../resources/language/english/strings.xml         |    6 +
 .../resources/lib}/__init__.py                     |    0
 .../resources/lib/gethtml.py                       |   98 ++++++++++
 .../resources/lib/weblogin.py                      |  130 +++++++++++++
 .../resources/settings.xml                         |    6 +
 plugin.video.mediathek/addon.xml                   |    2 +-
 plugin.video.mediathek/changelog.txt               |    1 +
 plugin.video.mediathek/html.py                     |    1 +
 plugin.video.mediathek/mediathek/bralpha.py        |  203 ++++++++++++++++++++
 plugin.video.mediathek/mediathek/factory.py        |    2 +
 plugin.video.mediathek/simplexbmc.py               |   17 +-
 plugin.video.musicvideojukebox/Default.py          |   57 +-----
 plugin.video.musicvideojukebox/addon.xml           |    3 +-
 plugin.video.musicvideojukebox/changelog.txt       |    4 +
 .../resources/language/English/strings.xml         |    1 +
 .../resources/settings.xml                         |    1 -
 .../LICENSE.txt                                    |    0
 plugin.video.nos/README                            |    6 +
 plugin.video.nos/addon.xml                         |   22 ++
 plugin.video.nos/changelog.txt                     |    2 +
 plugin.video.nos/default.py                        |   64 ++++++
 plugin.video.nos/icon.png                          |  Bin 0 -> 13381 bytes
 .../modules}/__init__.py                           |    0
 plugin.video.nos/modules/jeugdjournaal.py          |   47 +++++
 plugin.video.nos/modules/journaal_op_3.py          |   46 +++++
 plugin.video.nos/modules/journaal_videos.py        |   64 ++++++
 plugin.video.nos/modules/laatste_journaals.py      |   77 ++++++++
 plugin.video.nos/modules/nieuws_in_60_seconden.py  |   65 +++++++
 plugin.video.nos/modules/schaatsen_videos.py       |   64 ++++++
 plugin.video.nos/modules/studio_sport_videos.py    |   64 ++++++
 37 files changed, 1135 insertions(+), 109 deletions(-)
 copy {plugin.audio.soundcloud/oauth2/clients => 
plugin.video.gametrailers.exclusives}/__init__.py (100%)
 copy {plugin.audio.soundcloud/oauth2/clients => 
plugin.video.gametrailers.exclusives/resources}/__init__.py (100%)
 create mode 100644 
plugin.video.gametrailers.exclusives/resources/language/english/strings.xml
 copy {plugin.audio.soundcloud/oauth2/clients => 
plugin.video.gametrailers.exclusives/resources/lib}/__init__.py (100%)
 create mode 100644 
plugin.video.gametrailers.exclusives/resources/lib/gethtml.py
 create mode 100644 
plugin.video.gametrailers.exclusives/resources/lib/weblogin.py
 create mode 100644 plugin.video.gametrailers.exclusives/resources/settings.xml
 create mode 100644 plugin.video.mediathek/mediathek/bralpha.py
 copy {plugin.audio.abradio.cz => plugin.video.nos}/LICENSE.txt (100%)
 create mode 100644 plugin.video.nos/README
 create mode 100644 plugin.video.nos/addon.xml
 create mode 100644 plugin.video.nos/changelog.txt
 create mode 100644 plugin.video.nos/default.py
 create mode 100644 plugin.video.nos/icon.png
 copy {plugin.audio.soundcloud/oauth2/clients => 
plugin.video.nos/modules}/__init__.py (100%)
 create mode 100644 plugin.video.nos/modules/jeugdjournaal.py
 create mode 100644 plugin.video.nos/modules/journaal_op_3.py
 create mode 100644 plugin.video.nos/modules/journaal_videos.py
 create mode 100644 plugin.video.nos/modules/laatste_journaals.py
 create mode 100644 plugin.video.nos/modules/nieuws_in_60_seconden.py
 create mode 100644 plugin.video.nos/modules/schaatsen_videos.py
 create mode 100644 plugin.video.nos/modules/studio_sport_videos.py


hooks/post-receive
-- 
Plugins


------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the 
BlackBerry&reg; mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry&reg; DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1 
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to