The branch, dharma has been updated
via 948b3002bd3b54be37789f4969096c6de77da11b (commit)
via 7bf62d1dd2a76758e3a446c5e032abcca8516663 (commit)
from e24ea3c0e893a17bdafc9c19f83c79482708e1b9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=948b3002bd3b54be37789f4969096c6de77da11b
commit 948b3002bd3b54be37789f4969096c6de77da11b
Author: spiff <[email protected]>
Date: Tue Apr 26 09:34:28 2011 +0200
[plugin.video.vimeo] updated to version 1.0.3
diff --git a/plugin.video.vimeo/VimeoCore.py b/plugin.video.vimeo/VimeoCore.py
index 81bd8e2..543296a 100755
--- a/plugin.video.vimeo/VimeoCore.py
+++ b/plugin.video.vimeo/VimeoCore.py
@@ -1,3 +1,21 @@
+'''
+ Vimeo plugin for XBMC
+ Copyright (C) 2010-2011 Tobias Ussing And Henrik Mosgaard Jensen
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+'''
+
import sys, urllib, urllib2, re, cookielib, string
from xml.dom.minidom import parseString
from BeautifulSoup import BeautifulStoneSoup
@@ -174,37 +192,6 @@ class VimeoCore(object):
value = con.read();
con.close()
- if value.find('<input type="hidden" name="oauth_token"
value="') == -1:
- if self.__dbg__:
- print self.__plugin__ + "
login_get_verifier no oauth_token: "
- return ( self.__language__(30606), 303 )
-
- start = value.find('<input type="hidden"
name="oauth_token" value="') + len('<input type="hidden" name="oauth_token"
value="')
- login_oauth_token = value[start:value.find('"', start)]
-
- start = value.find('<input type="hidden" id="xsrft"
class="xsrft" name="token" value="') + len('<input type="hidden" id="xsrft"
class="xsrft" name="token" value="')
- login_token = value[start:value.find('"', start)]
-
- url =
urllib2.Request("http://vimeo.com/oauth/authorize?permission=write";)
- url.add_header('User-Agent', self.USERAGENT)
-
- url.add_header('Content-Type',
'application/x-www-form-urlencoded')
-
- if self.__settings__.getSetting("accept") != "0":
- if self.__dbg__:
- print self.__plugin__ + "
login_get_verifier accept disabled"
- return ( self.__language__(30606), 303 )
-
- data = urllib.urlencode({'token': login_token,
-
'oauth_token': login_oauth_token,
-
'permission': 'write',
-
'accept': 'Yes, authorize Vimeo XBMC Plugin!'})
-
- con = urllib2.urlopen(url, data);
-
- value = con.read();
- con.close()
-
if value.find('<span class="verifier">') == -1:
if self.__dbg__:
print self.__plugin__ + "
login_get_verifier no login verifier "
@@ -226,8 +213,7 @@ class VimeoCore(object):
except:
if self.__dbg__:
print self.__plugin__ + " login_get_verifier
failed uncaught exception"
- print 'ERROR: %s::%s (%d) - %s' %
(self.__class__.__name__
-
, sys.exc_info()[2].tb_frame.f_code.co_name,
sys.exc_info()[2].tb_lineno, sys.exc_info()[1])
+ print 'ERROR: %s::%s (%d) - %s' %
(self.__class__.__name__ , sys.exc_info()[2].tb_frame.f_code.co_name,
sys.exc_info()[2].tb_lineno, sys.exc_info()[1])
return ( self.__language__(30606), 303 )
def downloadVideo(self, video):
@@ -370,7 +356,7 @@ class VimeoCore(object):
con = urllib2.urlopen(url);
video['video_url'] = con.geturl()
con.close()
-
+
if self.__dbg__:
print self.__plugin__ + " construct_video_url
done"
@@ -520,8 +506,17 @@ class VimeoCore(object):
result = []
if (len(soup.video) > 0):
video = {}
- video['videoid'] =
soup.embed_settings.clip_id.contents[0]
- video['Title'] =
soup.video.caption.contents[0].encode("utf-8")
+ video['videoid'] = videoid
+ title = soup.video.caption.contents[0].encode("utf-8")
+ if title:
+ title = title.replace("&", "&")
+ title = title.replace(""", '"')
+ title = title.replace("…", "...")
+ title = title.replace(">",">")
+ title = title.replace("<","<")
+ else:
+ title = "Unknown"
+ video['Title'] = title
video['Duration'] = soup.video.duration.contents[0]
video['thumbnail'] = soup.video.thumbnail.contents[0]
video['Studio'] =
soup.video.uploader_display_name.contents[0].encode( "utf-8" )
@@ -561,7 +556,8 @@ class VimeoCore(object):
title = title.replace("&", "&")
title = title.replace(""", '"')
title = title.replace("…", "...")
-
+ title = title.replace(">",">")
+ title = title.replace("<","<")
group[tag] = item["id"]
group['Title'] = title
@@ -569,7 +565,10 @@ class VimeoCore(object):
group['Description'] =
item.description.contents[0]
if (tag == "group"):
- group["thumbnail"] = item.logo_url.contents[0]
+ if item.logo_url != None:
+ group["thumbnail"] =
item.logo_url.contents[0]
+ else:
+ group["thumbnail"] = "default"
if (tag == "album"):
group["thumbnail"] = self.getThumbnail(item,
"default")
if (tag == "channel"):
@@ -651,6 +650,8 @@ class VimeoCore(object):
title = title.replace("&", "&")
title = title.replace(""", '"')
title = title.replace("…", "...")
+ title = title.replace(">",">")
+ title = title.replace("<","<")
video['Title'] = title
video['Plot'] = entry.description.contents[0]
diff --git a/plugin.video.vimeo/addon.xml b/plugin.video.vimeo/addon.xml
index 254597b..40510c7 100644
--- a/plugin.video.vimeo/addon.xml
+++ b/plugin.video.vimeo/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.vimeo"
name="Vimeo"
- version="1.0.2"
+ version="1.0.3"
provider-name="TheCollective">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.vimeo/changelog.txt b/plugin.video.vimeo/changelog.txt
index 9b47c59..584e42c 100644
--- a/plugin.video.vimeo/changelog.txt
+++ b/plugin.video.vimeo/changelog.txt
@@ -2,6 +2,12 @@
- [XBMC] Thumbnails sometimes turns into folders.
- XBMC has Excessive Memory use after running the plugin for prolonged periods
of time
+[B]Version 1.0.3[/B]
+- Fixed issue where listing groups would fail if every group didnt have a logo
+- Fixed a minor issue where special html chars would appear incorrectly in the
title during playback
+- Fixed login breakage caused by Vimeo site changes
+- Fixed playback breakage caused by Vimeo api changes
+
[B]Version 1.0.2[/B]
- Fixed login issues for users with non numeric user id's
diff --git a/plugin.video.vimeo/default.py b/plugin.video.vimeo/default.py
index fc77184..f73da78 100644
--- a/plugin.video.vimeo/default.py
+++ b/plugin.video.vimeo/default.py
@@ -3,7 +3,7 @@ import sys, xbmc, xbmcaddon
REMOTE_DBG = False
# plugin constants
-__version__ = "1.0.2"
+__version__ = "1.0.3"
__plugin__ = "Vimeo-" + __version__
__author__ = "TheCollective"
__url__ = "www.xbmc.com"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7bf62d1dd2a76758e3a446c5e032abcca8516663
commit 7bf62d1dd2a76758e3a446c5e032abcca8516663
Author: spiff <[email protected]>
Date: Tue Apr 26 09:33:28 2011 +0200
[plugin.video.giantbomb] updated to version 2.0.3
diff --git a/plugin.video.giantbomb/addon.xml b/plugin.video.giantbomb/addon.xml
index f779fa0..5d5655d 100644
--- a/plugin.video.giantbomb/addon.xml
+++ b/plugin.video.giantbomb/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.giantbomb"
- version="2.0.2"
+ version="2.0.3"
name="Giant Bomb"
provider-name="BuggeX">
<requires>
diff --git a/plugin.video.giantbomb/changelog.txt
b/plugin.video.giantbomb/changelog.txt
index 3023d02..72c68f3 100644
--- a/plugin.video.giantbomb/changelog.txt
+++ b/plugin.video.giantbomb/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.3 (April 25 2011)
+ - New Icon, thanks to frezzy
+
Version 2.0.2 (Dec 5 2010)
- Fixed problem with the Justin.tv archived streams
diff --git a/plugin.video.giantbomb/icon.png b/plugin.video.giantbomb/icon.png
index 7d7f394..93032b5 100644
Binary files a/plugin.video.giantbomb/icon.png and
b/plugin.video.giantbomb/icon.png differ
-----------------------------------------------------------------------
Summary of changes:
plugin.video.giantbomb/addon.xml | 2 +-
plugin.video.giantbomb/changelog.txt | 3 +
plugin.video.giantbomb/icon.png | Bin 47175 -> 52551 bytes
plugin.video.vimeo/VimeoCore.py | 77 +++++++++++++++++-----------------
plugin.video.vimeo/addon.xml | 2 +-
plugin.video.vimeo/changelog.txt | 6 +++
plugin.video.vimeo/default.py | 2 +-
7 files changed, 51 insertions(+), 41 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
