The branch, eden-pre has been updated
via a850f0fab0103a45c2c33654f55c265a02ac9467 (commit)
from b4427ea2cce78d3cf7e17ac0a079f8755ddde65b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a850f0fab0103a45c2c33654f55c265a02ac9467
commit a850f0fab0103a45c2c33654f55c265a02ac9467
Author: spiff <[email protected]>
Date: Tue Feb 21 08:56:29 2012 +0100
[plugin.video.pakee] updated to version 1.0.5
diff --git a/plugin.video.pakee/addon.xml b/plugin.video.pakee/addon.xml
index 14225e4..042cf50 100644
--- a/plugin.video.pakee/addon.xml
+++ b/plugin.video.pakee/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.pakee"
name="Pakee"
- version="1.0.4"
+ version="1.0.5"
provider-name="pakee">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.pakee/changelog.txt b/plugin.video.pakee/changelog.txt
index 8adf626..0404c44 100644
--- a/plugin.video.pakee/changelog.txt
+++ b/plugin.video.pakee/changelog.txt
@@ -1,3 +1,8 @@
+[B]Version 1.0.5[/B]
+- Fixed issue where feeds with alternate pubDate format were failing
+- Fixed hardcoded prompt messsages
+
+
[B]Version 1.0.4[/B]
- Added live channel streams from LiveStream's plugins community-links
repository
- Set default sorting to be by title for drama episodes
diff --git a/plugin.video.pakee/default.py b/plugin.video.pakee/default.py
index e0c7636..470608b 100644
--- a/plugin.video.pakee/default.py
+++ b/plugin.video.pakee/default.py
@@ -9,9 +9,9 @@ __plugin__ = 'Pakee'
__author__ = '[email protected]'
__url__ = 'http://code.google.com/p/pakee/'
__date__ = '01-04-2011'
-__version__ = '1.0.4'
+__version__ = '1.0.5'
__settings__ = xbmcaddon.Addon(id='plugin.video.pakee')
-__rooturl__ = 'http://pakee.hopto.org/pakee/pakee-xbmc.xml?a=9'
+__rooturl__ = 'http://pakee.hopto.org/pakee/pakee-xbmc.xml?a=3'
__language__ = __settings__.getLocalizedString
#plugin modes
@@ -50,7 +50,7 @@ def clean( name ):
list = [ ( '&', '&' ), ( '"', '"' ), ( '<em>', '' ), (
'</em>', '' ), ( ''', '\'' ), ( ''', '\'' ), ('&#039;', '\'') ]
for search, replace in list:
name = name.replace( search, replace )
- #return unicode(name.encode("utf-8"))
+ #return unicode(name.encode('utf-8','ignore'))
return unicode(name)
def open_settings():
@@ -176,9 +176,9 @@ def build_show_directory(origurl):
if 'Facebook' in origurl:
- xbmc.executebuiltin("XBMC.Notification("+ __plugin__
+",Requesting photos from Facebook,100)")
+ xbmc.executebuiltin("XBMC.Notification("+ __plugin__
+","+__settings__.getLocalizedString(30052)+",100)")
elif 'queryyt' in origurl:
- xbmc.executebuiltin("XBMC.Notification("+ __plugin__
+",Searching YouTube,100)")
+ xbmc.executebuiltin("XBMC.Notification("+ __plugin__
+","+__settings__.getLocalizedString(30053)+",100)")
#Read RSS items from origurl and store in items
@@ -216,12 +216,18 @@ def build_show_directory(origurl):
#if weird characters found in label or description, instead of
erroring out, empty their values (empty listitem will be shown)
try:
- xbmc.log('found in show_dir(): ' + clean(str(label)) +
' ' + str(url) + ' ' + str(thumb) + ' ' + str(rating) + ' ' + str(pubDate) + '
' + str(duration) + ' ' + str(viewcount))
+ #xbmc.log('found in show_dir(): ' + clean(str(label)) +
' ' + str(url) + ' ' + str(thumb) + ' ' + str(rating) + ' ' + str(pubDate) + '
' + str(duration) + ' ' + str(viewcount))
+ xbmc.log('found in show_dir(): ' +
str(label).encode('utf-8','ignore') + ' ' + str(url) + ' ' + str(thumb) + ' '
+ str(rating) + ' ' + str(pubDate) + ' ' + str(duration) + ' ' +
str(viewcount))
except:
- label = ''
- description = ''
- xbmc.log('found in show_dir(): ' + str(url) + ' ' +
str(rating) + ' ' + str(pubDate) + ' ' + str(duration) + ' ' + str(viewcount))
+ try:
+ xbmc.log('found in show_dir(): ' +
clean(str(label)) + ' ' + str(url) + ' ' + str(thumb) + ' ' + str(rating) + '
' + str(pubDate) + ' ' + str(duration) + ' ' + str(viewcount))
+ #xbmc.log('found in show_dir(): ' +
str(label).encode('utf-8','ignore') + ' ' + str(url) + ' ' + str(thumb) + ' '
+ str(rating) + ' ' + str(pubDate) + ' ' + str(duration) + ' ' +
str(viewcount))
+ except:
+ label = ''
+ description = ''
+
+ xbmc.log('found in show_dir(): ' + str(url) + '
' + str(rating) + ' ' + str(pubDate) + ' ' + str(duration) + ' ' +
str(viewcount))
if (url is not None and url != ''):
@@ -229,7 +235,8 @@ def build_show_directory(origurl):
#For feeds with videos as their first item, show <play
all> listitem as first listitem
if 'youtube.com' in url or '(Playlist: ' in label:
if itemCount == 0:
- playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
+ resolvedlabel = '<' +
str(__settings__.getLocalizedString(30050)) + '>'
+ playAll = xbmcgui.ListItem( label =
resolvedlabel, iconImage = pakee_thumb, thumbnailImage = pakee_thumb )
xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
@@ -250,7 +257,8 @@ def build_show_directory(origurl):
if url[-4:]=='.jpg' or url[-4:]=='.gif' or
url[-4:]=='.png':
#For folders with videos, show play all option
if itemCount == 0:
- playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30051) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
+ resolvedlabel = '<' +
str(__settings__.getLocalizedString(30051)) + '>'
+ playAll = xbmcgui.ListItem( label =
resolvedlabel, iconImage = pakee_thumb, thumbnailImage = pakee_thumb )
xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_SLIDESHOW)+"&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
isFolder = False
@@ -261,7 +269,8 @@ def build_show_directory(origurl):
#For feeds with mp3s as their first item, show
<play all> listitem as first listitem
if itemCount == 0:
- playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
+ resolvedlabel = '<' +
str(__settings__.getLocalizedString(30050)) + '>'
+ playAll = xbmcgui.ListItem( label =
resolvedlabel, iconImage = pakee_thumb, thumbnailImage = pakee_thumb )
xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
isFolder = False
@@ -281,9 +290,9 @@ def build_show_directory(origurl):
mode = PLUGIN_MODE_PLAY_STREAM
#For feeds with streams as their first item,
show <play all> listitem as first listitem
- if itemCount == 0:
- playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
- xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
+ #if itemCount == 0:
+ # playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
+ # xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
@@ -526,7 +535,11 @@ def getItemFields(item):
if pubDate == '':
pubDate = '01.01.1960'
else:
- tpubDate = time.strptime(pubDate, '%Y-%m-%d')
+ try:
+ tpubDate = time.strptime(pubDate, '%Y-%m-%d')
+ except:
+ tpubDate = time.strptime(pubDate, '%a, %d %b %Y
%H:%M:%S GMT')
+
pubDate = time.strftime("%d.%m.%Y", tpubDate)
else:
pubDate = '01.01.1960'
diff --git a/plugin.video.pakee/resources/language/English/strings.xml
b/plugin.video.pakee/resources/language/English/strings.xml
index 33e56e0..56cf145 100644
--- a/plugin.video.pakee/resources/language/English/strings.xml
+++ b/plugin.video.pakee/resources/language/English/strings.xml
@@ -8,6 +8,9 @@
<string id="30023">Playlist: Start playlist at selected video</string>
<string id="30050">Play all</string>
+ <string id="30051">Start slideshow</string>
+ <string id="30052">Requesting photos from Facebook</string>
+ <string id="30053">Searching YouTube</string>
<string id="30100">Default sort order</string>
<string id="30101">Default</string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.pakee/addon.xml | 2 +-
plugin.video.pakee/changelog.txt | 5 ++
plugin.video.pakee/default.py | 45 +++++++++++++-------
.../resources/language/English/strings.xml | 3 +
4 files changed, 38 insertions(+), 17 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
