The branch, eden has been updated
via 29e9c329200d4f602275dda5722196586519346d (commit)
via 9fc46dade20e2d87beda80eac458419fb51eb072 (commit)
via 377bbe1eed02ea389cb772bbd916afb7a4142bbe (commit)
from d3cd6f0e9d8498eb3761f0374f19098113399a61 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=29e9c329200d4f602275dda5722196586519346d
commit 29e9c329200d4f602275dda5722196586519346d
Author: spiff <[email protected]>
Date: Sat Nov 17 15:54:48 2012 +0100
[plugin.video.southpark_de] updated to version 1.0.2
diff --git a/plugin.video.southpark_de/addon.xml
b/plugin.video.southpark_de/addon.xml
index 44c7340..4a8d98a 100644
--- a/plugin.video.southpark_de/addon.xml
+++ b/plugin.video.southpark_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.southpark_de" name="SouthPark.de" version="1.0.1"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.southpark_de" name="SouthPark.de" version="1.0.2"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/plugin.video.southpark_de/changelog.txt
b/plugin.video.southpark_de/changelog.txt
index 3d3c90c..72e06a8 100644
--- a/plugin.video.southpark_de/changelog.txt
+++ b/plugin.video.southpark_de/changelog.txt
@@ -1,4 +1,6 @@
1.0.0
- First Try
1.0.1
+- Fixed site changes
+1.0.2
- Fixed site changes
\ No newline at end of file
diff --git a/plugin.video.southpark_de/default.py
b/plugin.video.southpark_de/default.py
index 86502bf..25cafdd 100644
--- a/plugin.video.southpark_de/default.py
+++ b/plugin.video.southpark_de/default.py
@@ -15,6 +15,7 @@ if forceViewMode=="true":
else:
forceViewMode=False
viewMode=str(addon.getSetting("viewMode"))
+playIntro=addon.getSetting("playIntro")
if language=="0":
language=""
@@ -75,14 +76,18 @@ def listVideos(url):
def playVideo(url):
content = getUrl(url)
- matchTitle=re.compile('<h1>(.+?)</h1>', re.DOTALL).findall(content)
- matchDesc=re.compile('<h2>(.+?)</h2>', re.DOTALL).findall(content)
+ matchTitle=re.compile('<h1 itemprop="name">(.+?)</h1>',
re.DOTALL).findall(content)
+ matchDesc=re.compile('<h2 itemprop="description">(.+?)</h2>',
re.DOTALL).findall(content)
+ matchSE=re.compile('/s(.+?)e(.+?)-', re.DOTALL).findall(content)
match=re.compile('http://media.mtvnservices.com/mgid:arc:episode:southpark.de:(.+?)"',
re.DOTALL).findall(content)
if len(match)>0:
content =
getUrl("http://www.southpark.de/feeds/video-player/mrss/mgid%3Aarc%3Aepisode%3Asouthpark.de%3A"+match[0]+"?lang="+language)
spl=content.split('<item>')
urlFull="stack://"
- for i in range(1,len(spl),1):
+ start=2
+ if playIntro=="true":
+ start=1
+ for i in range(start,len(spl),1):
entry=spl[i]
match=re.compile('<media:content type="text/xml" medium="video"
duration="(.+?)" isDefault="true" url="(.+?)"', re.DOTALL).findall(entry)
url=match[0][1].replace("&","&")
@@ -106,9 +111,7 @@ def playVideo(url):
urlFull+=urlNew+" , "
urlFull=urlFull[:-3]
listitem = xbmcgui.ListItem(path=urlFull)
- title=matchTitle[0]
- if title.find("South Park: ")==-1:
- title="South Park: "+title
+ title="S"+matchSE[0][0]+"E"+matchSE[0][1]+" - "+matchTitle[0]
desc=matchDesc[0]
listitem.setInfo( type="Video", infoLabels={ "Title": title ,
"Plot": desc } )
return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
@@ -123,7 +126,7 @@ def cleanTitle(title):
def getUrl(url):
req = urllib2.Request(url)
- req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:15.0)
Gecko/20100101 Firefox/15.0.1')
+ req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:16.0)
Gecko/20100101 Firefox/16.0')
response = urllib2.urlopen(req)
link=response.read()
response.close()
diff --git a/plugin.video.southpark_de/resources/language/English/strings.xml
b/plugin.video.southpark_de/resources/language/English/strings.xml
index fd8c33e..acee5ba 100644
--- a/plugin.video.southpark_de/resources/language/English/strings.xml
+++ b/plugin.video.southpark_de/resources/language/English/strings.xml
@@ -7,4 +7,5 @@
<string id="30101">Language</string>
<string id="30102">Force View</string>
<string id="30103">ViewID</string>
+ <string id="30104">Play Intro</string>
</strings>
diff --git a/plugin.video.southpark_de/resources/language/German/strings.xml
b/plugin.video.southpark_de/resources/language/German/strings.xml
index 1f9cf83..bf224c7 100644
--- a/plugin.video.southpark_de/resources/language/German/strings.xml
+++ b/plugin.video.southpark_de/resources/language/German/strings.xml
@@ -2,8 +2,9 @@
<strings>
<string id="30001">Staffel</string>
<string id="30002">Folge</string>
- <string id="30003">Zufällig</string>
+ <string id="30003">Per Zufall</string>
<string id="30004">Folge ist nicht verfuegbar</string>
<string id="30101">Sprache</string>
<string id="30102">View erzwingen</string>
+ <string id="30104">Intro abspielen</string>
</strings>
diff --git a/plugin.video.southpark_de/resources/settings.xml
b/plugin.video.southpark_de/resources/settings.xml
index 06cf9ed..2bc4767 100644
--- a/plugin.video.southpark_de/resources/settings.xml
+++ b/plugin.video.southpark_de/resources/settings.xml
@@ -1,5 +1,6 @@
<settings>
<setting id="language" type="enum" label="30101" values="de|en"
default="0"/>
+ <setting id="playIntro" type="bool" label="30104" default="false"/>
<setting id="forceViewMode" type="bool" label="30102" default="false"/>
<setting id="viewMode" type="number" label="30103" default="500"/>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9fc46dade20e2d87beda80eac458419fb51eb072
commit 9fc46dade20e2d87beda80eac458419fb51eb072
Author: spiff <[email protected]>
Date: Sat Nov 17 15:52:58 2012 +0100
[plugin.video.arte_tv] updated to version 1.0.1
diff --git a/plugin.video.arte_tv/addon.xml b/plugin.video.arte_tv/addon.xml
index ff9c18e..1c95e85 100644
--- a/plugin.video.arte_tv/addon.xml
+++ b/plugin.video.arte_tv/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.arte_tv" name="Arte.tv" version="1.0.0"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.arte_tv" name="Arte.tv" version="1.0.1"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/plugin.video.arte_tv/changelog.txt
b/plugin.video.arte_tv/changelog.txt
index 46ee6dd..24c2d29 100644
--- a/plugin.video.arte_tv/changelog.txt
+++ b/plugin.video.arte_tv/changelog.txt
@@ -1 +1,6 @@
-1.0.0 - First Try
\ No newline at end of file
+1.0.0
+- First Try
+1.0.1
+- Added "Videos of the day"
+- Added "Arte Live Web"
+- Some other fixes
\ No newline at end of file
diff --git a/plugin.video.arte_tv/default.py b/plugin.video.arte_tv/default.py
index 89559fb..3251905 100644
--- a/plugin.video.arte_tv/default.py
+++ b/plugin.video.arte_tv/default.py
@@ -1,11 +1,20 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon
+import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon,socket,time
pluginhandle = int(sys.argv[1])
settings = xbmcaddon.Addon(id='plugin.video.arte_tv')
translation = settings.getLocalizedString
+forceViewMode=settings.getSetting("forceViewMode")
+if forceViewMode=="true":
+ forceViewMode=True
+else:
+ forceViewMode=False
+viewMode=str(settings.getSetting("viewMode"))
+timeout=int(settings.getSetting("timeout"))
+socket.setdefaulttimeout(timeout)
+
language=""
language=settings.getSetting("language")
if language=="":
@@ -21,17 +30,19 @@ numbers=["10","25","50","100",]
videosPerPage=numbers[int(settings.getSetting("itemsPerPage"))]
def cleanTitle(title):
-
title=title.replace("<","<").replace(">",">").replace("&","&").replace("'","\\").replace("'","\\").replace(""","\"").replace("ß","Ã").replace("–","-")
+
title=title.replace("<","<").replace(">",">").replace("&","&").replace("'","'").replace("'","'").replace(""","\"").replace("ß","Ã").replace("–","-")
title=title.replace("Ä","Ã").replace("Ü","Ã").replace("Ö","Ã").replace("ä","ä").replace("ü","ü").replace("ö","ö")
title=title.strip()
return title
def index():
+
addDir(translation(30011),"http://videos.arte.tv/"+language+"/videos","vidsDay","";)
addDir(translation(30001),"ARTE_7","showSortList","")
addDir(translation(30002),"ALL_VIDS","listShows","")
addDir(translation(30003),"SHOWS_AZ","listShows","")
addDir(translation(30004),"EVENTS","listShows","")
addDir(translation(30005),"SEARCH","search","")
+ addDir(translation(30012),"","listWebLiveMain","")
xbmcplugin.endOfDirectory(pluginhandle)
def showSortList(url):
@@ -48,10 +59,10 @@ def showSortList(url):
urlDate=url+"?hash=tv/thumb/date//1/"+videosPerPage+"/"
urlRated=url+"?hash=tv/thumb/popular/bestrated/1/"+videosPerPage+"/"
urlViewed=url+"?hash=tv/thumb/popular/mostviewed/1/"+videosPerPage+"/"
- addDir(translation(30006),urlTitle,"listVideos","")
addDir(translation(30007),urlDate,"listVideos","")
- addDir(translation(30008),urlRated,"listVideos","")
addDir(translation(30009),urlViewed,"listVideos","")
+ addDir(translation(30008),urlRated,"listVideos","")
+ addDir(translation(30006),urlTitle,"listVideos","")
xbmcplugin.endOfDirectory(pluginhandle)
def listShows(url):
@@ -80,6 +91,67 @@ def listShows(url):
addDir(title,url,'showSortList',"")
xbmcplugin.endOfDirectory(pluginhandle)
+def vidsDay(url):
+ content = getUrl(url)
+ content=content[content.find('<ul class="slider" id="car-one">'):]
+ content=content[:content.find('</ul>')]
+ spl=content.split('<li')
+ for i in range(1,len(spl),1):
+ entry=spl[i]
+ match=re.compile('<h3>(.+?)</h3>', re.DOTALL).findall(entry)
+ title=cleanTitle(match[0])
+ match=re.compile('<p><a href="(.+?)">(.+?)</a></p>',
re.DOTALL).findall(entry)
+ url="http://videos.arte.tv"+match[0][0]
+ desc=cleanTitle(match[0][1])
+ match=re.compile('class="thumbnail" width="(.+?)" height="(.+?)"
src="(.+?)"', re.DOTALL).findall(entry)
+ thumb="http://videos.arte.tv"+match[0][2]
+ addLink(title,url,'playVideo',thumb,desc)
+ xbmcplugin.endOfDirectory(pluginhandle)
+
+def listWebLive(url):
+ urlMain=url
+ hasNextPage=False
+ content = getUrl(url,cookie="liveweb-language="+language.upper())
+ if content.find('class="next off"')==-1:
+ hasNextPage=True
+ content=content[content.find('<div id="wall-mosaique"'):]
+ content=content[:content.find('<div class="pagination-new">')]
+ spl=content.split('<div class="block')
+ for i in range(1,len(spl),1):
+ entry=spl[i]
+ if entry.find("/video/")>0 or entry.find("/festival/")>0:
+ match=re.compile('<strong>(.+?)</strong>',
re.DOTALL).findall(entry)
+ if len(match)>0:
+ title=cleanTitle(match[0])
+ else:
+ match1=re.compile('/video/(.+?)/', re.DOTALL).findall(entry)
+ match2=re.compile('/festival/(.+?)/', re.DOTALL).findall(entry)
+ if len(match1)>0:
+ title=cleanTitle(match1[0]).replace("_"," ")
+ elif len(match2)>0:
+ title=cleanTitle(match2[0]).replace("_"," ")
+ match=re.compile('href="(.+?)"', re.DOTALL).findall(entry)
+ url=match[0]
+ match=re.compile('src="(.+?)"', re.DOTALL).findall(entry)
+ thumb=match[0]
+ addLink(title,url,'playLiveEvent',thumb,"")
+ match=re.compile('moveValue=(.+?)&', re.DOTALL).findall(urlMain)
+ page=int(match[0])
+ if hasNextPage:
+
addDir("Next",urlMain.replace("moveValue="+str(page)+"&","moveValue="+str(page+1)+"&"),"listWebLive","")
+ xbmcplugin.endOfDirectory(pluginhandle)
+
+def listWebLiveMain():
+
addDir(translation(30002),"http://liveweb.arte.tv/searchEvent.do?method=displayElements&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=&classification=0&categoryId=&displayMode=0&eventTagName=","listWebLive","";)
+
addDir(translation(30013),"http://liveweb.arte.tv/searchEvent.do?method=displayElements&categoryId=8&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=&classification=0&displayMode=0&eventTagName=","listWebLive","";)
+
addDir(translation(30014),"http://liveweb.arte.tv/searchEvent.do?method=displayElements&categoryId=1&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=&classification=0&displayMode=0&eventTagName=","listWebLive","";)
+
addDir(translation(30015),"http://liveweb.arte.tv/searchEvent.do?method=displayElements&categoryId=11&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=&classification=0&displayMode=0&eventTagName=","listWebLive","";)
+
addDir(translation(30016),"http://liveweb.arte.tv/searchEvent.do?method=displayElements&categoryId=7&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=&classification=0&displayMode=0&eventTagName=","listWebLive","";)
+
addDir(translation(30017),"http://liveweb.arte.tv/searchEvent.do?method=displayElements&categoryId=3&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=&classification=0&displayMode=0&eventTagName=","listWebLive","";)
+ addDir(translation(30005),"","searchWebLive","")
+ xbmcplugin.endOfDirectory(pluginhandle)
+
+
def listVideos(url):
urlMain=url
content = getUrl(url)
@@ -88,13 +160,16 @@ def listVideos(url):
entry=spl[i]
match=re.compile('<p>(.+?)</p>', re.DOTALL).findall(entry)
date=match[0]
+ match=re.compile('<p class="teaserText">(.+?)</p>',
re.DOTALL).findall(entry)
+ desc=cleanTitle(match[0])
+ desc=date+"\n"+desc
match=re.compile('<h2><a href="(.+?)">(.+?)</a></h2>',
re.DOTALL).findall(entry)
url="http://videos.arte.tv"+match[0][0]
- title=date+" - "+cleanTitle(match[0][1])
+ title=cleanTitle(match[0][1])
entry=entry[entry.find('class="thumbnail"'):]
match=re.compile('src="(.+?)"', re.DOTALL).findall(entry)
thumb="http://videos.arte.tv"+match[0]
- addLink(title,url,'playVideo',thumb)
+ addLink(title,url,'playVideo',thumb,desc,"")
content=content[content.find('<div class="pagination inside">'):]
content=content[:content.find('</ul>')]
spl=content.split('<a href=')
@@ -136,6 +211,14 @@ def search():
url="http://videos.arte.tv/fr/do_search/videos/recherche?q="+search_string
listVideos(url)
+def searchWebLive():
+ keyboard = xbmc.Keyboard('', translation(30005))
+ keyboard.doModal()
+ if keyboard.isConfirmed() and keyboard.getText():
+ search_string = keyboard.getText().replace(" ","+")
+
url="http://liveweb.arte.tv/searchEvent.do?method=displayElements&globalNames="+search_string+"&eventDateMode=0&moveValue=1&eventDateMode=0&chronology=&globalNames=norah%20jones&classification=0&categoryId=&displayMode=0&eventTagName=";
+ listWebLive(url)
+
def playVideo(url):
url=url.replace("/videos/","/do_delegate/videos/").replace(".html",",view,asPlayerXml.xml")
content = getUrl(url)
@@ -149,25 +232,42 @@ def playVideo(url):
urlNew=match1[0]
elif len(match2)==1:
urlNew=match2[0]
- listitem = xbmcgui.ListItem(path=urlNew+" swfVfy=1
swfUrl=http://videos.arte.tv/blob/web/i18n/view/player_23-3188338-data-4993762.swf";)
+ listitem = xbmcgui.ListItem(path=urlNew.replace("/MP4:","/mp4:")+"
swfVfy=1
swfUrl=http://videos.arte.tv/blob/web/i18n/view/player_23-3188338-data-5044926.swf";)
return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
-def getUrl(url,data=None,cookie=None):
- if data!=None:
- req = urllib2.Request(url,data)
- req.add_header('Content-Type', 'application/x-www-form-urlencoded')
+def playLiveEvent(url):
+ content = getUrl(url)
+ match=re.compile("eventId=(.+?)&", re.DOTALL).findall(content)
+ id=match[0]
+ content =
getUrl("http://download.liveweb.arte.tv/o21/liveweb/events/event-"+id+".xml";)
+ match1=re.compile('<urlHd>(.+?)</urlHd>', re.DOTALL).findall(content)
+ match2=re.compile('<urlSd>(.+?)</urlHd>', re.DOTALL).findall(content)
+ urlNew=""
+ if len(match1)==1:
+ urlNew=match1[0]
+ elif len(match2)==1:
+ urlNew=match2[0]
+ if urlNew=="":
+
xbmc.executebuiltin('XBMC.Notification(Info:,'+translation(30018)+'!,5000)')
else:
- req = urllib2.Request(url)
- req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0)
Gecko/20100101 Firefox/11.0')
+ match=re.compile('e=(.+?)&', re.DOTALL).findall(urlNew)
+ expire=int(match[0])
+ if expire<time.time():
+
xbmc.executebuiltin('XBMC.Notification(Info:,'+translation(30019)+'!,5000)')
+ else:
+ urlNew=urlNew[:urlNew.find("?")].replace("/MP4:","/mp4:")
+ listitem = xbmcgui.ListItem(path=urlNew)
+ return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
+
+def getUrl(url,cookie=None):
+ req = urllib2.Request(url)
+ req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:16.0)
Gecko/20100101 Firefox/16.0')
if cookie!=None:
req.add_header('Cookie',cookie)
- try:
- response = urllib2.urlopen(req,timeout=30)
- link=response.read()
- response.close()
- return link
- except:
- return ""
+ response = urllib2.urlopen(req)
+ link=response.read()
+ response.close()
+ return link
def parameters_string_to_dict(parameters):
''' Convert parameters encoded in a URL to a dict. '''
@@ -180,11 +280,11 @@ def parameters_string_to_dict(parameters):
paramDict[paramSplits[0]] = paramSplits[1]
return paramDict
-def addLink(name,url,mode,iconimage):
+def addLink(name,url,mode,iconimage,desc="",duration=""):
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 } )
+ liz.setInfo( type="Video", infoLabels={ "Title": name, "Plot": desc,
"Duration": duration } )
liz.setProperty('IsPlayable', 'true')
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz)
return ok
@@ -207,11 +307,21 @@ if mode == 'listVideos':
listVideos(url)
elif mode == 'playVideo':
playVideo(url)
+elif mode == 'playLiveEvent':
+ playLiveEvent(url)
+elif mode == 'vidsDay':
+ vidsDay(url)
+elif mode == 'listWebLive':
+ listWebLive(url)
+elif mode == 'listWebLiveMain':
+ listWebLiveMain()
elif mode == 'showSortList':
showSortList(url)
elif mode == 'listShows':
listShows(url)
elif mode == 'search':
search()
+elif mode == 'searchWebLive':
+ searchWebLive()
else:
index()
diff --git a/plugin.video.arte_tv/resources/language/English/strings.xml
b/plugin.video.arte_tv/resources/language/English/strings.xml
index 61a241e..1b51161 100644
--- a/plugin.video.arte_tv/resources/language/English/strings.xml
+++ b/plugin.video.arte_tv/resources/language/English/strings.xml
@@ -10,6 +10,18 @@
<string id="30008">by Votes</string>
<string id="30009">by Hits</string>
<string id="30010">Next Page</string>
+ <string id="30011">Videos of the day</string>
+ <string id="30012">Live WEB (Concerts)</string>
+ <string id="30013">Pop, Rock, Electro</string>
+ <string id="30014">Classic</string>
+ <string id="30015">Jazz & Blues</string>
+ <string id="30016">World Music</string>
+ <string id="30017">Theater & Dance</string>
+ <string id="30018">Video is not available yet</string>
+ <string id="30019">Video is no longer available</string>
<string id="30101">Language (Videos)</string>
<string id="30102">Videos per Page</string>
+ <string id="30103">Timeout</string>
+ <string id="30104">Force View</string>
+ <string id="30105">ViewID</string>
</strings>
diff --git a/plugin.video.arte_tv/resources/language/German/strings.xml
b/plugin.video.arte_tv/resources/language/German/strings.xml
index 4117ef0..b2f07db 100644
--- a/plugin.video.arte_tv/resources/language/German/strings.xml
+++ b/plugin.video.arte_tv/resources/language/German/strings.xml
@@ -4,12 +4,17 @@
<string id="30002">Alle Videos</string>
<string id="30003">Sendungen A-Z</string>
<string id="30004">Events</string>
- <string id="30005">Suche</string>
+ <string id="30005">Suchen</string>
<string id="30006">nach Titel</string>
<string id="30007">nach Datum</string>
<string id="30008">nach Bewertung</string>
<string id="30009">nach Aufrufen</string>
<string id="30010">Nächste Seite</string>
+ <string id="30011">Videos des Tages</string>
+ <string id="30012">Live WEB (Konzerte)</string>
+ <string id="30018">Video ist noch nicht verfuegbar</string>
+ <string id="30019">Video ist nicht mehr verfuegbar</string>
<string id="30101">Sprache (Videos)</string>
<string id="30102">Videos pro Seite</string>
+ <string id="30104">View erzwingen</string>
</strings>
diff --git a/plugin.video.arte_tv/resources/settings.xml
b/plugin.video.arte_tv/resources/settings.xml
index 7b3879c..0e248aa 100644
--- a/plugin.video.arte_tv/resources/settings.xml
+++ b/plugin.video.arte_tv/resources/settings.xml
@@ -1,4 +1,7 @@
<settings>
<setting id="language" type="enum" label="30101" values="DE|FR"/>
<setting id="itemsPerPage" type="enum" label="30102" values="10|25|50|100"
default="1"/>
+ <setting id="timeout" type="number" label="30103" default="30"/>
+ <setting id="forceViewMode" type="bool" label="30104" default="false"/>
+ <setting id="viewMode" type="number" label="30105" default="500"/>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=377bbe1eed02ea389cb772bbd916afb7a4142bbe
commit 377bbe1eed02ea389cb772bbd916afb7a4142bbe
Author: spiff <[email protected]>
Date: Sat Nov 17 15:51:49 2012 +0100
[plugin.video.mediathek] updated to version 0.4.7
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index e3de52b..deb02e5 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.4.6"
+ version="0.4.7"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 39e92c9..ea9c637 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.4.7 - Fix syntax error
0.4.6 - Minor fix for rasp-xbmc
added new channels for kika
0.4.5 - FIX: ARTE and KIKA - adopt format changes
diff --git a/plugin.video.mediathek/simplexbmc.py
b/plugin.video.mediathek/simplexbmc.py
index 05c4ede..65e0a87 100644
--- a/plugin.video.mediathek/simplexbmc.py
+++ b/plugin.video.mediathek/simplexbmc.py
@@ -51,8 +51,8 @@ class SimpleXbmcGui(object):
if displayObject.picture is not None:
listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png",
thumbnailImage=displayObject.picture)
- else
- else listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png")
+ else:
+ listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png")
if(displayObject.isPlayable):
if(displayObject.isPlayable == "PlayList"):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.arte_tv/addon.xml | 2 +-
plugin.video.arte_tv/changelog.txt | 7 +-
plugin.video.arte_tv/default.py | 154 +++++++++++++++++---
.../resources/language/English/strings.xml | 12 ++
.../resources/language/German/strings.xml | 7 +-
plugin.video.arte_tv/resources/settings.xml | 3 +
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/simplexbmc.py | 4 +-
plugin.video.southpark_de/addon.xml | 2 +-
plugin.video.southpark_de/changelog.txt | 2 +
plugin.video.southpark_de/default.py | 17 ++-
.../resources/language/English/strings.xml | 1 +
.../resources/language/German/strings.xml | 3 +-
plugin.video.southpark_de/resources/settings.xml | 1 +
15 files changed, 181 insertions(+), 37 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
