The branch, eden has been updated
via 45164f64f1f37cce6789b385e308879a28aed5ef (commit)
from 46f431b03cb72b057dc04178ae29db421f44a629 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=45164f64f1f37cce6789b385e308879a28aed5ef
commit 45164f64f1f37cce6789b385e308879a28aed5ef
Author: beenje <[email protected]>
Date: Wed Jan 30 20:47:45 2013 +0100
[plugin.video.eredivisie-live] updated to version 2.0.4
diff --git a/plugin.video.eredivisie-live/addon.xml
b/plugin.video.eredivisie-live/addon.xml
index ddd0be9..cb7f2f2 100644
--- a/plugin.video.eredivisie-live/addon.xml
+++ b/plugin.video.eredivisie-live/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.eredivisie-live"
name="Eredivisie Live"
- version="2.0.3"
+ version="2.0.4"
provider-name="ErwinJunge">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.eredivisie-live/changelog.txt
b/plugin.video.eredivisie-live/changelog.txt
index fff631d..4e469ba 100644
--- a/plugin.video.eredivisie-live/changelog.txt
+++ b/plugin.video.eredivisie-live/changelog.txt
@@ -12,3 +12,6 @@ Improve speed, add next page button
[B]2.0.3:[/B]
Added language support
+
+[B]2.0.4:[/B]
+Fix breakage due to cookielaws
diff --git a/plugin.video.eredivisie-live/default.py
b/plugin.video.eredivisie-live/default.py
index c407ffe..71756ac 100644
--- a/plugin.video.eredivisie-live/default.py
+++ b/plugin.video.eredivisie-live/default.py
@@ -24,6 +24,7 @@ import xbmcgui
import xbmcaddon
import sys
import urllib2
+import urllib
import re
link_re = re.compile(r'<a.*?/a>', re.S)
@@ -33,7 +34,8 @@ name_re = re.compile(r'<span class="name">(.*?)</span>')
bandwidth_re = re.compile(r'BANDWIDTH=([0-9]+)')
playlist_re = re.compile(r'id="video-smil" value="(.*?)"')
-base_url = 'http://eredivisielive.nl'
+cookies_prefix = 'http://cookies.eredivisielive.nl/accepted.php?url='
+base_url = 'eredivisielive.nl'
number_of_items = 100
@@ -54,18 +56,18 @@ def get_params():
return param
def addFilterDir(name, filterString):
- u=sys.argv[0]+"?filter="+filterString
+ u=sys.argv[0]+"?module="+filterString
liz=xbmcgui.ListItem(name)
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
def get_filter_list(filter_string):
results = []
filter_re = re.compile(r'<div
id="filter-'+filter_string+'-options".*?</div>', re.S)
- links =
link_re.findall(filter_re.search(urllib2.urlopen(base_url+'/video').read()).group(0))
+ links =
link_re.findall(filter_re.search(urllib2.build_opener(urllib2.HTTPCookieProcessor).open(cookies_prefix+base_url+'/video').read()).group(0))
for link in links:
location = href_re.search(link).group(1)
if location != '/video/overzicht/':
- results.append({"name": name_re.search(link).group(1), "location":
base_url+location})
+ results.append({"name": name_re.search(link).group(1), "location":
cookies_prefix+base_url+location})
return results
def addListingDir(item):
@@ -74,13 +76,13 @@ def addListingDir(item):
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
def get_videos(links):
- results = [{"name": title_re.search(string).group(1), "location":
base_url+href_re.search(string).group(1)} for string in links if
'video-play-button' in string]
+ results = [{"name": title_re.search(string).group(1), "location":
cookies_prefix+base_url+href_re.search(string).group(1)} for string in links if
'video-play-button' in string]
return results
def get_bitrates(url):
results = []
- playlist_url = playlist_re.search(urllib2.urlopen(url).read()).group(1)
- playlist = urllib2.urlopen(playlist_url).readlines()
+ playlist_url =
playlist_re.search(urllib2.build_opener(urllib2.HTTPCookieProcessor).open(urllib.unquote(url)).read()).group(1)
+ playlist =
urllib2.build_opener(urllib2.HTTPCookieProcessor).open(playlist_url).readlines()
bandwidth_found = False
for line in playlist:
bandwidth_temp = bandwidth_re.search(line)
@@ -98,21 +100,21 @@ def addVideoItem(item):
def addVideoLink(item):
u=item['location']
- liz=xbmcgui.ListItem(item['name'], thumbnailImage=None)
+ liz=xbmcgui.ListItem(item['name'])
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=u, listitem=liz,
isFolder=False)
def get_next_page(links):
result = {"name": __language__(30004)}
for string in links:
if 'class="forward active"' in string:
- result['location'] = base_url+href_re.search(string).group(1)
+ result['location'] =
cookies_prefix+base_url+href_re.search(string).group(1)
return result
def listVideoItems(url):
next_page={'location': url}
items=[]
while next_page and len(items)<number_of_items:
- links = link_re.findall(urllib2.urlopen(next_page['location']).read())
+ links =
link_re.findall(urllib2.build_opener(urllib2.HTTPCookieProcessor).open(urllib.unquote(next_page['location'])).read())
items += get_videos(links)
next_page = get_next_page(links)
for item in items:
@@ -124,13 +126,13 @@ __settings__ =
xbmcaddon.Addon(id='plugin.video.eredivisie-live')
__language__ = __settings__.getLocalizedString
params=get_params() # First, get the parameters
-if 'filter' in params: # Filter chosen, load items
- if params['filter']:
- items = get_filter_list(params['filter'])
+if 'module' in params: # Filter chosen, load items
+ if params['module'] == 'all':
+ listVideoItems(cookies_prefix+base_url+'/video')
+ else:
+ items = get_filter_list(params['module'])
for item in items:
addListingDir(item)
- else:
- listVideoItems(base_url+'/video')
elif 'listing' in params: # Listing mode
listVideoItems(params['listing'])
@@ -141,7 +143,7 @@ elif 'item' in params: # Item selected, show bitrate options
addVideoLink(item)
else: # First entry, show main listing
- addFilterDir(__language__(30000), '')
+ addFilterDir(__language__(30000), 'all')
addFilterDir(__language__(30001), 'competition')
addFilterDir(__language__(30002), 'club')
addFilterDir(__language__(30003), 'category')
-----------------------------------------------------------------------
Summary of changes:
plugin.video.eredivisie-live/addon.xml | 2 +-
plugin.video.eredivisie-live/changelog.txt | 3 ++
plugin.video.eredivisie-live/default.py | 34 ++++++++++++++-------------
3 files changed, 22 insertions(+), 17 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
