The branch, eden has been updated
via 40dbf49e084b845696d44326d5f96165573a3626 (commit)
from ea3ae152905d058ec3cb9d50a183b4efdd8cc7b2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=40dbf49e084b845696d44326d5f96165573a3626
commit 40dbf49e084b845696d44326d5f96165573a3626
Author: kibje <edekl...@gmail.com>
Date: Sun Jun 23 11:57:46 2013 +0200
[plugin.video.tmz] updated to version 2.0.13
diff --git a/plugin.video.tmz/addon.xml b/plugin.video.tmz/addon.xml
index a83566b..fa0f395 100644
--- a/plugin.video.tmz/addon.xml
+++ b/plugin.video.tmz/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.tmz"
name="TMZ"
- version="2.0.12"
+ version="2.0.13"
provider-name="stacked">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.tmz/addonfunc.py b/plugin.video.tmz/addonfunc.py
index 261ce24..8bec2f3 100644
--- a/plugin.video.tmz/addonfunc.py
+++ b/plugin.video.tmz/addonfunc.py
@@ -2,8 +2,8 @@
Addon Functions
__author__ = 'stacked <stacked.x...@gmail.com>'
__url__ = 'http://code.google.com/p/plugin/'
-__date__ = '05-26-2013'
-__version__ = '0.0.10'
+__date__ = '06-15-2013'
+__version__ = '0.0.11'
'''
import xbmc, xbmcgui, xbmcaddon, xbmcplugin, urllib, urllib2, sys, time,
datetime, buggalo
@@ -137,7 +137,7 @@ def retry(ExceptionToCheck, tries = 10, delay = 3, backoff
= 1, logger = None):
break
except ExceptionToCheck, e:
if mtries >= 1:
- msg = "%s, Retrying in %d
seconds..." % (str(e), mdelay)
+ msg = "%s, Retrying in %s
seconds..." % (str(e), mdelay)
if logger:
logger.warning(msg)
else:
diff --git a/plugin.video.tmz/changelog.txt b/plugin.video.tmz/changelog.txt
index f0c4be3..6add61b 100644
--- a/plugin.video.tmz/changelog.txt
+++ b/plugin.video.tmz/changelog.txt
@@ -1,4 +1,10 @@
-[B]Version 2.0.12[/B]
+[B]Version 2.0.13[/B]
+
+- Updated addon to support recent website changes
+- Fixed 'ValueError' error
+- Fixed 'a number is required, not type' error
+
+[B]Version 3.0.12[/B]
- Fixed 'ValueError' when loading Raw & Uncut
- Fixed 'expected string or buffer' error
diff --git a/plugin.video.tmz/default.py b/plugin.video.tmz/default.py
index 4241807..cb9d40f 100644
--- a/plugin.video.tmz/default.py
+++ b/plugin.video.tmz/default.py
@@ -5,8 +5,8 @@ import simplejson as json
plugin = 'TMZ'
__author__ = 'stacked <stacked.x...@gmail.com>'
__url__ = 'http://code.google.com/p/plugin/'
-__date__ = '05-26-2013'
-__version__ = '2.0.12'
+__date__ = '06-22-2013'
+__version__ = '2.0.13'
settings = xbmcaddon.Addon( id = 'plugin.video.tmz' )
dbg = False
dbglevel = 3
@@ -42,7 +42,7 @@ def build_main_directory():
setViewMode("515")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
-@retry(IndexError, TypeError, ValueError)
+@retry((IndexError, TypeError, ValueError))
def build_video_directory( name ):
data = getUrl( 'http://www.tmz.com/videos/', True )
textarea = '[{' + re.compile('{ name: \'' + name.upper() + '\',( )?\n
allInitialJson: {(.+?)},\n (slug|noPaging)?', re.DOTALL).findall(
data )[0][1].replace('\n', '').replace('results:','"results":') + '}]'
@@ -68,18 +68,23 @@ def build_video_directory( name ):
except:
date = '0000.00.00'
if videoUrl.find('http://cdnbakmi.kaltura.com') == -1:
- if settings.getSetting("quality") == '0':
- url = 'http://cdnapi.kaltura.com/p/' +
thumb.split('/')[4] + '/sp/' + thumb.split('/')[6] + '/playManifest/entryId/' +
videoUrl.split('_')[0].split('/')[-1:][0] + '_' + videoUrl.split('_')[1]
- else:
- url = 'http://cdnapi.kaltura.com/p/' +
thumb.split('/')[4] + '/sp/' + thumb.split('/')[6] + '/playManifest/entryId/' +
videoUrl.split('_')[0].split('/')[-1:][0] + '_' + videoUrl.split('_')[1] +
'/flavorId/0_' + videoUrl.split('_')[3]
- infoLabels = { "Title": title, "Plot": title,
"Duration": str(int(duration)/60), "aired": str(date) }
- u = { 'mode': '1', 'name': title, 'url': url, 'studio':
name, 'thumb': thumb }
- addListItem(label = title, image = thumb, url = u,
isFolder = False, totalItems = totalItems, infoLabels = infoLabels, fanart =
fanart, duration = duration)
+ low_id = videoUrl.split('_')[0].split('/')[-1:][0] +
'_' + videoUrl.split('_')[1]
+ high_id = videoUrl.split('_')[0].split('/')[-1:][0] +
'_' + videoUrl.split('_')[1] + '/flavorId/0_' + videoUrl.split('_')[3]
+ else:
+ low_id = videoUrl.split('/')[9]
+ high_id = videoUrl.split('/')[9] + '/flavorId/' +
videoUrl.split('/')[11]
+ if settings.getSetting("quality") == '0':
+ url = 'http://cdnapi.kaltura.com/p/' +
thumb.split('/')[4] + '/sp/' + thumb.split('/')[6] + '/playManifest/entryId/' +
low_id
+ else:
+ url = 'http://cdnapi.kaltura.com/p/' +
thumb.split('/')[4] + '/sp/' + thumb.split('/')[6] + '/playManifest/entryId/' +
high_id
+ infoLabels = { "Title": title, "Plot": title, "Duration":
str(int(duration)/60), "aired": str(date) }
+ u = { 'mode': '1', 'name': title, 'url': url, 'studio': name,
'thumb': thumb }
+ addListItem(label = title, image = thumb, url = u, isFolder =
False, totalItems = totalItems, infoLabels = infoLabels, fanart = fanart,
duration = duration)
xbmcplugin.addSortMethod( handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
setViewMode("503")
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
-@retry(IndexError, ValueError)
+@retry((IndexError, ValueError))
def build_search_directory():
page = 1
checking = True
-----------------------------------------------------------------------
Summary of changes:
plugin.video.tmz/addon.xml | 2 +-
plugin.video.tmz/addonfunc.py | 6 +++---
plugin.video.tmz/changelog.txt | 8 +++++++-
plugin.video.tmz/default.py | 27 ++++++++++++++++-----------
4 files changed, 27 insertions(+), 16 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
