The branch, eden has been updated
via f894ab075f2b5c51b5e3a3de8771ab906ae7703a (commit)
via e40d4058e8f5e8c226aaf839d26f11903b3f183e (commit)
via b2cc1f6e9e4fac71ad51a93a803e409e70f798eb (commit)
from 2a615bf6f8f2ffb4d378b75c7d7d4814a5c6efad (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f894ab075f2b5c51b5e3a3de8771ab906ae7703a
commit f894ab075f2b5c51b5e3a3de8771ab906ae7703a
Author: beenje <[email protected]>
Date: Tue Feb 12 22:52:08 2013 +0100
[plugin.video.nrk] updated to version 4.3.3
diff --git a/plugin.video.nrk/addon.xml b/plugin.video.nrk/addon.xml
index f794dd1..bbe1986 100644
--- a/plugin.video.nrk/addon.xml
+++ b/plugin.video.nrk/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nrk"
name="NRK Nett-TV"
- version="4.3.2"
+ version="4.3.3"
provider-name="takoi">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.nrk/changelog.txt b/plugin.video.nrk/changelog.txt
index 762aaf9..97b6a9a 100644
--- a/plugin.video.nrk/changelog.txt
+++ b/plugin.video.nrk/changelog.txt
@@ -1,3 +1,6 @@
+[B]4.3.3[/B]
+- Fikset: plugin krasjet hvis videobeskrivelse ikke fantes
+
[B]4.3.2[/B]
- Sideendringer
diff --git a/plugin.video.nrk/data.py b/plugin.video.nrk/data.py
index 4062e77..40b86d9 100644
--- a/plugin.video.nrk/data.py
+++ b/plugin.video.nrk/data.py
@@ -138,20 +138,16 @@ def get_media_url(video_id, bitrate):
def _get_cached_json(url, node):
- return _get_cached(url, lambda x: json.loads(x)[node])
-
-def _get_cached(url, transform):
data = cache.get(url)
if data:
try:
- ret = transform(data)
- return ret
- except: # assume data is broken
+ return json.loads(data)[node]
+ except: # cache might be broken
pass
data = xhrsession.get(url).text
cache.delete(url)
cache.set(url, data)
- return transform(data)
+ return json.loads(data)[node]
def _thumb_url(id):
return "http://nrk.eu01.aws.af.cm/t/%s"; % id.strip('/')
@@ -161,5 +157,7 @@ def _fanart_url(id):
def _get_descr(url):
url = "http://nrk.no/serum/api/video/%s"; % url.split('/')[3]
- descr = _get_cached_json(url, 'description')
- return descr
+ try:
+ return _get_cached_json(url, 'description')
+ except:
+ return ""
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e40d4058e8f5e8c226aaf839d26f11903b3f183e
commit e40d4058e8f5e8c226aaf839d26f11903b3f183e
Author: beenje <[email protected]>
Date: Tue Feb 12 22:52:03 2013 +0100
[plugin.video.trailer.addict] updated to version 1.0.8
diff --git a/plugin.video.trailer.addict/addon.xml
b/plugin.video.trailer.addict/addon.xml
index 86ff13e..f054b30 100644
--- a/plugin.video.trailer.addict/addon.xml
+++ b/plugin.video.trailer.addict/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.trailer.addict"
name="Trailer Addict"
- version="1.0.7"
+ version="1.0.8"
provider-name="stacked">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.trailer.addict/changelog.txt
b/plugin.video.trailer.addict/changelog.txt
index d953189..d259096 100644
--- a/plugin.video.trailer.addict/changelog.txt
+++ b/plugin.video.trailer.addict/changelog.txt
@@ -1,3 +1,10 @@
+[B]Version 1.0.8[/B]
+
+- Version bump for frodo
+- Fixed 'access_voilation' errors
+- Added retry function to help with connection errors
+- Added dialog for movies missing trailers
+
[B]Version 1.0.7[/B]
- Fixed __plugin__ is not defined error
diff --git a/plugin.video.trailer.addict/default.py
b/plugin.video.trailer.addict/default.py
index dd094da..4ac66b4 100644
--- a/plugin.video.trailer.addict/default.py
+++ b/plugin.video.trailer.addict/default.py
@@ -1,14 +1,16 @@
-import xbmc, xbmcgui, xbmcplugin, urllib2, urllib, re, string, sys, os,
traceback, xbmcaddon, buggalo, time
+import xbmc, xbmcgui, xbmcplugin, xbmcaddon, urllib, re, string, sys, os,
buggalo
plugin = 'Trailer Addict'
__author__ = 'stacked <[email protected]>'
__url__ = 'http://code.google.com/p/plugin/'
-__date__ = '12-10-2012'
-__version__ = '1.0.7'
+__date__ = '01-27-2013'
+__version__ = '1.0.8'
settings = xbmcaddon.Addon( id = 'plugin.video.trailer.addict' )
buggalo.SUBMIT_URL = 'http://www.xbmc.byethost17.com/submit.php'
+from addonfunc import addListItem, playListItem, getUrl, getPage, setViewMode,
getParameters, retry
+
next_thumb = os.path.join( settings.getAddonInfo( 'path' ), 'resources',
'media', 'next.png' )
search_thumb = os.path.join( settings.getAddonInfo( 'path' ), 'resources',
'media', 'search_icon.png' )
clapperboard_thumb = os.path.join( settings.getAddonInfo( 'path' ),
'resources', 'media', 'clapperboard.png' )
@@ -17,77 +19,16 @@ oscar_thumb = os.path.join( settings.getAddonInfo( 'path'
), 'resources', 'media
popcorn_thumb = os.path.join( settings.getAddonInfo( 'path' ), 'resources',
'media', 'popcorn.png' )
poster_thumb = os.path.join( settings.getAddonInfo( 'path' ), 'resources',
'media', 'poster.png' )
-def open_url(url, get = False):
- retries = 0
- while retries < 11:
- data = {'content': None, 'error': None}
- try:
- if retries != 0:
- time.sleep(3)
- data = get_page(url)
- if data['content'] != None and \
- data['error'] == None and \
- type(data['content']) == str or
type(data['content']) == unicode:
- return data['content']
- if data['error'] == 'HTTP Error 404: Not Found':
- break
- except Exception, e:
- data['error'] = str(e)
- retries += 1
- dialog = xbmcgui.Dialog()
- ret = dialog.yesno(plugin, settings.getLocalizedString( 30050 ),
data['error'], '', settings.getLocalizedString( 30052 ),
settings.getLocalizedString( 30053 ))
- if ret == False:
- open_url(url)
- else:
- ok = dialog.ok(plugin, settings.getLocalizedString( 30051 ))
- buggalo.addExtraData('url', url)
- buggalo.addExtraData('error', data['error'])
- raise Exception("open_url ERROR")
-
-def get_page(url):
- data = {'content': None, 'error': None}
- try:
- req = urllib2.Request(url)
- req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1;
WOW64; rv:15.0) Gecko/20100101 Firefox/15.0.1')
- content = urllib2.urlopen(req)
- html = content.read()
- content.close()
- try:
- data['content'] = html.decode("utf-8")
- return data
- except:
- data['content'] = html
- return data
- except Exception, e:
- data['error'] = str(e)
- return data
-
-def ListItem(label, image, url, isFolder, infoLabels = False):
- listitem = xbmcgui.ListItem(label = label, iconImage = image,
thumbnailImage = image)
- #listitem.setProperty('fanart_image', fanart)
- if infoLabels:
- listitem.setInfo( type = "Video", infoLabels = infoLabels )
- if not isFolder:
- listitem.setProperty('IsPlayable', 'true')
- u = sys.argv[0] + '?'
- for key, value in url.items():
- u = u + key + '=' + value + '&'
- ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u,
listitem = listitem, isFolder = isFolder)
- return ok
-
def clean( name ):
list = [ ( '&', '&' ), ( '"', '"' ), ( '<em>', '' ), (
'</em>', '' ), ( ''', '\'' ) ]
for search, replace in list:
name = name.replace( search, replace )
return name
-
-def setViewMode(id):
- if xbmc.getSkinDir() == "skin.confluence":
- xbmc.executebuiltin("Container.SetViewMode(" + id + ")")
+@retry((IndexError, TypeError))
def find_trailers( url, name ):
save_name = name
- data = open_url( url )
+ data = getUrl( url )
link_thumb = re.compile( '<a href="(.+?)"><img src="(.+?)" name="thumb'
).findall( data )
thumbs = re.compile( 'img src="/psize\.php\?dir=(.+?)" style'
).findall( data )
if len( thumbs ) == 0:
@@ -96,6 +37,14 @@ def find_trailers( url, name ):
thumb = 'http://www.traileraddict.com/' + thumbs[0]
title = re.compile( '<div class="abstract"><h2><a
href="(.+?)">(.+?)</a></h2><br />', re.DOTALL ).findall( data )
trailers = re.compile( '<dl class="dropdown">(.+?)</dl>', re.DOTALL
).findall( data )
+ if len(title) == 0 and len(trailers) == 0:
+ dialog = xbmcgui.Dialog()
+ ok = dialog.ok(plugin, settings.getLocalizedString( 30012 ))
+ ok = dialog.ok(plugin, settings.getLocalizedString( 30051 ))
+ buggalo.addExtraData('url', url)
+ buggalo.addExtraData('name', name)
+ raise Exception('find_trailers Error 1')
+ return
item_count = 0
if len( trailers ) > 0:
check1 = re.compile( '<a href="(.+?)"><img
src="\/images\/usr\/arrow\.png" border="0" style="float:right;" \/>(.+?)</a>'
).findall( trailers[0] )
@@ -104,31 +53,43 @@ def find_trailers( url, name ):
url_title = check1
for url, title in url_title:
url = 'http://www.traileraddict.com' + url
- u = { 'mode': '5', 'name': urllib.quote_plus(
save_name + ' (' + clean( title ) + ')' ), 'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = thumb,
url = u, isFolder = False, infoLabels = False)
+ infoLabels = { "Title": title, "Plot":
save_name + ' (' + clean( title ) + ')' }
+ u = { 'mode': '5', 'name': save_name + ' (' +
clean( title ) + ')', 'url': url }
+ addListItem(label = clean( title ), image =
thumb, url = u, isFolder = False, infoLabels = False)
xbmcplugin.addSortMethod( handle = int(sys.argv[1]),
sortMethod = xbmcplugin.SORT_METHOD_NONE )
+ setViewMode("502", "movies")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
elif len( check2 ) > 0:
url_title = check2
for url, trash1, trash2, title in url_title:
url = 'http://www.traileraddict.com' + url
- u = { 'mode': '5', 'name': urllib.quote_plus(
save_name + ' (' + clean( title ) + ')' ), 'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = thumb,
url = u, isFolder = False, infoLabels = False)
+ #infoLabels = { "Title": title, "Plot":
save_name + ' (' + clean( title ) + ')' }
+ u = { 'mode': '5', 'name': save_name + ' (' +
clean( title ) + ')', 'url': url }
+ addListItem(label = clean( title ), image =
thumb, url = u, isFolder = False, infoLabels = False)
xbmcplugin.addSortMethod( handle = int(sys.argv[1]),
sortMethod = xbmcplugin.SORT_METHOD_NONE )
+ setViewMode("502", "movies")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
else:
dia = xbmcgui.Dialog()
- ok = dia.ok( settings.getLocalizedString(30005),
settings.getLocalizedString(30006) )
+ ok = dia.ok(plugin, settings.getLocalizedString(30006) )
+ ok = dia.ok(plugin, settings.getLocalizedString( 30051
))
+ buggalo.addExtraData('url', url)
+ buggalo.addExtraData('name', save_name)
+ raise Exception('find_trailers Error 2')
+ return
else:
for url, thumb2 in link_thumb:
if clean( title[item_count][1] ).find( 'Trailer' ) > 0:
url = 'http://www.traileraddict.com' + url
- u = { 'mode': '5', 'name': urllib.quote_plus(
save_name + ' (' + clean( title[item_count][1] ) + ')' ), 'url':
urllib.quote_plus( url ) }
- ListItem(label = clean( title[item_count][1] ),
image = thumb, url = u, isFolder = False, infoLabels = False)
+ infoLabels = { "Title": title[item_count][1],
"Plot": save_name + ' (' + clean( title[item_count][1] ) + ')' }
+ u = { 'mode': '5', 'name': save_name + ' (' +
clean( title[item_count][1] ) + ')', 'url': url }
+ addListItem(label = clean( title[item_count][1]
), image = thumb, url = u, isFolder = False, infoLabels = False)
item_count = item_count + 1
xbmcplugin.addSortMethod( handle = int( sys.argv[1] ),
sortMethod = xbmcplugin.SORT_METHOD_NONE )
+ setViewMode("502", "movies")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
+@retry((IndexError, TypeError))
def build_main_directory():
main=[
( settings.getLocalizedString(30000), search_thumb, '0' ),
@@ -139,9 +100,9 @@ def build_main_directory():
]
for name, thumbnailImage, mode in main:
listitem = xbmcgui.ListItem( label = name, iconImage =
"DefaultVideo.png", thumbnailImage = thumbnailImage )
- u = { 'mode': mode, 'name': urllib.quote_plus( name ) }
- ListItem(label = name, image = thumbnailImage, url = u,
isFolder = True, infoLabels = False)
- data = open_url( 'http://www.traileraddict.com' )
+ u = { 'mode': mode, 'name': name }
+ addListItem(label = name, image = thumbnailImage, url = u,
isFolder = True, infoLabels = False)
+ data = getUrl( 'http://www.traileraddict.com' )
url_thumb_x_title = re.compile( '<a href="/trailer/(.+?)"><img
src="(.+?)" border="0" alt="(.+?)" title="(.+?)" style="margin:2px 10px 8px
10px;">' ).findall( data )
for url, thumb, x, title in url_thumb_x_title:
title = title.rsplit( ' - ' )
@@ -152,13 +113,13 @@ def build_main_directory():
name2 = clean( title[0] )
url = 'http://www.traileraddict.com/trailer/' + url
thumb = 'http://www.traileraddict.com' + thumb
- u = { 'mode': '5', 'name': urllib.quote_plus( name2 ), 'url':
urllib.quote_plus( url ) }
- ListItem(label = name1, image = thumb, url = u, isFolder =
False, infoLabels = False)
+ u = { 'mode': '5', 'name': name2, 'url': url }
+ addListItem(label = name1, image = thumb, url = u, isFolder =
False, infoLabels = False)
xbmcplugin.addSortMethod( handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
- xbmcplugin.setContent(int(sys.argv[1]), 'movies')
- setViewMode("500")
+ setViewMode("500", "movies")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
-
+
+@retry((IndexError, TypeError))
def build_search_directory():
keyboard = xbmc.Keyboard( '', settings.getLocalizedString(30007) )
keyboard.doModal()
@@ -167,7 +128,7 @@ def build_search_directory():
search_string = keyboard.getText().replace( ' ', '+' )
if len( search_string ) == 0:
return
- data = open_url( 'http://www.traileraddict.com/search.php?q=' +
search_string )
+ data = getUrl( 'http://www.traileraddict.com/search.php?q=' +
search_string )
image = re.compile( '<center>\r\n<div style="background:url\((.*?)\);"
class="searchthumb">', re.DOTALL ).findall( data )
link_title = re.compile( '</div><a href="/tags/(.*?)">(.*?)</a><br />'
).findall( data )
if len( link_title ) == 0:
@@ -179,19 +140,20 @@ def build_search_directory():
for url, title in link_title:
url = 'http://www.traileraddict.com/tags/' + url
thumb = 'http://www.traileraddict.com' +
image[item_count].replace( '/pthumb.php?dir=', '' ).replace( '\r\n', '' )
- u = { 'mode': '4', 'name': urllib.quote_plus( clean( title ) ),
'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = thumb, url = u,
isFolder = True, infoLabels = False)
+ u = { 'mode': '4', 'name': clean( title ), 'url': url }
+ addListItem(label = clean( title ), image = thumb, url = u,
isFolder = True, infoLabels = False)
item_count = item_count + 1
xbmcplugin.addSortMethod( handle = int( sys.argv[1] ), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
+@retry((IndexError, TypeError))
def build_film_database_directory():
keyboard = xbmc.Keyboard( '', settings.getLocalizedString(30011) )
keyboard.doModal()
search_string = keyboard.getText().rsplit(' ')[0]
if ( (keyboard.isConfirmed() == False) or (len( search_string ) == 0) ):
return
- data = open_url( 'http://www.traileraddict.com/thefilms/' +
search_string )
+ data = getUrl( 'http://www.traileraddict.com/thefilms/' + search_string
)
link_title = re.compile( '<img src="/images/arrow2.png" class="arrow">
<a href="(.+?)">(.+?)</a>' ).findall( data )
if len( link_title ) == 0:
dialog = xbmcgui.Dialog()
@@ -201,35 +163,37 @@ def build_film_database_directory():
item_count=0
for url, title in link_title:
url = 'http://www.traileraddict.com/' + url
- u = { 'mode': '4', 'name': urllib.quote_plus( clean( title ) ),
'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = poster_thumb, url = u,
isFolder = True, infoLabels = False)
+ u = { 'mode': '4', 'name': clean( title ), 'url': url }
+ addListItem(label = clean( title ), image = poster_thumb, url =
u, isFolder = True, infoLabels = False)
item_count = item_count + 1
xbmcplugin.addSortMethod( handle = int( sys.argv[1] ), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
+@retry((IndexError, TypeError))
def build_coming_soon_directory():
- data = open_url( 'http://www.traileraddict.com/comingsoon' )
+ data = getUrl( 'http://www.traileraddict.com/comingsoon' )
margin_right = re.compile( '<div style=\"float:right(.*?)<div
style="float:left; width:300px;', re.DOTALL ).findall( data )[0]
margin_left = re.compile( '<div style=\"float:left;
width:300px;(.*?)<div style="clear:both;">', re.DOTALL ).findall( data )[0]
link_title = re.compile( '<img src="/images/arrow2.png" class="arrow">
<a href="(.+?)">(.+?)</a>' ).findall( margin_left )
item_count = 0
for url, title in link_title:
url = 'http://www.traileraddict.com/' + url
- u = { 'mode': '4', 'name': urllib.quote_plus( clean( title ) ),
'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = poster_thumb, url = u,
isFolder = True, infoLabels = False)
+ u = { 'mode': '4', 'name': clean( title ), 'url': url }
+ addListItem(label = clean( title ), image = poster_thumb, url =
u, isFolder = True, infoLabels = False)
item_count = item_count + 1
link_title = re.compile( '<img src="/images/arrow2.png" class="arrow">
<a href="(.+?)">(.+?)</a>' ).findall( margin_right )
item_count = 0
for url, title in link_title:
url = 'http://www.traileraddict.com/' + url
- u = { 'mode': '4', 'name': urllib.quote_plus( clean( title ) ),
'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = poster_thumb, url = u,
isFolder = True, infoLabels = False)
+ u = { 'mode': '4', 'name': clean( title ), 'url': url }
+ addListItem(label = clean( title ), image = poster_thumb, url =
u, isFolder = True, infoLabels = False)
item_count = item_count + 1
xbmcplugin.addSortMethod( handle = int( sys.argv[1] ), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
+@retry((IndexError, TypeError))
def build_top_150_directory():
- data = open_url( 'http://www.traileraddict.com/top150' )
+ data = getUrl( 'http://www.traileraddict.com/top150' )
link_title_views = re.compile( '<img src="/images/arrow2.png"
class="arrow"> <a href="(.+?)">(.+?)</a> <span
style="font-size:7pt;">(.+?)</span>' ).findall( data )
item_count = 75
for list in range( 0, 150 ):
@@ -237,15 +201,16 @@ def build_top_150_directory():
item_count = 0
title = link_title_views[item_count][1] + ' ' +
link_title_views[item_count][2]
url = 'http://www.traileraddict.com/' +
link_title_views[item_count][0]
- u = { 'mode': '4', 'name': urllib.quote_plus( clean( title ) ),
'url': urllib.quote_plus( url ) }
- ListItem(label = clean( title ), image = poster_thumb, url = u,
isFolder = True, infoLabels = False)
+ u = { 'mode': '4', 'name': clean( title ), 'url': url }
+ addListItem(label = clean( title ), image = poster_thumb, url =
u, isFolder = True, infoLabels = False)
item_count = item_count + 1
xbmcplugin.addSortMethod( handle = int( sys.argv[1] ), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
+@retry((IndexError, TypeError))
def build_featured_directory( page ):
save_page = page
- data = open_url( 'http://www.traileraddict.com/attraction/' + str( int(
page ) + 1) )
+ data = getUrl( 'http://www.traileraddict.com/attraction/' + str( int(
page ) + 1) )
url_thumb_x_title = re.compile( '<a href="/trailer/(.+?)"><img
src="(.+?)" border="0" alt="(.+?)" title="(.+?)" style="margin:8px 5px 2px
5px;"></a>' ).findall( data )
for url, thumb, x, title in url_thumb_x_title:
title = title.rsplit( ' - ' )
@@ -256,23 +221,23 @@ def build_featured_directory( page ):
name2 = clean( title[0] )
url = 'http://www.traileraddict.com/trailer/' + url
thumb = 'http://www.traileraddict.com' + thumb
- u = { 'mode': '5', 'name': urllib.quote_plus( name2 ), 'url':
urllib.quote_plus( url ) }
- ListItem(label = name1, image = thumb, url = u, isFolder =
False, infoLabels = False)
+ u = { 'mode': '5', 'name': name2, 'url': url }
+ addListItem(label = name1, image = thumb, url = u, isFolder =
False, infoLabels = False)
u = { 'mode': '6', 'page': str( int( save_page ) + 1 ) }
- ListItem(label = '[ Next Page (' + str( int( save_page ) + 2 ) + ') ]',
image = next_thumb, url = u, isFolder = True, infoLabels = False)
+ addListItem(label = '[ Next Page (' + str( int( save_page ) + 2 ) + ')
]', image = next_thumb, url = u, isFolder = True, infoLabels = False)
xbmcplugin.addSortMethod( handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
- xbmcplugin.setContent(int(sys.argv[1]), 'movies')
- setViewMode("500")
+ setViewMode("500", "movies")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
-
+
+@retry((IndexError, TypeError))
def play_video( url, name ):
- data = open_url( url )
+ data = getUrl( url )
url = re.compile( '<param name="movie"
value="http://www.traileraddict.com/emb/(.+?)">' ).findall( data )[0]
if data.find( 'watchplus()' ) > 0:
url = 'http://www.traileraddict.com/fvarhd.php?tid=' + url
else:
url = 'http://www.traileraddict.com/fvar.php?tid=' + url
- data = open_url( url )
+ data = getUrl( url )
thumb = re.compile( '&image=(.+?)&' ).findall( data )[0]
if thumb == 'http://www.traileraddict.com/images/noembed-removed.png':
dialog = xbmcgui.Dialog()
@@ -280,20 +245,8 @@ def play_video( url, name ):
return
url = re.compile( 'fileurl=(.+?)\n&vidwidth', re.DOTALL ).findall( data
)[0]
url = url.replace( '%3A', ':').replace( '%2F', '/' ).replace( '%3F',
'?' ).replace( '%3D', '=' ).replace( '%26', '&' ).replace( '%2F', '//' )
- listitem = xbmcgui.ListItem( label = name, iconImage =
"DefaultVideo.png", thumbnailImage = xbmc.getInfoImage( "ListItem.Thumb" ),
path = str(url) )
- listitem.setInfo( type="Video", infoLabels={ "Title": name , "Studio":
plugin } )
- xbmcplugin.setResolvedUrl( handle = int( sys.argv[1] ), succeeded =
True, listitem = listitem )
-
-def getParameters(parameterString):
- commands = {}
- splitCommands = parameterString[parameterString.find('?') + 1:].split('&')
- for command in splitCommands:
- if (len(command) > 0):
- splitCommand = command.split('=')
- key = splitCommand[0]
- value = splitCommand[1]
- commands[key] = value
- return commands
+ infoLabels = { "Title": name , "Studio": plugin }
+ playListItem(label = name, image = xbmc.getInfoImage( "ListItem.Thumb"
), path = str(url), infoLabels = infoLabels, PlayPath = False)
params = getParameters(sys.argv[2])
url = None
diff --git a/plugin.video.trailer.addict/resources/language/English/strings.xml
b/plugin.video.trailer.addict/resources/language/English/strings.xml
index 5a0fc6b..5bba63f 100644
--- a/plugin.video.trailer.addict/resources/language/English/strings.xml
+++ b/plugin.video.trailer.addict/resources/language/English/strings.xml
@@ -6,7 +6,7 @@
<string id="30003">[ Top 150 Films of the Week ]</string>
<string id="30004">[ Featured Trailers ]</string>
<string id="30005">No trailers found!</string>
- <string id="30006">Please report this problem to
[email protected]</string>
+ <string id="30006">There are currently no trailers available.</string>
<string id="30007">Search</string>
<string id="30009">No results found for </string>
<string id="30010">Try using the Film Database.</string>
@@ -18,4 +18,5 @@
<string id="30052">Retry</string>
<string id="30053">Quit</string>
<string id="30054">There was an index error.</string>
+ <string id="30055">Enable default view for Confluence skin</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b2cc1f6e9e4fac71ad51a93a803e409e70f798eb
commit b2cc1f6e9e4fac71ad51a93a803e409e70f798eb
Author: beenje <[email protected]>
Date: Tue Feb 12 22:51:58 2013 +0100
[plugin.video.eredivisie-live] updated to version 2.0.6
diff --git a/plugin.video.eredivisie-live/addon.xml
b/plugin.video.eredivisie-live/addon.xml
index c70f8d7..919f2da 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.5"
+ version="2.0.6"
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 09350de..0583654 100644
--- a/plugin.video.eredivisie-live/changelog.txt
+++ b/plugin.video.eredivisie-live/changelog.txt
@@ -18,3 +18,6 @@ Fix breakage due to cookielaws
[B]2.0.5:[/B]
Need to urlencode manually in eden
+
+[B]2.0.6:[/B]
+Need to urlencode everything manually in eden, should really test this better.
Thanks to Brian Eriksen for pointing this out.
diff --git a/plugin.video.eredivisie-live/default.py
b/plugin.video.eredivisie-live/default.py
index ffb7db1..94aa6c5 100644
--- a/plugin.video.eredivisie-live/default.py
+++ b/plugin.video.eredivisie-live/default.py
@@ -67,7 +67,7 @@ def get_filter_list(filter_string):
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":
cookies_prefix+base_url+location})
+ results.append({"name": name_re.search(link).group(1), "location":
urllib.quote(cookies_prefix+base_url+location)})
return results
def addListingDir(item):
@@ -107,7 +107,7 @@ def get_next_page(links):
result = {"name": __language__(30004)}
for string in links:
if 'class="forward active"' in string:
- result['location'] =
cookies_prefix+base_url+href_re.search(string).group(1)
+ result['location'] =
urllib.quote(cookies_prefix+base_url+href_re.search(string).group(1))
return result
def listVideoItems(url):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.eredivisie-live/addon.xml | 2 +-
plugin.video.eredivisie-live/changelog.txt | 3 +
plugin.video.eredivisie-live/default.py | 4 +-
plugin.video.nrk/addon.xml | 2 +-
plugin.video.nrk/changelog.txt | 3 +
plugin.video.nrk/data.py | 16 +-
plugin.video.trailer.addict/addon.xml | 2 +-
.../addonfunc.py | 0
plugin.video.trailer.addict/changelog.txt | 7 +
plugin.video.trailer.addict/default.py | 189 ++++++++------------
.../resources/language/English/strings.xml | 3 +-
.../resources/settings.xml | 0
12 files changed, 98 insertions(+), 133 deletions(-)
copy {plugin.video.espn.video => plugin.video.trailer.addict}/addonfunc.py
(100%)
copy {plugin.video.g4tv => plugin.video.trailer.addict}/resources/settings.xml
(100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
