The branch, frodo has been updated
via d4ce0bae43522975efa033f58fcb453308fa8a5b (commit)
via 3b690bb8b81dd2fb0446d9df1e8de70c518be4a8 (commit)
via 9648367213b81fa0c5a3f20a419274136afc9c03 (commit)
from 1bac28307179fb848131d6b7de0f94c61ff63f3c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d4ce0bae43522975efa033f58fcb453308fa8a5b
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3b690bb8b81dd2fb0446d9df1e8de70c518be4a8
commit 3b690bb8b81dd2fb0446d9df1e8de70c518be4a8
Author: Martijn Kaijser <[email protected]>
Date: Tue Nov 12 12:46:35 2013 +0100
[plugin.video.discovery_com] 2.0.3
diff --git a/plugin.video.discovery_com/addon.xml
b/plugin.video.discovery_com/addon.xml
index 0e69d7e..ddcf4bc 100644
--- a/plugin.video.discovery_com/addon.xml
+++ b/plugin.video.discovery_com/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.discovery_com" name="Discovery Networks"
version="2.0.1" provider-name="AddonScriptorDE">
+<addon id="plugin.video.discovery_com" name="Discovery Networks"
version="2.0.3" provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="plugin.video.howstuffworks_com" version="1.0.0"/>
@@ -12,9 +12,10 @@
<summary lang="en">Watch news, clips and full episodes on Discovery
Network Channels (+AnimalPlanet Live streams)</summary>
<language>en</language>
<description lang="en">Watch news, clips and full episodes on
Discovery Network Channels (+AnimalPlanet Live streams)</description>
- <website>http://www.discovery.com</website>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
<source>https://github.com/AddonScriptorDE/plugin.video.discovery_com</source>
- <forum>http://forum.xbmc.org/showthread.php?tid=</forum>
+ <forum>http://forum.xbmc.org/showthread.php?tid=171876</forum>
<email>AddonScriptorDE at yahoo dot de</email>
+ <website>http://www.discovery.com</website>
</extension>
</addon>
diff --git a/plugin.video.discovery_com/changelog.txt
b/plugin.video.discovery_com/changelog.txt
index f0bed1f..5b7ad34 100644
--- a/plugin.video.discovery_com/changelog.txt
+++ b/plugin.video.discovery_com/changelog.txt
@@ -1,4 +1,9 @@
-1.0.0
+2.0.0
- Initial release
-1.0.1
+2.0.1
- Fixed video playback bug
+2.0.2
+- Fixed site changes
+- Added category "Full episodes" per channel
+2.0.3
+- Fixed site changes
diff --git a/plugin.video.discovery_com/default.py
b/plugin.video.discovery_com/default.py
index 188ce70..6dacf44 100644
--- a/plugin.video.discovery_com/default.py
+++ b/plugin.video.discovery_com/default.py
@@ -32,16 +32,16 @@ iconPathNews = os.path.join(thumbsDir, "discovery_news.png")
def index():
addDir("Discovery News", "", 'listNewsMain', iconPathNews)
- addDir("Discovery Channel", urlMain+"/videos", 'listShows',
os.path.join(thumbsDir, "discovery_channel.png"))
- addDir("Animal Planet", "http://animal.discovery.com/videos";, 'listShows',
os.path.join(thumbsDir, "animal_planet.png"))
+ addDir("Discovery Channel", urlMain+"/videos", 'listShows',
os.path.join(thumbsDir, "discovery_channel.png"), "", "", "Discovery")
+ addDir("Animal Planet", "http://animal.discovery.com/videos";, 'listShows',
os.path.join(thumbsDir, "animal_planet.png"), "", "", "APL")
addDir("Animal Planet Live", "", 'listAPL', os.path.join(thumbsDir,
"animal_planet_live.png"))
- addDir("TLC", "http://www.tlc.com/videos";, 'listShows',
os.path.join(thumbsDir, "tlc.png"))
- addDir("Science Channel", "http://science.discovery.com/videos";,
'listShows', os.path.join(thumbsDir, "science_channel.png"))
- addDir("Destination America", "http://america.discovery.com/videos";,
'listShows', os.path.join(thumbsDir, "destination_america.png"))
- addDir("Investigation Discovery",
"http://investigation.discovery.com/videos";, 'listShows',
os.path.join(thumbsDir, "investigation_discovery.png"))
- addDir("Military Channel", "http://military.discovery.com/videos";,
'listShows', os.path.join(thumbsDir, "military_channel.png"))
- addDir("Velocity", "http://velocity.discovery.com/tv-shows";, 'listShows',
os.path.join(thumbsDir, "velocity.png"))
- addDir("Discovery fit&health", "http://health.discovery.com/tv-shows";,
'listShows', os.path.join(thumbsDir, "discovery_fit_health.png"))
+ addDir("TLC", "http://www.tlc.com/videos";, 'listShows',
os.path.join(thumbsDir, "tlc.png"), "", "", "TLC")
+ addDir("Science Channel", "http://science.discovery.com/videos";,
'listShows', os.path.join(thumbsDir, "science_channel.png"), "", "",
"Science%2520Channel")
+ addDir("Destination America", "http://america.discovery.com/videos";,
'listShows', os.path.join(thumbsDir, "destination_america.png"), "", "", "DAM")
+ addDir("Investigation Discovery",
"http://investigation.discovery.com/videos";, 'listShows',
os.path.join(thumbsDir, "investigation_discovery.png"), "", "",
"Investigation%2520Discovery")
+ addDir("Military Channel", "http://military.discovery.com/videos";,
'listShows', os.path.join(thumbsDir, "military_channel.png"), "", "",
"Military%2520Channel")
+ addDir("Velocity", "http://velocity.discovery.com/videos";, 'listShows',
os.path.join(thumbsDir, "velocity.png"), "", "", "Velocity")
+ addDir("Discovery fit&health", "http://health.discovery.com/tv-shows";,
'listShows', os.path.join(thumbsDir, "discovery_fit_health.png"), "", "",
"Health")
addPluginDir("HowStuffWorks", "plugin://plugin.video.howstuffworks_com",
os.path.join(thumbsDir, "how_stuff_works.png"))
if forceViewMode:
xbmc.executebuiltin('Container.SetViewMode('+viewModeNewsShows+')')
@@ -111,40 +111,43 @@ def listNewsCollections(url):
xbmcplugin.endOfDirectory(pluginhandle)
-def listShows(url):
+def listShows(url, channelID, channelThumb):
currentUrl = url
content = getUrl(url)
- spl = content.split('<div class="show-badge"')
+ #addDir(translation(30003),
urlMain+"/services/taxonomy/"+channelID+"/?num="+itemsPerPage+"&page=0&filter=fullepisode&tpl=dds%2Fmodules%2Fvideo%2Fall_assets_list.html&order=desc&feedGroup=video",
'listVideos', channelThumb, "fullepisode")
+ content = content[content.find('<div class="module-all-shows-carousel
shows-other">'):]
+ content = content[:content.find('<div class="navigation')]
+ spl = content.split('<a href="/tv-shows')
for i in range(1, len(spl), 1):
entry = spl[i]
- match = re.compile('href="/tv-shows/(.+?)"', re.DOTALL).findall(entry)
+ match = re.compile('/(.+?)"', re.DOTALL).findall(entry)
+ id = match[0]
+ if "/" in id:
+ id = id[:id.find("/")]
+ if currentUrl.endswith("/videos"):
+ url = currentUrl[:currentUrl.find("/videos")]+"/tv-shows/"+id
+ elif currentUrl.endswith("/tv-shows"):
+ url = currentUrl[:currentUrl.find("/tv-shows")]+"/tv-shows/"+id
+ match = re.compile('title="(.+?)"', re.DOTALL).findall(entry)
+ if match:
+ title = cleanTitle(match[0]).replace(" Videos", "")
+ else:
+ title = id.replace("-", " ").title()
+ match = re.compile('data-original="(.+?)"', re.DOTALL).findall(entry)
+ thumb = ""
if match:
- id = match[0]
- if "/" in id:
- id = id[:id.find("/")]
- match = re.compile('href="(.+?)"', re.DOTALL).findall(entry)
- if currentUrl.endswith("/videos"):
- url = currentUrl[:currentUrl.find("/videos")]+match[0]
- elif currentUrl.endswith("/tv-shows"):
- url = currentUrl[:currentUrl.find("/tv-shows")]+match[0]
- match = re.compile('title="(.+?)"', re.DOTALL).findall(entry)
- if match:
- title = cleanTitle(match[0]).replace(" Videos", "")
- else:
- title = id.replace("-", " ").title()
- match = re.compile('src="(.+?)"', re.DOTALL).findall(entry)
thumb = match[0].replace(" ", "%20")
- addDir(title, url, 'listVideosMain', thumb)
+ addDir(title, url, 'listVideos', thumb)
if forceViewMode:
xbmc.executebuiltin('Container.SetViewMode('+viewModeNewsShows+')')
xbmcplugin.endOfDirectory(pluginhandle)
-def listVideosMain(url):
+def listVideosMain(url, channelThumb):
content = getUrl(url)
if '<div class="module-videos-carousel full-episode-assets">' in content:
- addDir(translation(30003), url, 'listVideos', "", "fullepisode")
- addDir(translation(30004), url, 'listVideos', "", "clip")
+ addDir(translation(30003), url, 'listVideos', channelThumb,
"fullepisode")
+ addDir(translation(30004), url, 'listVideos', channelThumb, "clip")
if forceViewMode:
xbmc.executebuiltin('Container.SetViewMode('+viewModeNewsShows+')')
xbmcplugin.endOfDirectory(pluginhandle)
@@ -155,7 +158,7 @@ def listVideosMain(url):
def listVideos(url, type="clip"):
content = getUrl(url)
xbmcplugin.setContent(pluginhandle, "episodes")
- if "/services/taxonomy/" in url or "data-service-uri=" in content:
+ if ("/services/taxonomy/" in url and '<div class="thumbnail still-small">'
in content) or "data-service-uri=" in content:
if "/services/taxonomy/" not in url:
match = re.compile('data-service-uri="(.+?)"',
re.DOTALL).findall(content)
url =
urlMain+match[0]+"?num="+itemsPerPage+"&page=0&filter="+type+"&tpl=dds%2Fmodules%2Fvideo%2Fall_assets_list.html&sort=date&order=desc&feedGroup=video"
@@ -166,8 +169,14 @@ def listVideos(url, type="clip"):
entry = spl[i]
match = re.compile('<h4>.+?>(.+?)<', re.DOTALL).findall(entry)
title = cleanTitle(match[0])
+ match = re.compile('<h5>(.+?)</h5>', re.DOTALL).findall(entry)
+ title2 = cleanTitle(match[0])
+ if type=="fullepisode":
+ title = title2 + ": " + title
match = re.compile('<p class="description">(.+?)</p>',
re.DOTALL).findall(entry)
- desc = cleanTitle(match[0])
+ desc = ""
+ if match:
+ desc = cleanTitle(match[0])
match = re.compile('<div class="length">(.+?)</div>',
re.DOTALL).findall(entry)
length = match[0]
splLength = length.split(":")
@@ -302,7 +311,7 @@ def addLink(name, url, mode, iconimage, desc, length="",
date="", nr=""):
u = sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)
ok = True
liz = xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
- liz.setInfo(type="Video", infoLabels={"Title": name, "Plot": desc,
"Aired": date, "Episode": nr})
+ liz.setInfo(type="Video", infoLabels={"Title": name, "Plot": desc,
"Aired": date, "Episode": "1"})
if length:
liz.addStreamInfo('video', {'duration': int(length)})
liz.setProperty('IsPlayable', 'true')
@@ -312,8 +321,8 @@ def addLink(name, url, mode, iconimage, desc, length="",
date="", nr=""):
return ok
-def addDir(name, url, mode, iconimage, type="", desc=""):
- u =
sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&type="+str(type)
+def addDir(name, url, mode, iconimage, type="", desc="", channelID=""):
+ u =
sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&type="+str(type)+"&channelID="+str(channelID)+"&channelThumb="+urllib.quote_plus(iconimage)
ok = True
liz = xbmcgui.ListItem(name, iconImage="DefaultFolder.png",
thumbnailImage=iconimage)
liz.setInfo(type="Video", infoLabels={"Title": name, "Plot": desc})
@@ -332,11 +341,13 @@ params = parameters_string_to_dict(sys.argv[2])
mode = urllib.unquote_plus(params.get('mode', ''))
url = urllib.unquote_plus(params.get('url', ''))
type = urllib.unquote_plus(params.get('type', ''))
+channelID = urllib.unquote_plus(params.get('channelID', ''))
+channelThumb = urllib.unquote_plus(params.get('channelThumb', ''))
if mode == 'listVideos':
listVideos(url, type)
elif mode == 'listVideosMain':
- listVideosMain(url)
+ listVideosMain(url, channelThumb)
elif mode == 'listNewsMain':
listNewsMain()
elif mode == 'listNewsCollections':
@@ -344,7 +355,7 @@ elif mode == 'listNewsCollections':
elif mode == 'listNews':
listNews(url)
elif mode == 'listShows':
- listShows(url)
+ listShows(url, channelID, channelThumb)
elif mode == 'playVideo':
playVideo(url)
elif mode == 'playVideoLive':
diff --git a/plugin.video.discovery_com/resources/language/English/strings.xml
b/plugin.video.discovery_com/resources/language/English/strings.xml
index 2654c53..4db4f83 100644
--- a/plugin.video.discovery_com/resources/language/English/strings.xml
+++ b/plugin.video.discovery_com/resources/language/English/strings.xml
@@ -6,7 +6,7 @@
<string id="30004">Clips</string>
<string id="30101">Use thumb as fanart</string>
<string id="30102">Force View</string>
- <string id="30103">ViewID (News&Shows)</string>
+ <string id="30103">ViewID (News&Shows)</string>
<string id="30104">Autoplay after ... seconds (needed for some old videos) |
0=OFF</string>
<string id="30105">Bitrate</string>
<string id="30106">Videos per page</string>
diff --git a/plugin.video.discovery_com/resources/language/German/strings.xml
b/plugin.video.discovery_com/resources/language/German/strings.xml
index 9ddc240..76405aa 100644
--- a/plugin.video.discovery_com/resources/language/German/strings.xml
+++ b/plugin.video.discovery_com/resources/language/German/strings.xml
@@ -5,7 +5,7 @@
<string id="30003">Ganze Folgen</string>
<string id="30101">Thumb als Fanart nutzen</string>
<string id="30102">View erzwingen</string>
- <string id="30103">ViewID (News&Shows)</string>
+ <string id="30103">ViewID (News&Shows)</string>
<string id="30104">Autoplay nach ... Sekunden (nötig für ein paar alte
Videos) | 0=OFF</string>
<string id="30106">Videos pro Seite</string>
<string id="30107">ViewID (Videos)</string>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9648367213b81fa0c5a3f20a419274136afc9c03
commit 9648367213b81fa0c5a3f20a419274136afc9c03
Author: Martijn Kaijser <[email protected]>
Date: Tue Nov 12 12:44:37 2013 +0100
[plugin.image.xzen] 0.0.9
diff --git a/plugin.image.xzen/addon.xml b/plugin.image.xzen/addon.xml
index 5e87672..830e0f4 100644
--- a/plugin.image.xzen/addon.xml
+++ b/plugin.image.xzen/addon.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.image.xzen"
- version="0.0.8"
+ version="0.0.9"
name="XZen"
- provider-name="bossanova808 ([email protected])">
+ provider-name="bossanova808">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
<provides>image</provides>
</extension>
- <extension point="xbmc.addon.metadata">
- <platform>all</platform>
- <language></language>
- <summary lang="en">Zenfolio Browser for XBMC</summary>
- <description lang="en">Browse the public Zenfolio galleries, and view
your Zenfolio photo portfolios in XBMC</description>
- <disclaimer lang="en"></disclaimer>
- </extension>
+ <extension point="xbmc.addon.metadata">
+ <platform>all</platform>
+ <language></language>
+ <summary lang="en">Zenfolio Browser for XBMC</summary>
+ <description lang="en">Browse the public Zenfolio galleries, and view your
Zenfolio photo portfolios in XBMC</description>
+ <disclaimer lang="en"></disclaimer>
+ </extension>
</addon>
diff --git a/plugin.image.xzen/default.py b/plugin.image.xzen/default.py
index 7971792..3f02f10 100644
--- a/plugin.image.xzen/default.py
+++ b/plugin.image.xzen/default.py
@@ -30,6 +30,7 @@ LIB_PATH = xbmc.translatePath(os.path.join(
RESOURCES_PATH, "lib" ))
sys.path.append( LIB_PATH )
from b808common import *
+from XZenScreensaver import *
#uses zenapi by Scott Gorling (http://www.scottgorlin.com)
from zenapi import ZenConnection
@@ -113,8 +114,13 @@ USERNAME=ADDON.getSetting('username')
PASSWORD=ADDON.getSetting('password')
GALLERYPASS=ADDON.getSetting('passwordOriginals')
-params=getParams()
-log("Parameters parsed: " + str(params))
+#there will be parameters if we're running as a plugin..
+if sys.argv[0]=='':
+ SCREENSAVER=True
+else:
+ SCREENSAVER=False
+ params=getParams()
+ log("Parameters parsed: " + str(params))
#try and get data from the paramters
try:
@@ -511,88 +517,103 @@ def ShowRecentPhotos(offset=0):
# global AUTHENTICATED holds a boolean of authentication state
# global KEYRINGED holds a boolen of keyringed state
-zen = ConnectZen(mode)
-if zen is None:
- notify(LANGUAGE(30016))
- sys.exit()
+if __name__ == '__main__':
-################################################################################
-# Based on how the plugin was called (mdode) - do something
-try:
- if mode==None or mode==MENU_ROOT:
- log( "Display XZen Root Menu" )
- BuildMenuRoot()
+ # Calles as a screensaver? This will be blank
+ if SCREENSAVER:
+ log( "...therefore running as screensaver" )
+ screensaver_gui = XZenScreensaver('XZenScreensaver.xml' , CWD,
'Default')
+ screensaver_gui.doModal()
+ #when we drop back here we're out of the screensaver...
+ log ("Xzen Screensaver Exited")
+ del screensaver_gui
+ sys.modules.clear()
+ # we're running as an image plugin...
+ else:
+ log( "Running as a Pictures addon" )
+ zen = ConnectZen(mode)
+ if zen is None:
+ notify(LANGUAGE(30016))
+ sys.exit()
- elif mode==MENU_USERGALLERIES:
- log( "Display XZen User Gallery" )
- BuildUserGallery(group)
+
################################################################################
+ # Based on how the plugin was called (mdode) - do something
- elif mode==POPPHOTOS:
- log( "Display XZen Popular Photos")
- ShowPopularPhotos(offset)
+ try:
+ if mode==None or mode==MENU_ROOT:
+ log( "Display XZen Root Menu" )
+ BuildMenuRoot()
- elif mode==POPGALLERIES:
- log( "Display XZen Popular Galleries")
- BuildMenuPopSets("Gallery",offset)
+ elif mode==MENU_USERGALLERIES:
+ log( "Display XZen User Gallery" )
+ BuildUserGallery(group)
- elif mode==POPCOLLECTIONS:
- log( "Display XZen Popular Collections")
- BuildMenuPopSets("Collection", offset)
+ elif mode==POPPHOTOS:
+ log( "Display XZen Popular Photos")
+ ShowPopularPhotos(offset)
- elif mode==RECENTPHOTOS:
- log( "Display XZen Recent Photos")
- ShowRecentPhotos(offset)
+ elif mode==POPGALLERIES:
+ log( "Display XZen Popular Galleries")
+ BuildMenuPopSets("Gallery",offset)
- elif mode==RECENTGALLERIES:
- log( "Display XZen Recent Galleries")
- BuildMenuRecentSets("Gallery",offset)
+ elif mode==POPCOLLECTIONS:
+ log( "Display XZen Popular Collections")
+ BuildMenuPopSets("Collection", offset)
- elif mode==RECENTCOLLECTIONS:
- log( "Display XZen Recent Collections")
- BuildMenuRecentSets("Collection", offset)
+ elif mode==RECENTPHOTOS:
+ log( "Display XZen Recent Photos")
+ ShowRecentPhotos(offset)
- elif mode==CATEGORIES:
- log( "Display XZen Categories")
- BuildMenuCategories(category)
+ elif mode==RECENTGALLERIES:
+ log( "Display XZen Recent Galleries")
+ BuildMenuRecentSets("Gallery",offset)
- elif mode==CATEGORY_OPTIONS:
- log( "Display XZen Category Options (Photos/Galleries/Collections)")
- BuildMenuCategoryOptions(categoryid)
+ elif mode==RECENTCOLLECTIONS:
+ log( "Display XZen Recent Collections")
+ BuildMenuRecentSets("Collection", offset)
- elif mode==DISPLAY_CATEGORY:
- log( "Display XZen Category id: " + str (categoryid) )
- AddCategory(categoryid,choice,offset)
+ elif mode==CATEGORIES:
+ log( "Display XZen Categories")
+ BuildMenuCategories(category)
- elif mode==DISPLAY_GALLERY:
- log( "Display XZen Gallery id: " + str (galleryid) )
- AddGallery(galleryid)
+ elif mode==CATEGORY_OPTIONS:
+ log( "Display XZen Category Options
(Photos/Galleries/Collections)")
+ BuildMenuCategoryOptions(categoryid)
- else:
- notify(LANGUAGE(30017))
- sys.exit()
+ elif mode==DISPLAY_CATEGORY:
+ log( "Display XZen Category id: " + str (categoryid) )
+ AddCategory(categoryid,choice,offset)
+ elif mode==DISPLAY_GALLERY:
+ log( "Display XZen Gallery id: " + str (galleryid) )
+ AddGallery(galleryid)
-except:
- print_exc()
+ else:
+ notify(LANGUAGE(30017))
+ sys.exit()
-################################################################################
-# FINISH OFF - set display mode appropriately, tell XBMC we're done, exit.
+ except:
+ print_exc()
+
-#if we've just built a list of albums, force thumbnail mode
-if mode in galleryModes:
- log("Playable Items -> Trying to set thumnbnail mode...")
- xbmc.executebuiltin('Container.SetViewMode(500)')
-else:
- log("List Items -> Trying to set list mode...")
- xbmc.executebuiltin('Container.SetViewMode(50)')
+
################################################################################
+ # FINISH OFF - set display mode appropriately, tell XBMC we're done,
exit.
+
+ #if we've just built a list of albums, force thumbnail mode
+ if mode in galleryModes:
+ log("Playable Items -> Trying to set thumnbnail mode...")
+ xbmc.executebuiltin('Container.SetViewMode(500)')
+ else:
+ log("List Items -> Trying to set list mode...")
+ xbmc.executebuiltin('Container.SetViewMode(50)')
-#and tell XBMC we're done...
-xbmcplugin.endOfDirectory(THIS_PLUGIN)
+ #and tell XBMC we're done...
+ xbmcplugin.endOfDirectory(THIS_PLUGIN)
-#and power this puppy down....
-footprints(startup=False)
+ #and power this puppy down....
+ footprints(startup=False)
diff --git a/plugin.image.xzen/resources/lib/b808common/b808common.py
b/plugin.image.xzen/resources/lib/b808common/b808common.py
index cca1173..53ba8fa 100644
--- a/plugin.image.xzen/resources/lib/b808common/b808common.py
+++ b/plugin.image.xzen/resources/lib/b808common/b808common.py
@@ -118,8 +118,13 @@ def unquoteUni(text):
# into a dict
def getParams():
+ log( "getParams" + str(sys.argv))
param=[]
- paramstring=sys.argv[2]
+ # if we're running as a screensaver, there are no parameters supplied
+ try:
+ paramstring=sys.argv[2]
+ except:
+ return param
if len(paramstring)>=2:
params=sys.argv[2]
cleanedparams=params.replace('?','')
-----------------------------------------------------------------------
Summary of changes:
plugin.image.xzen/addon.xml | 18 +-
plugin.image.xzen/default.py | 147 ++++++++++--------
.../resources/lib/b808common/b808common.py | 7 +-
.../resources/lib/classes/XZenScreensaver.py | 27 ++++
.../lib/{b808common => classes}/__init__.py | 0
.../skins/Default/720p/XZenScreensaver.xml | 23 +++
.../resources/skins/Default/media/black.png | Bin 0 -> 2820 bytes
plugin.video.discovery_com/addon.xml | 7 +-
plugin.video.discovery_com/changelog.txt | 9 +-
plugin.video.discovery_com/default.py | 85 ++++++-----
.../resources/language/English/strings.xml | 2 +-
.../resources/language/German/strings.xml | 2 +-
.../LICENSE.txt | 0
plugin.video.welt_der_wunder/addon.xml | 22 +++
plugin.video.welt_der_wunder/changelog.txt | 2 +
plugin.video.welt_der_wunder/default.py | 163 ++++++++++++++++++++
plugin.video.welt_der_wunder/icon.png | Bin 0 -> 37725 bytes
.../resources/language/English/strings.xml | 0
.../resources/language/German/strings.xml | 0
.../resources/settings.xml | 0
20 files changed, 397 insertions(+), 117 deletions(-)
create mode 100644 plugin.image.xzen/resources/lib/classes/XZenScreensaver.py
copy plugin.image.xzen/resources/lib/{b808common => classes}/__init__.py (100%)
create mode 100644
plugin.image.xzen/resources/skins/Default/720p/XZenScreensaver.xml
create mode 100644 plugin.image.xzen/resources/skins/Default/media/black.png
copy {plugin.audio.booksshouldbefree_com =>
plugin.video.welt_der_wunder}/LICENSE.txt (100%)
create mode 100644 plugin.video.welt_der_wunder/addon.xml
create mode 100644 plugin.video.welt_der_wunder/changelog.txt
create mode 100644 plugin.video.welt_der_wunder/default.py
create mode 100644 plugin.video.welt_der_wunder/icon.png
copy {plugin.video.pantoffel_tv =>
plugin.video.welt_der_wunder}/resources/language/English/strings.xml (100%)
copy {plugin.video.pantoffel_tv =>
plugin.video.welt_der_wunder}/resources/language/German/strings.xml (100%)
copy {plugin.video.gronkh_de =>
plugin.video.welt_der_wunder}/resources/settings.xml (100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
