[Xbmc-addons] Plugins branch, dharma-pre, updated. b9210e11a037e044b6e57ac789f83684273365ff

Tue, 16 Nov 2010 14:05:22 -0800 

The branch, dharma-pre has been updated
       via  b9210e11a037e044b6e57ac789f83684273365ff (commit)
      from  6c28654de0db2f44a7d5b2ff74c81008d38004c3 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b9210e11a037e044b6e57ac789f83684273365ff

commit b9210e11a037e044b6e57ac789f83684273365ff
Author: spiff <[email protected]>
Date:   Tue Nov 16 23:03:43 2010 +0100

    [plugin.image.iphoto] updated to version 1.2.1

diff --git a/plugin.image.iphoto/addon.py b/plugin.image.iphoto/addon.py
index 2113d8b..b7dd5c5 100755
--- a/plugin.image.iphoto/addon.py
+++ b/plugin.image.iphoto/addon.py
@@ -12,19 +12,19 @@ import time
 import os
 import os.path
 
+import xbmc
+import xbmcgui as gui
+import xbmcplugin as plugin
+import xbmcaddon
+
+addon = xbmcaddon.Addon(id="plugin.image.iphoto")
 BASE_URL = "%s" % (sys.argv[0])
-PLUGIN_PATH = xbmc.translatePath(os.getcwd())
+PLUGIN_PATH = addon.getAddonInfo("path")
 RESOURCE_PATH = os.path.join(PLUGIN_PATH, "resources")
 ICONS_PATH = os.path.join(RESOURCE_PATH, "icons")
 LIB_PATH = os.path.join(RESOURCE_PATH, "lib")
 sys.path.append(LIB_PATH)
 
-import xbmc
-import xbmcgui as gui
-import xbmcplugin as plugin
-import xbmcaddon
-addon = xbmcaddon.Addon(id=os.path.basename(os.getcwd()))
-
 from resources.lib.iphoto_parser import *
 db_file = xbmc.translatePath(os.path.join(addon.getAddonInfo("Profile"), 
"iphoto.db"))
 db = IPhotoDB(db_file)
@@ -360,8 +360,11 @@ def add_import_lib_context_item(item):
 if (__name__ == "__main__"):
     xmlfile = addon.getSetting('albumdata_xml_path')
     if (xmlfile == ""):
-       xmlfile = os.getenv("HOME") + "/Pictures/iPhoto Library/AlbumData.xml"
-       addon.setSetting('albumdata_xml_path', xmlfile)
+       try:
+           xmlfile = os.getenv("HOME") + "/Pictures/iPhoto 
Library/AlbumData.xml"
+           addon.setSetting('albumdata_xml_path', xmlfile)
+       except:
+           pass
 
     try:
        params = get_params(sys.argv[2])
diff --git a/plugin.image.iphoto/addon.xml b/plugin.image.iphoto/addon.xml
index 272e025..d34ddaf 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="1.2.0" 
provider-name="jingai">
+<addon id="plugin.image.iphoto" name="iPhoto" version="1.2.1" 
provider-name="jingai">
     <requires>
        <import addon="xbmc.python" version="1.0"/>
        <import addon="script.module.pysqlite" version="2.5.6"/>
@@ -16,6 +16,6 @@
        <description lang="en">Imports iPhoto library into Events, Albums, 
Faces, Keywords, 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">[Fixed in SVN r34733] Thumbnail image paths 
containing unicode characters will be skipped (see 
http://trac.xbmc.org/ticket/10486)</disclaimer>
+       <disclaimer lang="en"></disclaimer>
     </extension>
 </addon>
diff --git a/plugin.image.iphoto/changelog.txt 
b/plugin.image.iphoto/changelog.txt
index 01a1cff..9d6ed82 100644
--- a/plugin.image.iphoto/changelog.txt
+++ b/plugin.image.iphoto/changelog.txt
@@ -1,3 +1,8 @@
+1.2.1 - 20101116
+- Windows: Don't fail if script unconfigured.
+- Disclaimer: iPhoto 9.0+ does work.
+- Hardcode plugin ID.
+
 1.2.0 - 20101021
 - Add Faces support.
 - Add context menu item to hide Keywords.
diff --git a/plugin.image.iphoto/resources/lib/iphoto_parser.py 
b/plugin.image.iphoto/resources/lib/iphoto_parser.py
index 7cc937d..ac75672 100755
--- a/plugin.image.iphoto/resources/lib/iphoto_parser.py
+++ b/plugin.image.iphoto/resources/lib/iphoto_parser.py
@@ -50,8 +50,12 @@ def to_str(text):
 
 class IPhotoDB:
     def __init__(self, dbfile):
-       self.dbconn = sqlite.connect(dbfile)
-       self.InitDB()
+       try:
+           self.dbconn = sqlite.connect(dbfile)
+           self.InitDB()
+       except Exception, e:
+           print to_str(e)
+           pass
        return
 
     def _cleanup_filename(self, filename):

-----------------------------------------------------------------------

Summary of changes:
 plugin.image.iphoto/addon.py                       |   21 +++++++++++--------
 plugin.image.iphoto/addon.xml                      |    4 +-
 plugin.image.iphoto/changelog.txt                  |    5 ++++
 plugin.image.iphoto/resources/lib/iphoto_parser.py |    8 +++++-
 4 files changed, 25 insertions(+), 13 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/msIE9-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to