The branch, dharma has been updated
via 1c1e54d2d31c9bc50c26622c491ba03f20c1cf62 (commit)
via 99c5b9f1ea33a6482721e0c9f6d9189b2cd57823 (commit)
via 465f4478c7cdfd525bd9a1cf464cfb731706d411 (commit)
from 0ffbe17fc14229379a9b2ba589f7ec16bef029ac (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1c1e54d2d31c9bc50c26622c491ba03f20c1cf62
commit 1c1e54d2d31c9bc50c26622c491ba03f20c1cf62
Author: spiff <sp...@xbmc.org>
Date: Sat Apr 30 09:40:29 2011 +0200
[plugin.video.sc2casts] updated to version 0.4.2
diff --git a/plugin.video.sc2casts/addon.xml b/plugin.video.sc2casts/addon.xml
index 3a35103..114e1cd 100644
--- a/plugin.video.sc2casts/addon.xml
+++ b/plugin.video.sc2casts/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.sc2casts"
name="SC2Casts"
- version="0.4.1"
+ version="0.4.2"
provider-name="Krill">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.sc2casts/changelog.txt
b/plugin.video.sc2casts/changelog.txt
index e5e9ddf..57151cd 100644
--- a/plugin.video.sc2casts/changelog.txt
+++ b/plugin.video.sc2casts/changelog.txt
@@ -1,4 +1,8 @@
-v0.4.0
+v0.4.2
+----------------------
+- Updated URL:s in sc2casts.py
+
+v0.4.1
----------------------
- Added strings to strings.xml
diff --git a/plugin.video.sc2casts/default.py b/plugin.video.sc2casts/default.py
index 2dbcd53..42fb45e 100644
--- a/plugin.video.sc2casts/default.py
+++ b/plugin.video.sc2casts/default.py
@@ -1,6 +1,6 @@
import sys, xbmc, xbmcplugin, xbmcaddon, sc2casts
-__version__ = "0.4.1"
+__version__ = "0.4.2"
__plugin__ = "SC2Casts-" + __version__
__author__ = "Kristoffer Petersson"
__settings__ = xbmcaddon.Addon(id='plugin.video.sc2casts')
diff --git a/plugin.video.sc2casts/sc2casts.py
b/plugin.video.sc2casts/sc2casts.py
index e694070..7d00c82 100644
--- a/plugin.video.sc2casts/sc2casts.py
+++ b/plugin.video.sc2casts/sc2casts.py
@@ -32,23 +32,23 @@ class SC2Casts:
# display the root menu
def root(self):
- self.addCategory(self.__language__( 31000 ),
'http://www.sc2casts.com', 'showTitles')
+ self.addCategory(self.__language__( 31000 ),
'http://sc2casts.com/index.php', 'showTitles')
self.addCategory(self.__language__( 31001 ), '', 'rootTop')
self.addCategory(self.__language__( 31002 ), '', 'rootBrowse')
self.addCategory(self.__language__( 31003 ), '',
'showTitlesSearch')
# display the top casts menu
def rootTop(self):
- self.addCategory(self.__language__( 31004 ),
'http://www.sc2casts.com/top?all', 'showTitlesTop')
- self.addCategory(self.__language__( 31005 ),
'http://www.sc2casts.com/top?month', 'showTitlesTop')
- self.addCategory(self.__language__( 31006 ),
'http://sc2casts.com/top?week', 'showTitlesTop')
- self.addCategory(self.__language__( 31007 ),
'http://sc2casts.com/top', 'showTitlesTop')
+ self.addCategory(self.__language__( 31004 ),
'http://sc2casts.com/top/index.php?all', 'showTitlesTop')
+ self.addCategory(self.__language__( 31005 ),
'http://sc2casts.com/top/index.php?month', 'showTitlesTop')
+ self.addCategory(self.__language__( 31006 ),
'http://sc2casts.com/top/index.php?week', 'showTitlesTop')
+ self.addCategory(self.__language__( 31007 ),
'http://sc2casts.com/top/index.php', 'showTitlesTop')
# display the browse casts menu
def rootBrowse(self):
- self.addCategory(self.__language__( 31008 ),
'http://www.sc2casts.com/browse', 'browseEvents')
+ self.addCategory(self.__language__( 31008 ),
'http://sc2casts.com/browse/index.php', 'browseEvents')
self.addCategory(self.__language__( 31009 ), '',
'browseMatchups')
- self.addCategory(self.__language__( 31010 ),
'http://www.sc2casts.com/browse', 'browseCasters')
+ self.addCategory(self.__language__( 31010 ),
'http://sc2casts.com/browse/index.php', 'browseCasters')
# display the browse events menu
def browseEvents(self, params = {}):
@@ -120,7 +120,7 @@ class SC2Casts:
# Get info to show
caster = re.compile('<a href="/.+?"><span
class="caster_name">(.*?)</span></a>').findall(link)
matchup = re.compile('<span
style="color:#cccccc">(.*?)</span>').findall(link)
- round = re.compile('<span
class="round_name">(.*?)</span>').findall(link)
+ roundname = re.compile('<span
class="round_name">(.*?)</span>').findall(link)
checkSource = re.compile('<span
class="source_name">(.*?)</span>').findall(link)
event = re.compile('<span
class="event_name".*?>(.*?)</span>').findall(link)
@@ -145,7 +145,7 @@ class SC2Casts:
if boolEvent == 'true':
url += event[i] + ' | '
if boolRound == 'true':
- url += round[i] + ' | '
+ url += roundname[i] + ' | '
if boolCaster == 'true':
url += 'cast by: ' + caster[i]
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=99c5b9f1ea33a6482721e0c9f6d9189b2cd57823
commit 99c5b9f1ea33a6482721e0c9f6d9189b2cd57823
Author: spiff <sp...@xbmc.org>
Date: Sat Apr 30 09:39:08 2011 +0200
[plugin.video.xbmcflicks] updated to version 1.0.18
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index 00c1557..6e6c3e8 100644
--- a/plugin.video.xbmcflicks/addon.xml
+++ b/plugin.video.xbmcflicks/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.xbmcflicks"
name="XBMC Flicks - Netflix for XBMC"
- version="1.0.17"
+ version="1.0.18"
provider-name="TeamUMX">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.xbmcflicks/changelog.txt
b/plugin.video.xbmcflicks/changelog.txt
index 45b07fa..3bb0566 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -10,4 +10,5 @@
1.0.14 - fixed pathing issues by calling actual paths instead of special://
pathing for addon launch loc
1.0.15 - fixed issue with tv episodes (when set to expand) would fail to
display (invalid setting for director info)
1.0.16 - fixed issue with tv episodes where some shows would no longer show
any episodes (the format changed from netflix), fixed issue with OSX launching
firefox for initial auth (requires firefox to be installed on your system to
the apps folder)
-1.0.17 - fixed issue with episodes when pilot is listed, fixed .ca links for
Canada Netflix, fixed menu items for Canada Users.. Thanks to qumip for code
fixes
\ No newline at end of file
+1.0.17 - fixed issue with episodes when pilot is listed, fixed .ca links for
Canada Netflix, fixed menu items for Canada Users.. Thanks to qumip for code
fixes
+1.0.18 - fixed issue with not all instant queues showing up, fixed write issue
with some os's (w+ used now), fixed issue with title's being cut off at the
first quote, fixed synopsis not always being parsed if only a short synopsis is
available, fixed " and & in title
diff --git a/plugin.video.xbmcflicks/resources/lib/Netflix.py
b/plugin.video.xbmcflicks/resources/lib/Netflix.py
index e95027a..60c1218 100644
--- a/plugin.video.xbmcflicks/resources/lib/Netflix.py
+++ b/plugin.video.xbmcflicks/resources/lib/Netflix.py
@@ -224,9 +224,9 @@ class NetflixUser:
accessToken = oauth.OAuthToken(accessToken['key'],
accessToken['secret'] )
if not historyType:
- requestUrl = '/users/%s/queues/instant/available' %
(accessToken.key)
+ requestUrl = '/users/%s/queues/instant' % (accessToken.key)
else:
- requestUrl = '/users/%s/queues/instant/available/%s' %
(accessToken.key,historyType)
+ requestUrl = '/users/%s/queues/instant/%s' %
(accessToken.key,historyType)
try:
info = simplejson.loads( self.client._getResource(requestUrl,
parameters=parameters, token=accessToken ) )
diff --git a/plugin.video.xbmcflicks/resources/lib/iqueue.py
b/plugin.video.xbmcflicks/resources/lib/iqueue.py
index 62e82aa..bb9642a 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -99,7 +99,7 @@ def getAuth(netflix, verbose):
def saveUserInfo():
#create the file
- f = open(os.path.join(str(USERINFO_FOLDER), 'userinfo.txt'),'r+')
+ f = open(os.path.join(str(USERINFO_FOLDER), 'userinfo.txt'),'w+')
setting ='requestKey=' + MY_USER['request']['key'] + '\n' +
'requestSecret=' + MY_USER['request']['secret'] + '\n' +'accessKey=' +
MY_USER['access']['key']+ '\n' + 'accessSecret=' + MY_USER['access']['secret']
f.write(setting)
f.close()
@@ -116,7 +116,7 @@ def checkplayercore():
if not os.path.exists('C:\Program Files'):
fileWithData = os.path.join(str(RESOURCE_FOLDER),
'playercorefactoryOSX.xml')
data = open(str(fileWithData),'r').read()
- f = open(checkFile,'r+')
+ f = open(checkFile,'w+')
f.write(data)
f.close()
@@ -127,7 +127,7 @@ def checkadvsettings():
#copy file from addon folder
fileWithData = os.path.join(str(RESOURCE_FOLDER),
'advancedsettings.xml')
data = open(str(fileWithData),'r').read()
- f = open(checkFile,'r+')
+ f = open(checkFile,'w+')
f.write(data)
f.close()
@@ -264,7 +264,7 @@ def writeLinkFile(id, title):
redirect = "<!doctype html public \"-//W3C//DTD HTML 4.0
Transitional//EN\"><html><head><title>Requesting Video: " + title +
"</title><meta http-equiv=\"REFRESH\" content=\"0;url=http://www.netflix.com/";
+ player + "?lnkctr=apiwn&nbb=y&devKey=gnexy7jajjtmspegrux7c3dj&movieid=" + id
+ "\"></head><body bgcolor=\"#FF0000\"> <p>Redirecting to Netflix in a moment
...</p></body></html>"
else:
redirect = "<!doctype html public \"-//W3C//DTD HTML 4.0
Transitional//EN\"><html><head><title>Requesting Video: " + title +
"</title><meta http-equiv=\"REFRESH\" content=\"0;url=http://www.netflix.ca/"; +
player + "?lnkctr=apiwn&nbb=y&devKey=gnexy7jajjtmspegrux7c3dj&movieid=" + id +
"\"></head><body bgcolor=\"#FF0000\"> <p>Redirecting to Netflix in a moment
...</p></body></html>"
- f = open(fileLoc,'r+')
+ f = open(fileLoc,'w+')
f.write(redirect)
f.close()
@@ -280,7 +280,7 @@ def writeDiscLinkFile(id, title, webURL):
if(useAltPlayer):
player = "WiPlayer"
redirect = "<!doctype html public \"-//W3C//DTD HTML 4.0
Transitional//EN\"><html><head><title>Requesting Video: " + title +
"</title><meta http-equiv=\"REFRESH\" content=\"0;url=" + webURL +
"\"></head><body bgcolor=\"#0000cc\"> <p>Redirecting to Netflix in a moment
...</p></body></html>"
- f = open(fileLoc,'r+')
+ f = open(fileLoc,'w+')
f.write(redirect)
f.close()
@@ -564,13 +564,19 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
#title
- matchTitle = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem, re.DOTALL | re.MULTILINE)
+ matchTitle = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}[\'](.*?)[\'].*?},', curQueueItem, re.DOTALL | re.MULTILINE)
if matchTitle:
curX.Title = matchTitle.group(1).strip()
else:
- matchTitle2 = re.search('"ShortName": "(.*?)"',curQueueItem, re.DOTALL
| re.MULTILINE)
- if matchTitle2:
- curX.Title = matchTitle2.group(1).strip()
+ matchTitleQuoted = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem, re.DOTALL | re.MULTILINE)
+ if matchTitleQuoted:
+ curX.Title = matchTitleQuoted.group(1).strip()
+ else:
+ matchTitle3 = re.search('"ShortName": "(.*?)"',curQueueItem,
re.DOTALL | re.MULTILINE)
+ if matchTitle3:
+ curX.Title = matchTitle3.group(1).strip()
+
+
#position
matchPosition = re.search(r'[\'"]position[\'"]: u{0,1}[\'"](\d{1,6})[\'"],
', curQueueItem, re.DOTALL | re.MULTILINE)
if matchPosition:
@@ -607,15 +613,19 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
curX.WebURL = matchWebURL.group(1)
#shorttitle
- matchTitleShort = re.search('[\'"]title[\'"]:
{.*?[\'"](title_)?short[\'"]: u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem,
re.DOTALL | re.MULTILINE)
+ matchTitleShort = re.search('[\'"]title[\'"]:
{.*?[\'"](title_)?short[\'"]: u{0,1}[\'](.*?)[\'].*?},', curQueueItem,
re.DOTALL | re.MULTILINE)
if matchTitleShort:
curX.TitleShort = matchTitleShort.group(2).strip()
else:
- matchTitleShort2 = re.search('"ShortName": "(.*?)"',curQueueItem,
re.DOTALL | re.MULTILINE)
- if matchTitleShort2:
- curX.TitleShort = matchTitleShort2.group(1).strip()
+ matchTitleShortQuotes = re.search('[\'"]title[\'"]:
{.*?[\'"](title_)?short[\'"]: u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem,
re.DOTALL | re.MULTILINE)
+ if matchTitleShortQuotes:
+ curX.TitleShort = matchTitleShortQuotes.group(2).strip()
+ else:
+ matchTitleShort3 = re.search('"ShortName": "(.*?)"',curQueueItem,
re.DOTALL | re.MULTILINE)
+ if matchTitleShort3:
+ curX.TitleShort = matchTitleShort3.group(1).strip()
+
firstM = True
-
#director
for matchDir in re.finditer(r"directors': \[(.*?)\]", curQueueItem):
firstM = True
@@ -689,13 +699,18 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
curX.TvShowSeasonID = matchShowData.group(2).strip()
#synop
- match = re.search(r"u'synopsis': {.*?u'regular': u'(.*?)}", curQueueItem,
re.DOTALL | re.MULTILINE)
- if match:
- curX.Synop = match.group(1)
+ matchSynop = re.search(r"u'synopsis': {.*?u'regular': u'(.*?)}",
curQueueItem, re.DOTALL | re.MULTILINE)
+ if matchSynop:
+ curX.Synop = matchSynop.group(1)
else:
- matchSynop = re.search(r'"Synopsis": "(.*?)", "AverageRating":
(.{1,5}), "ReleaseYear": (\d{4}),', curQueueItem, re.DOTALL | re.IGNORECASE |
re.MULTILINE)
- if matchSynop:
- curX.Synop = matchSynop.group(1)
+ matchSynop2 = re.search(r"u'synopsis': {.*?u'short_synopsis':
u'(.*?)}", curQueueItem, re.DOTALL | re.MULTILINE)
+ if matchSynop2:
+ curX.Synop = matchSynop2.group(1)
+ else:
+ matchSynop3 = re.search(r'"Synopsis": "(.*?)", "AverageRating":
(.{1,5}), "ReleaseYear": (\d{4}),', curQueueItem, re.DOTALL | re.IGNORECASE |
re.MULTILINE)
+ if matchSynop3:
+ curX.Synop = matchSynop3.group(1)
+
#cleanup synop
try:
strSynopsis = curX.Synop
@@ -723,7 +738,8 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
print "No Synop Data available for " + curX.Title
curX.Synop = "Available Until: " +
availableTimeRemaining(curX.AvailableUntil) + "\n" + curX.Synop
-
+
+ curX.TitleShortOriginal = curX.TitleShort
#Appending MPAA Rating to Title
if(SHOW_RATING_IN_TITLE):
curX.TitleShort = curX.TitleShort + " [" + curX.Mpaa + "]"
@@ -839,8 +855,12 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
matchEpNum = re.search('(?sm)u{0,1}[\'"]sequence[\'"]:
u{0,1}(?P<episodeNum>\\d{1,3})', matchAllEp.group())
if matchEpNum:
curXe.TvEpisodeEpisodeNum = str(matchEpNum.group("episodeNum"))
-
- matchShortTitle = re.search('(?sm)u{0,1}[\'"]episode_short[\'"]:
u{0,1}[\'"](?P<shorttitle>.*?)[\'"],', matchAllEp.group())
+
+ matchSeasonNum = re.search('(?sm)u{0,1}[\'"]season_number[\'"]:
u{0,1}(?P<seasonNum>\\d{1,3})', matchAllEp.group())
+ if matchEpNum:
+ curXe.TvEpisodeEpisodeSeasonNum =
str(matchSeasonNum.group("seasonNum"))
+
+ matchShortTitle = re.search('(?sm)u{0,1}[\'"]episode_short_raw[\'"]:
u{0,1}[\'"](?P<shorttitle>.*?)[\'"]', matchAllEp.group())
if matchShortTitle:
shortTitleString = str(matchShortTitle.group("shorttitle"))
@@ -851,9 +871,9 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
curXe.TitleShort = shortTitleString
else:
if(not forceExpand):
- curXe.TitleShort = curX.TitleShort + " " + "Episode: " +
str(curXe.TvEpisodeEpisodeNum) + " " + shortTitleString
+ curXe.TitleShort = curX.TitleShortOriginal + " " + "Episode: "
+ str(curXe.TvEpisodeEpisodeNum) + " " + shortTitleString
else:
- curXe.TitleShort = "Episode: " +
str(curXe.TvEpisodeEpisodeNum) + " - " + shortTitleString
+ curXe.TitleShort = "s" + str(curXe.TvEpisodeEpisodeSeasonNum)
+ "e" + str(curXe.TvEpisodeEpisodeNum) + " - " + shortTitleString
curXe.TvShow = True
curXe.TvShowLink = curX.TvShowLink
@@ -1012,21 +1032,26 @@ def getUrlString(url):
response.close()
return data
+def cleanString(strToClean):
+ result = str(strToClean)
+ result = re.sub(r""", r'"', result)
+ result = re.sub(r"&", r'&', result)
+ return result
+
def parseRSSFeedItem(curQueueItem, curX):
try:
reobj =
re.compile(r"<title>(.*?)</title>.*?<link>(.*?)</link>.*?<description>.*;{1}(.*?)</description>",
re.DOTALL | re.MULTILINE)
match = reobj.search(curQueueItem)
if match:
- curX.Title = match.group(1)
- curX.TitleShort = match.group(1)
- curX.Synop = match.group(3)
+ curX.Title = cleanString(match.group(1))
+ curX.TitleShort = cleanString(match.group(1))
+ curX.Synop = cleanString(match.group(3))
curX.WebURL = match.group(2)
reobj = re.compile(r".*?/(\d{1,15})", re.DOTALL | re.MULTILINE)
matchID = reobj.search(match.group(2))
if matchID:
curX.ID = matchID.group(1)
curX.Poster = "http://cdn-8.nflximg.com/us/boxshots/"; +
str(POSTER_QUAL) + "/" + curX.ID + ".jpg"
-
except:
print "error parsing data from RSS feed Item"
return curX
@@ -1306,7 +1331,7 @@ def initApp():
print "USER INFO FILE LOC: " + userInfoFileLoc
havefile = os.path.isfile(userInfoFileLoc)
if(not havefile):
- f = open(userInfoFileLoc,'r+')
+ f = open(userInfoFileLoc,'w+')
f.write("")
f.close()
diff --git a/plugin.video.xbmcflicks/resources/lib/modQueue.py
b/plugin.video.xbmcflicks/resources/lib/modQueue.py
index fb6c90d..eb95e28 100644
--- a/plugin.video.xbmcflicks/resources/lib/modQueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/modQueue.py
@@ -77,7 +77,7 @@ def getAuth(netflix, verbose):
def saveUserInfo():
#create the file
- f = open(os.path.join(str(USERINFO_FOLDER), 'userinfo.txt'),'r+')
+ f = open(os.path.join(str(USERINFO_FOLDER), 'userinfo.txt'),'w+')
setting ='requestKey=' + MY_USER['request']['key'] + '\n' +
'requestSecret=' + MY_USER['request']['secret'] + '\n' +'accessKey=' +
MY_USER['access']['key']+ '\n' + 'accessSecret=' + MY_USER['access']['secret']
f.write(setting)
f.close()
@@ -135,7 +135,7 @@ def initApp():
print "USER INFO FILE LOC: " + userInfoFileLoc
havefile = os.path.isfile(userInfoFileLoc)
if(not havefile):
- f = open(userInfoFileLoc,'r+')
+ f = open(userInfoFileLoc,'w+')
f.write("")
f.close()
diff --git a/plugin.video.xbmcflicks/resources/lib/settings.py
b/plugin.video.xbmcflicks/resources/lib/settings.py
index f624e42..bd8c876 100644
--- a/plugin.video.xbmcflicks/resources/lib/settings.py
+++ b/plugin.video.xbmcflicks/resources/lib/settings.py
@@ -28,8 +28,10 @@ def getUserSettingCaUser(arg):
return v
def getUserSettingExpandEpisodes(arg):
+ #no longer used, return False
ee = xbmcplugin.getSetting(arg,'expandEpisodes')
v = False
+ return False
if(ee == "0"):
v = True
if(ee == "1"):
@@ -79,7 +81,7 @@ def getUserSettingShowRatingInTitle(arg):
def getUserSettingPosterQuality(arg):
pqs = xbmcplugin.getSetting(arg,'pQuality')
- v = ""
+ v = "ghd"
if(pqs == "0"):
v = "ghd"
if(pqs == "1"):
diff --git a/plugin.video.xbmcflicks/resources/lib/xinfo.py
b/plugin.video.xbmcflicks/resources/lib/xinfo.py
index 5511773..b99bd93 100644
--- a/plugin.video.xbmcflicks/resources/lib/xinfo.py
+++ b/plugin.video.xbmcflicks/resources/lib/xinfo.py
@@ -5,6 +5,7 @@ class XInfo:
self.Year = "0000"
self.Title = "Item Full Title Name"
self.TitleShort = "Short Item Title"
+ self.TitleShortOriginal = "Original Short Item Title"
self.TitleShortLink = "Short Item Title with no spaces"
self.Rating = "0.0"
self.Runtime = "0"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=465f4478c7cdfd525bd9a1cf464cfb731706d411
commit 465f4478c7cdfd525bd9a1cf464cfb731706d411
Author: spiff <sp...@xbmc.org>
Date: Sat Apr 30 09:36:52 2011 +0200
[plugin.video.mediathek] updated to version 0.1.9
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index 42d5a4a..d51674f 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.1.8"
+ version="0.1.9"
name="Mediathek"
provider-name="Raptor 2101 [raptor2...@gmx.de]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 7df93c2..ccdf9b7 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,5 @@
+0.1.9 - FIX: ORF Playback
+ FIX: Progressbar is displayed corectly
0.1.8 - ZDF Changes their Interface, reimplement it
0.1.7 - Adding ORF
0.1.6 - FIXES: Arty playback now functional, RTMP set as default, Sorting of
Items in Bayrisches Fernsehen
diff --git a/plugin.video.mediathek/mediathek/__init__.py
b/plugin.video.mediathek/mediathek/__init__.py
index 5cac68f..26ad24f 100644
--- a/plugin.video.mediathek/mediathek/__init__.py
+++ b/plugin.video.mediathek/mediathek/__init__.py
@@ -108,13 +108,13 @@ class Mediathek(object):
treeNode = self.menuTree[0];
self.gui.log(treeNode.name);
for childNode in treeNode.childNodes:
- self.gui.buildMenuLink(childNode,self);
+ self.gui.buildMenuLink(childNode,self, len(treeNode.childNodes));
if(treeNode.displayElements):
- self.buildPageMenu(treeNode.link);
+ self.buildPageMenu(treeNode.link,len(treeNode.childNodes));
def displayCategories(self):
if(len(self.menuTree)>1):
for treeNode in self.menuTree:
- self.gui.buildMenuLink(treeNode,self)
+ self.gui.buildMenuLink(treeNode,self,len(self.menuTree))
else:
- self.buildPageMenu(self.menuTree[0].link);
\ No newline at end of file
+ self.buildPageMenu(self.menuTree[0].link, 0);
\ No newline at end of file
diff --git a/plugin.video.mediathek/mediathek/ard.py
b/plugin.video.mediathek/mediathek/ard.py
index faae81e..0028df2 100644
--- a/plugin.video.mediathek/mediathek/ard.py
+++ b/plugin.video.mediathek/mediathek/ard.py
@@ -110,38 +110,44 @@ class ARDMediathek(Mediathek):
return True;
def searchVideo(self, searchText):
- self.searchSendungen(searchText);
- self.searchClips(searchText);
+ sendungen = self.searchSendungen(searchText);
+ clips = self.searchClips(searchText);
+
+ elementCount = len(sendungen)+len(clips);
+
+ for sendung in sendungen:
+ self.buildSearchResultLink(sendung, False, elementCount);
+ for clip in clips:
+ self.buildSearchResultLink(clip, True, elementCount);
def searchSendungen(self, searchText):
searchLink = self.searchLink%(10,searchText);
self.gui.log(searchLink);
resultPage = self.loadPage(searchLink);
- for element in self.regex_videoLinks.finditer(resultPage):
- element = element.group()
- videoDocumentLink = self.regex_videoDocumentLink.search(element).group();
- metaInfoLink = self.regex_MetaInfo.search(element).group();
- displayObject = self.extractMetaInfo(self.rootLink+metaInfoLink);
- displayObject.link = self.rootLink+videoDocumentLink;
- displayObject.isPlayable = False;
-
- self.gui.buildVideoLink(displayObject,self);
-
+ return list(self.regex_videoLinks.finditer(resultPage));
+
def searchClips(self, searchText):
searchLink = self.searchLink%(40,searchText);
self.gui.log(searchLink);
resultPage = self.loadPage(searchLink);
- for element in self.regex_videoLinks.finditer(resultPage):
- element = element.group()
- videoDocumentLink = self.regex_videoDocumentLink.search(element).group();
- metaInfoLink = self.regex_MetaInfo.search(element).group();
-
- displayObject = self.extractMetaInfo(self.rootLink+metaInfoLink);
+ return list(self.regex_videoLinks.finditer(resultPage));
+
+ def buildSearchResultLink(self, element, isPlayable, elementCount):
+ element = element.group()
+ videoDocumentLink = self.regex_videoDocumentLink.search(element).group();
+ metaInfoLink = self.regex_MetaInfo.search(element).group();
+ displayObject = self.extractMetaInfo(self.rootLink+metaInfoLink);
+
+ if(isPlayable):
displayObject.link = self.getVideoLink(self.rootLink+videoDocumentLink);
+ else:
+ displayObject.link = self.rootLink+videoDocumentLink;
+ displayObject.isPlayable = False;
- self.gui.buildVideoLink(displayObject,self);
+ self.gui.buildVideoLink(displayObject, self, elementCount);
+
- def buildPageMenu(self, link, subLink = False):
+ def buildPageMenu(self, link, initCount, subLink = False):
self.gui.log(link);
mainPage = self.loadPage(link);
@@ -164,8 +170,8 @@ class ARDMediathek(Mediathek):
link = link.group();
link = self.regex_ajaxLink.search(link).group();
self.gui.log("SubLink: "+link)
- elementCount += self.buildPageMenu(self.rootLink+link,True);
- if(elementCount > 20):
+ elementCount += self.buildPageMenu(self.rootLink+link, 0,True);
+ if(elementCount > 60):
break;
return elementCount;
@@ -173,8 +179,9 @@ class ARDMediathek(Mediathek):
def extractCategorieObjects(self,mainPage):
- counter = 0
- for element in self.regex_videoLinks.finditer(mainPage):
+ elements = list(self.regex_videoLinks.finditer(mainPage));
+ counter = len(elements);
+ for element in elements:
element = element.group()
videoDocumentLink = self.regex_videoDocumentLink.search(element).group();
@@ -183,13 +190,13 @@ class ARDMediathek(Mediathek):
displayObject = self.extractMetaInfo(self.rootLink+metaInfoLink);
displayObject.link = self.rootLink+videoDocumentLink;
displayObject.isPlayable = False;
- self.gui.buildVideoLink(displayObject,self);
- counter += 1;
+ self.gui.buildVideoLink(displayObject, self, counter);
return counter;
def extractVideoObjects(self,mainPage):
- counter = 0;
- for element in self.regex_videoLinks.finditer(mainPage):
+ elements = list(self.regex_videoLinks.finditer(mainPage));
+ counter = len(elements);
+ for element in elements:
element = element.group()
videoDocumentLink = self.regex_videoDocumentLink.search(element).group();
@@ -198,8 +205,7 @@ class ARDMediathek(Mediathek):
displayObject = self.extractMetaInfo(self.rootLink+metaInfoLink);
displayObject.link = self.getVideoLink(self.rootLink+videoDocumentLink);
- self.gui.buildVideoLink(displayObject,self);
- counter+=1;
+ self.gui.buildVideoLink(displayObject,self, counter);
return counter;
def extractMetaInfo(self, link):
diff --git a/plugin.video.mediathek/mediathek/arte.py
b/plugin.video.mediathek/mediathek/arte.py
index f7d3543..a2e632e 100644
--- a/plugin.video.mediathek/mediathek/arte.py
+++ b/plugin.video.mediathek/mediathek/arte.py
@@ -62,23 +62,24 @@ class ARTEMediathek(Mediathek):
self.baseXmlLink =
self.rootLink+"/de/do_delegate/videos/global-%s,view,asPlayerXml.xml"
self.searchLink = self.rootLink+"/de/do_search/videos/suche?q=";
- def buildPageMenu(self, link):
+ def buildPageMenu(self, link, initCount):
self.gui.log("buildPageMenu: "+link);
mainPage = self.loadPage(link);
- self.extractTopicObjects(mainPage);
- self.extractVideoObjects(mainPage);
+ elementCount = self.extractTopicObjects(mainPage, initCount);
+ self.extractVideoObjects(mainPage, elementCount);
def searchVideo(self, searchText):
link = self.searchLink + searchText
- self.buildPageMenu(link);
+ self.buildPageMenu(link,0);
- def extractVideoObjects(self,mainPage):
+ def extractVideoObjects(self,mainPage, initCount):
videoIDs = [];
for videoID in self.regex_Clips.findall(mainPage):
if videoID not in videoIDs:
videoIDs.append(videoID);
+ elementCount = initCount+len(videoIDs);
for videoID in videoIDs:
- self.extractVideoInformation(videoID);
+ self.extractVideoInformation(videoID,elementCount);
def parseDate(self,dateString):
self.gui.log(dateString);
@@ -87,7 +88,7 @@ class ARTEMediathek(Mediathek):
dateString = dateString.replace(month,month_replacements[month]);
return time.strptime(dateString,"%d %m %Y");
- def extractVideoInformation(self, videoID):
+ def extractVideoInformation(self, videoID, elementCount):
link = self.baseXmlLink%(videoID);
xmlPage = self.loadPage(link);
try:
@@ -135,19 +136,22 @@ class ARTEMediathek(Mediathek):
links[quality] = SimpleLink("%s playpath=MP4:%s
swfUrl=http://videos.arte.tv/blob/web/i18n/view/player_11-3188338-data-4836231.swf
swfVfy=1"%(stringArray[0],stringArray[1]),0);
if(len(links) > 0):
self.gui.log("Picture: "+picture);
-
self.gui.buildVideoLink(DisplayObject(title,"",picture,desc,links,True,date),self);
+
self.gui.buildVideoLink(DisplayObject(title,"",picture,desc,links,True,date),self,elementCount);
configXml.unlink();
except:
self.gui.log("something goes wrong while processing "+link);
self.gui.log(xmlPage);
- def extractTopicObjects(self,mainPage):
- for touple in self.regex_ExtractTopicPages.findall(mainPage):
+ def extractTopicObjects(self,mainPage,initCount):
+ touples = self.regex_ExtractTopicPages.findall(mainPage)
+ elementCount = len(touples) + initCount
+ for touple in touples:
try:
title = touple[1].encode('UTF-8');
except:
title = touple[1].decode('UTF-8');
numbers = touple[2];
link = touple[0];
-
self.gui.buildVideoLink(DisplayObject(title,"","","",self.rootLink+link,False),self);
+
self.gui.buildVideoLink(DisplayObject(title,"","","",self.rootLink+link,False),self,elementCount);
+ return elementCount;
\ No newline at end of file
diff --git a/plugin.video.mediathek/mediathek/bayerisches.py
b/plugin.video.mediathek/mediathek/bayerisches.py
index 3fb35ae..8d10141 100644
--- a/plugin.video.mediathek/mediathek/bayerisches.py
+++ b/plugin.video.mediathek/mediathek/bayerisches.py
@@ -45,7 +45,7 @@ class BayerischesFSMediathek(Mediathek):
);
- def buildPageMenu(self, link):
+ def buildPageMenu(self, link, initCount):
self.gui.log("buildPageMenu: "+link);
a=self.loadAndUnzip();
@@ -54,7 +54,7 @@ class BayerischesFSMediathek(Mediathek):
self.xml_cont = minidom.parseString(a);
except:
self.menuTree = (
- TreeNode("0","Plugin Broken, Sry ;)","http://LoadAll",False),
+ TreeNode("0","Plugin Broken, Sry ;)","http://LoadAll",False,initCount),
);
return;
displayItems=[];
@@ -62,8 +62,9 @@ class BayerischesFSMediathek(Mediathek):
displayItem = self.extractVideoInformation(itemNode);
if(displayItem is not None):
displayItems.append(displayItem);
+ itemCount = len(displayItems) +initCount
for displayItem in sorted(displayItems, key = lambda item:item.date,
reverse=True):
- self.gui.buildVideoLink(displayItem,self);
+ self.gui.buildVideoLink(displayItem,self,itemCount);
def readText(self,node,textNode):
try:
node = node.getElementsByTagName(textNode)[0].firstChild;
diff --git a/plugin.video.mediathek/mediathek/dreisat.py
b/plugin.video.mediathek/mediathek/dreisat.py
index 633c9ff..e3f5026 100644
--- a/plugin.video.mediathek/mediathek/dreisat.py
+++ b/plugin.video.mediathek/mediathek/dreisat.py
@@ -92,10 +92,11 @@ class DreiSatMediathek(Mediathek):
self.regex_searchImage =
re.compile("/dynamic/mediathek/stills/\\d*_big\\.jpg");
self.replace_html = re.compile("<.*?>");
- def buildPageMenu(self, link):
+ def buildPageMenu(self, link, initCount):
self.gui.log("buildPageMenu: "+link);
rssFeed = self.loadConfigXml(link);
- self.extractVideoObjects(rssFeed);
+ self.extractVideoObjects(rssFeed, initCount);
+
def searchVideo(self, searchText):
values ={'mode':'search',
'query':searchText,
@@ -105,7 +106,8 @@ class DreiSatMediathek(Mediathek):
'query_order':''
}
mainPage = self.loadPage(self.searchLink,values);
- for result in self.regex_searchResult.findall(mainPage):
+ results = self.regex_searchResult.findall(mainPage);
+ for result in results:
objectLink = self.regex_searchResultLink.search(result).group();
infoLink = self.rootLink+objectLink
infoPage = self.loadPage(infoLink);
@@ -126,7 +128,7 @@ class DreiSatMediathek(Mediathek):
video = self.regex_searchLink.search(videoPage).group();
links = {}
links[2] = SimpleLink(video,0)
- self.gui.buildVideoLink(DisplayObject(title,"",self.rootLink +
image,detail,links,True, pubDate),self);
+ self.gui.buildVideoLink(DisplayObject(title,"",self.rootLink +
image,detail,links,True, pubDate),self,len(results));
def readText(self,node,textNode):
try:
@@ -140,11 +142,11 @@ class DreiSatMediathek(Mediathek):
xmlPage = self.loadPage(link);
return minidom.parseString(xmlPage);
- def extractVideoObjects(self, rssFeed):
- videoIDs = [];
-
- for itemNode in rssFeed.getElementsByTagName("item"):
- self.extractVideoInformation(itemNode);
+ def extractVideoObjects(self, rssFeed, initCount):
+ nodes = rssFeed.getElementsByTagName("item");
+ nodeCount = initCount + len(nodes)
+ for itemNode in nodes:
+ self.extractVideoInformation(itemNode,nodeCount);
def parseDate(self,dateString):
dateString = regex_dateString.search(dateString).group();
@@ -152,7 +154,7 @@ class DreiSatMediathek(Mediathek):
dateString = dateString.replace(month,month_replacements[month]);
return time.strptime(dateString,"%d %m %Y");
- def extractVideoInformation(self, itemNode):
+ def extractVideoInformation(self, itemNode, nodeCount):
title = self.readText(itemNode,"title");
dateString = self.readText(itemNode,"pubDate");
@@ -178,5 +180,5 @@ class DreiSatMediathek(Mediathek):
links[1] = SimpleLink(url, size);
else:
links[2] = SimpleLink(url, size);
-
self.gui.buildVideoLink(DisplayObject(title,"",picture,description,links,True,
pubDate),self);
+
self.gui.buildVideoLink(DisplayObject(title,"",picture,description,links,True,
pubDate),self,nodeCount);
\ No newline at end of file
diff --git a/plugin.video.mediathek/mediathek/orf.py
b/plugin.video.mediathek/mediathek/orf.py
index 1c5cdc0..00b1e59 100644
--- a/plugin.video.mediathek/mediathek/orf.py
+++ b/plugin.video.mediathek/mediathek/orf.py
@@ -147,7 +147,7 @@ class ORFMediathek(Mediathek):
def isSearchable(self):
return True;
- def createVideoLink(self,title,image,videoPageLink):
+ def createVideoLink(self,title,image,videoPageLink,elementCount):
videoPage = self.loadPage(self.rootLink+videoPageLink);
videoLink = self.regex_extractVideoLink.search(videoPage);
@@ -163,15 +163,16 @@ class ORFMediathek(Mediathek):
counter+=1;
if(counter == 1):
- self.gui.buildVideoLink(DisplayObject(title,"",image,"",videoLink, True,
time.gmtime()),self);
+ self.gui.buildVideoLink(DisplayObject(title,"",image,"",videoLink, True,
time.gmtime()),self,elementCount);
else:
- self.gui.buildVideoLink(DisplayObject(title,"",image,"",videoLink,
"PlayList", time.gmtime()),self);
+ self.gui.buildVideoLink(DisplayObject(title,"",image,"",videoLink,
"PlayList", time.gmtime()),self,elementCount);
def searchVideo(self, searchText):
link = self.searchLink = "http://tvthek.orf.at/search?q="+searchText;
mainPage = self.loadPage(link);
+ result = self.regex_extractSearchObject.findall(mainPage);
- for searchObject in self.regex_extractSearchObject.findall(mainPage):
+ for searchObject in result:
videoLink =
self.regex_extractProgrammLink.search(searchObject).group().replace("\"","");
title =
self.regex_extractProgrammTitle.search(searchObject).group().replace("title=\"","").replace("\"","");
title = title.decode("UTF-8");
@@ -179,12 +180,13 @@ class ORFMediathek(Mediathek):
print videoLink;
- self.createVideoLink(title,pictureLink,videoLink);
+ self.createVideoLink(title,pictureLink,videoLink, len(result));
- def buildPageMenu(self, link):
+ def buildPageMenu(self, link, initCount):
mainPage = self.loadPage(link);
-
- for linkObject in self.regex_extractVideoObject.findall(mainPage):
+ links = self.regex_extractVideoObject.findall(mainPage);
+ elementCount = initCount + len(links);
+ for linkObject in links:
videoLink =
self.regex_extractVideoPageLink.search(linkObject).group().replace("\"","");
@@ -194,5 +196,5 @@ class ORFMediathek(Mediathek):
title = self.replace_html.sub("", title);
title = title.replace(" <span","");
- self.createVideoLink(title,image,videoLink);
+ self.createVideoLink(title,image,videoLink, elementCount);
diff --git a/plugin.video.mediathek/mediathek/zdf.py
b/plugin.video.mediathek/mediathek/zdf.py
index 90e7be8..7e8cd2d 100644
--- a/plugin.video.mediathek/mediathek/zdf.py
+++ b/plugin.video.mediathek/mediathek/zdf.py
@@ -113,23 +113,45 @@ class ZDFMediathek(Mediathek):
'sucheBtn.y':'8',
'sucheText': searchText}
mainPage = self.loadPage(self.searchSite,values);
- self.extractVideoObjects(mainPage);
+ videoPageLinks = list(self._regex_extractVideoPageLink.finditer(mainPage));
- def buildPageMenu(self, link):
+ self.initCount = 0;
+ self.countTopic = 0;
+ self.countVideo = len(videoPageLinks);
+
+ self.extractVideoObjects(videoPageLinks);
+
+ def buildPageMenu(self, link, initCount):
self.gui.log("buildPageMenu: "+link);
mainPage = self.loadPage(link);
- self.extractTopicObjects(mainPage);
- self.extractVideoObjects(mainPage);
- def extractVideoObjects(self,mainPage):
+ topicPageLinks = list(self._regex_extractTopicObject.finditer(mainPage));
+ videoPageLinks = list(self._regex_extractVideoPageLink.finditer(mainPage));
+
+ self.initCount = initCount;
+ self.countTopic = len(topicPageLinks);
+ self.countVideo = len(videoPageLinks);
+
+ self.extractTopicObjects(topicPageLinks);
+ self.extractVideoObjects(videoPageLinks);
+
+ def getItemCount(self):
+ return self.initCount + self.countTopic + self.countVideo;
+
+ def extractVideoObjects(self,videoPageLinks):
lastID = -1;
- for pageLink in self._regex_extractVideoPageLink.finditer(mainPage):
+ videos = []
+ for pageLink in videoPageLinks:
self.gui.log("pageLink: "+pageLink.group());
videoID = self._regex_extractVideoID.search(pageLink.group()).group();
videoID = videoID.replace("/","");
if(not lastID == videoID):
- self.loadConfigXml(videoID);
+ videos.append(videoID);
lastID = videoID;
+
+ self.countVideo = len(videos);
+ for videoID in videos:
+ self.loadConfigXml(videoID);
def loadConfigXml(self, videoID):
link = self.xmlService%(videoID);
@@ -195,7 +217,7 @@ class ZDFMediathek(Mediathek):
break;
configXml.unlink();
if(len(links) > 0):
-
self.gui.buildVideoLink(DisplayObject(title,"",picture,detail,links,True,
date),self);
+
self.gui.buildVideoLink(DisplayObject(title,"",picture,detail,links,True,
date),self,self.getItemCount());
except:
self.gui.log("Error while processing the xml-file: %s"%link);
self.gui.log(xmlPage);
@@ -251,8 +273,8 @@ class ZDFMediathek(Mediathek):
return links;
- def extractTopicObjects(self,mainPage):
- for element in self._regex_extractTopicObject.finditer(mainPage):
+ def extractTopicObjects(self,pageLinks):
+ for element in pageLinks:
element = element.group()
pictureLink = self.rootLink +
self._regex_extractPictureLink.search(element).group();
videoPageLink =
self.rootLink+self._regex_extractTopicPageLink.search(element).group();
@@ -264,7 +286,7 @@ class ZDFMediathek(Mediathek):
titles.append(title);
while len(titles) < 2:
titles.append("");
-
self.gui.buildVideoLink(DisplayObject(titles[0],titles[1],pictureLink,"",videoPageLink,False),self);
+
self.gui.buildVideoLink(DisplayObject(titles[0],titles[1],pictureLink,"",videoPageLink,False),self,self.getItemCount());
def cleanupNodes(self, rootNode):
for node in rootNode.childNodes:
diff --git a/plugin.video.mediathek/simplexbmc.py
b/plugin.video.mediathek/simplexbmc.py
index 226c0dd..433f2c7 100644
--- a/plugin.video.mediathek/simplexbmc.py
+++ b/plugin.video.mediathek/simplexbmc.py
@@ -41,7 +41,7 @@ class SimpleXbmcGui(object):
else:
xbmc.output("[%s]: %s" % (__plugin__, msg.encode('utf8')))
- def buildVideoLink(self, displayObject, mediathek):
+ def buildVideoLink(self, displayObject, mediathek, objectCount):
if(displayObject.subTitle == "" or displayObject.subTitle ==
displayObject.title):
title = transformHtmlCodes(displayObject.title);
else:
@@ -59,7 +59,7 @@ class SimpleXbmcGui(object):
url = "%s?type=%s&action=openPlayList&link=%s" %
(sys.argv[0],mediathek.name(), urllib.quote_plus(link.basePath))
self.log(url);
-
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listItem,isFolder=True)
+
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listItem,isFolder=True,totalItems
= objectCount)
else:
self.log(displayObject.title);
if(self.quality in displayObject.link):
@@ -93,17 +93,17 @@ class SimpleXbmcGui(object):
listItem.setProperty('IsPlayable', 'true');
-
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=link.basePath,listitem=listItem,isFolder=False)
+
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=link.basePath,listitem=listItem,isFolder=False,totalItems
= objectCount)
else:
url = "%s?type=%s&action=openTopicPage&link=%s" %
(sys.argv[0],mediathek.name(), urllib.quote_plus(displayObject.link))
-
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listItem,isFolder=True)
+
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listItem,isFolder=True,totalItems
= objectCount)
- def buildMenuLink(self,menuObject,mediathek):
+ def buildMenuLink(self,menuObject,mediathek,objectCount):
title = menuObject.name;
listItem=xbmcgui.ListItem(title, iconImage="DefaultFolder.png")
url = "%s?type=%s&action=openMenu&path=%s" %
(sys.argv[0],mediathek.name(), menuObject.path)
-
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listItem,isFolder=True)
+
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=listItem,isFolder=True,totalItems
= objectCount)
def listAvaibleMediathekes(self, mediathekNames):
rootPath =
os.path.join(self.settings.getAddonInfo('path'),"resources/logos/");
@@ -146,11 +146,11 @@ class SimpleXbmcGui(object):
return "";
def playPlaylist(self, remotePlaylist):
- xbmc.executebuiltin("Playlist.Clear");
player = xbmc.Player();
playerItem = xbmcgui.ListItem(remotePlaylist);
- playlist = xbmc.PlayList(xbmc.PLAYLIST_MUSIC)
+ playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO);
+ playlist.clear();
print "playPlaylist";
for link in regex_findLink.findall(remotePlaylist):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 2 +
plugin.video.mediathek/mediathek/__init__.py | 8 +-
plugin.video.mediathek/mediathek/ard.py | 66 +++++++++-------
plugin.video.mediathek/mediathek/arte.py | 26 ++++---
plugin.video.mediathek/mediathek/bayerisches.py | 7 +-
plugin.video.mediathek/mediathek/dreisat.py | 24 +++---
plugin.video.mediathek/mediathek/orf.py | 20 +++--
plugin.video.mediathek/mediathek/zdf.py | 44 ++++++++---
plugin.video.mediathek/simplexbmc.py | 16 ++--
plugin.video.sc2casts/addon.xml | 2 +-
plugin.video.sc2casts/changelog.txt | 6 +-
plugin.video.sc2casts/default.py | 2 +-
plugin.video.sc2casts/sc2casts.py | 18 ++--
plugin.video.xbmcflicks/addon.xml | 2 +-
plugin.video.xbmcflicks/changelog.txt | 3 +-
plugin.video.xbmcflicks/resources/lib/Netflix.py | 4 +-
plugin.video.xbmcflicks/resources/lib/iqueue.py | 85 +++++++++++++-------
plugin.video.xbmcflicks/resources/lib/modQueue.py | 4 +-
plugin.video.xbmcflicks/resources/lib/settings.py | 4 +-
plugin.video.xbmcflicks/resources/lib/xinfo.py | 1 +
21 files changed, 209 insertions(+), 137 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
