The branch, dharma-pre has been updated
via 01276af7fc8f72416163a5994dd0547e255f2132 (commit)
from 3adc341fc7511de6ec37167469cfaec20b239d85 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=01276af7fc8f72416163a5994dd0547e255f2132
commit 01276af7fc8f72416163a5994dd0547e255f2132
Author: spiff <[email protected]>
Date: Thu Oct 14 13:30:06 2010 +0200
[plugin.image.iphoto] updated to version 0.9.9
diff --git a/plugin.image.iphoto/README.txt b/plugin.image.iphoto/README.txt
index 26f93f8..a30f870 100644
--- a/plugin.image.iphoto/README.txt
+++ b/plugin.image.iphoto/README.txt
@@ -39,5 +39,3 @@ If possible, patch against the most recent version at:
Known Issues
============
* As of 2010/07/21, it's untested under Windows.
-* It is unknown if this plugin will work with Apple's Aperature, because I
- don't own a copy.
diff --git a/plugin.image.iphoto/addon.py b/plugin.image.iphoto/addon.py
index f9337e9..47a379c 100755
--- a/plugin.image.iphoto/addon.py
+++ b/plugin.image.iphoto/addon.py
@@ -41,7 +41,13 @@ def list_photos_in_event(params):
thumbpath = originalpath
if (not caption):
caption = originalpath
- item = gui.ListItem(caption, thumbnailImage=thumbpath)
+
+ # < r34717 doesn't support unicode thumbnail paths
+ try:
+ item = gui.ListItem(caption, thumbnailImage=thumbpath)
+ except:
+ item = gui.ListItem(caption)
+
plugin.addDirectoryItem(handle = int(sys.argv[1]), url=mediapath,
listitem = item, isFolder = False)
n += 1
@@ -63,9 +69,15 @@ def list_events(params):
return
n = 0
- for (rollid, name, thumb, rolldate, count) in rolls:
- item = gui.ListItem(name, thumbnailImage=thumb)
+ for (rollid, name, thumbpath, rolldate, count) in rolls:
+ # < r34717 doesn't support unicode thumbnail paths
+ try:
+ item = gui.ListItem(name, thumbnailImage=thumbpath)
+ except:
+ item = gui.ListItem(name)
+
item.setInfo(type="pictures", infoLabels={ "count": count })
+
plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=events&rollid=%s" % (rollid), listitem = item, isFolder =
True)
n += 1
@@ -80,7 +92,13 @@ def render_media(media):
thumbpath = originalpath
if (not caption):
caption = originalpath
- item = gui.ListItem(caption, thumbnailImage=thumbpath)
+
+ # < r34717 doesn't support unicode thumbnail paths
+ try:
+ item = gui.ListItem(caption, thumbnailImage=thumbpath)
+ except:
+ item = gui.ListItem(caption)
+
plugin.addDirectoryItem(handle = int(sys.argv[1]), url=mediapath,
listitem = item, isFolder = False)
n += 1
diff --git a/plugin.image.iphoto/addon.xml b/plugin.image.iphoto/addon.xml
index 0e0ad6b..430f3c4 100644
--- a/plugin.image.iphoto/addon.xml
+++ b/plugin.image.iphoto/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.image.iphoto" name="iPhoto" version="0.9.8"
provider-name="jingai">
+<addon id="plugin.image.iphoto" name="iPhoto" version="0.9.9"
provider-name="jingai">
<requires>
<import addon="xbmc.python" version="1.0"/>
<import addon="script.module.pysqlite" version="2.5.6"/>
@@ -9,13 +9,13 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <minversion>31632</minversion>
+ <minversion>32324</minversion>
<summary lang="en">Imports iPhoto library into XBMC.</summary>
<summary lang="hu">iPhoto könyvtár importálása az XBMC-be</summary>
<summary lang="pt">Importa bibliotecas iPhoto para o XBMC.</summary>
<description lang="en">Imports iPhoto library into Events, Albums, and
Ratings categories.</description>
<description lang="hu">iPhoto könyvtár importálása az Események,
Albumok és Besorolás kategóriákba.</description>
<description lang="pt">Importa bibliotecas iPhoto para Eventos, Ãlbuns
e Classificações.</description>
- <disclaimer lang="en">Untested under Windows.[CR]Nightlies as of r32150
might not include script.module.pysqlite (see
http://trac.xbmc.org/ticket/9690).[CR]FIXED IN r32324: Import is slower than it
should be (see http://trac.xbmc.org/ticket/9740).</disclaimer>
+ <disclaimer lang="en">[Fixed in SVN r34733] Thumbnail image paths
containing unicode characters will be skipped (see
http://trac.xbmc.org/ticket/10486)</disclaimer>
</extension>
</addon>
diff --git a/plugin.image.iphoto/changelog.txt
b/plugin.image.iphoto/changelog.txt
index 4a757eb..30c2f4f 100644
--- a/plugin.image.iphoto/changelog.txt
+++ b/plugin.image.iphoto/changelog.txt
@@ -1,3 +1,6 @@
+0.9.9 - 20101012
+- Ignore unicode thumbnail paths if they fail to add (SVN < r34733).
+
0.9.8 - 20101008
- Add unicode support.
diff --git a/plugin.image.iphoto/resources/lib/iphoto_parser.py
b/plugin.image.iphoto/resources/lib/iphoto_parser.py
index 9d7831b..be6521d 100755
--- a/plugin.image.iphoto/resources/lib/iphoto_parser.py
+++ b/plugin.image.iphoto/resources/lib/iphoto_parser.py
@@ -301,8 +301,8 @@ class IPhotoDB:
nextid += 1
cur.execute("INSERT INTO %s(id, %s) VALUES (?,?)" % (table,
column),
(nextid, value))
- return nextid # return new artist id
- return row[0] # return artist id
+ return nextid # return new id
+ return row[0] # return id
except Exception, e:
print to_str(e)
raise e
-----------------------------------------------------------------------
Summary of changes:
plugin.image.iphoto/README.txt | 2 -
plugin.image.iphoto/addon.py | 26 ++++++++++++++++---
plugin.image.iphoto/addon.xml | 6 ++--
plugin.image.iphoto/changelog.txt | 3 ++
plugin.image.iphoto/resources/lib/iphoto_parser.py | 4 +-
5 files changed, 30 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
