The branch, eden-pre has been updated
via 24d32720a86cb50efb6c1092a62300fa5ef94aba (commit)
from 828271e849dbf7feedaea5e3d9ee90f098c52508 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=24d32720a86cb50efb6c1092a62300fa5ef94aba
commit 24d32720a86cb50efb6c1092a62300fa5ef94aba
Author: spiff <[email protected]>
Date: Wed Jul 6 11:22:43 2011 +0200
[plugin.image.iphoto] updated to version 1.5.2
diff --git a/plugin.image.iphoto/addon.py b/plugin.image.iphoto/addon.py
index b0d219d..5d56888 100644
--- a/plugin.image.iphoto/addon.py
+++ b/plugin.image.iphoto/addon.py
@@ -151,10 +151,8 @@ def list_albums(params):
if (not count and album_ign_empty == "true"):
continue
- item = gui.ListItem(name)
- if (count):
- item.setInfo(type="pictures", infoLabels={ "count": count })
- plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=albums&albumid=%s" % (albumid), listitem = item, isFolder
= True)
+ item = gui.ListItem(name, thumbnailImage="DefaultFolder.png")
+ plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=albums&albumid=%s" % (albumid), listitem = item, isFolder
= True, totalItems = count)
n += 1
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
@@ -198,9 +196,7 @@ def list_events(params):
except:
pass
- if (count):
- 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)
+ plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=events&rollid=%s" % (rollid), listitem = item, isFolder =
True, totalItems = count)
n += 1
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
@@ -238,9 +234,7 @@ def list_faces(params):
item = gui.ListItem(name, thumbnailImage=thumbpath)
- if (count):
- item.setInfo(type="pictures", infoLabels={ "count": count })
- plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=faces&faceid=%s" % (faceid), listitem = item, isFolder =
True)
+ plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=faces&faceid=%s" % (faceid), listitem = item, isFolder =
True, totalItems = count)
n += 1
plugin.addSortMethod(int(sys.argv[1]), plugin.SORT_METHOD_UNSORTED)
@@ -305,9 +299,7 @@ def list_places(params):
if (show_fanart == True and fanartpath):
item.setProperty("Fanart_Image", fanartpath)
- if (count):
- item.setInfo(type="pictures", infoLabels={ "count": count })
- plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=places&placeid=%s" % (placeid), listitem = item, isFolder
= True)
+ plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=places&placeid=%s" % (placeid), listitem = item, isFolder
= True, totalItems = count)
n += 1
if (n > 0):
@@ -347,11 +339,9 @@ def list_keywords(params):
if (not count and album_ign_empty == "true"):
continue
- item = gui.ListItem(name)
+ item = gui.ListItem(name, thumbnailImage="DefaultFolder.png")
item.addContextMenuItems([(addon.getLocalizedString(30214),
"XBMC.RunPlugin(\""+BASE_URL+"?action=hidekeyword&keyword=%s\")" % (name),)])
- if (count):
- item.setInfo(type="pictures", infoLabels={ "count": count })
- plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=keywords&keywordid=%s" % (keywordid), listitem = item,
isFolder = True)
+ plugin.addDirectoryItem(handle = int(sys.argv[1]),
url=BASE_URL+"?action=keywords&keywordid=%s" % (keywordid), listitem = item,
isFolder = True, totalItems = count)
n += 1
if (n > 0):
@@ -515,33 +505,27 @@ if (__name__ == "__main__"):
# main menu
try:
item = gui.ListItem(addon.getLocalizedString(30100),
thumbnailImage=ICONS_PATH+"/events.png")
- item.setInfo(type="pictures", infoLabels={ "title": "Events" })
add_import_lib_context_item(item)
plugin.addDirectoryItem(int(sys.argv[1]),
BASE_URL+"?action=events", item, True)
item = gui.ListItem(addon.getLocalizedString(30101),
thumbnailImage=ICONS_PATH+"/albums.png")
- item.setInfo(type="pictures", infoLabels={ "title": "Albums" })
add_import_lib_context_item(item)
plugin.addDirectoryItem(int(sys.argv[1]),
BASE_URL+"?action=albums", item, True)
item = gui.ListItem(addon.getLocalizedString(30105),
thumbnailImage=ICONS_PATH+"/faces.png")
- item.setInfo(type="pictures", infoLabels={ "title": "Faces" })
add_import_lib_context_item(item)
plugin.addDirectoryItem(int(sys.argv[1]), BASE_URL+"?action=faces",
item, True)
item = gui.ListItem(addon.getLocalizedString(30106),
thumbnailImage=ICONS_PATH+"/places.png")
- item.setInfo(type="pictures", infoLabels={ "title": "Places" })
add_import_lib_context_item(item)
item.addContextMenuItems([(addon.getLocalizedString(30215),
"XBMC.RunPlugin(\""+BASE_URL+"?action=rm_caches\")",)])
plugin.addDirectoryItem(int(sys.argv[1]),
BASE_URL+"?action=places", item, True)
item = gui.ListItem(addon.getLocalizedString(30104),
thumbnailImage=ICONS_PATH+"/keywords.png")
- item.setInfo(type="pictures", infoLabels={ "title": "Keywords" })
add_import_lib_context_item(item)
plugin.addDirectoryItem(int(sys.argv[1]),
BASE_URL+"?action=keywords", item, True)
item = gui.ListItem(addon.getLocalizedString(30102),
thumbnailImage=ICONS_PATH+"/star.png")
- item.setInfo(type="pictures", infoLabels={ "title": "Ratings" })
add_import_lib_context_item(item)
plugin.addDirectoryItem(int(sys.argv[1]),
BASE_URL+"?action=ratings", item, True)
diff --git a/plugin.image.iphoto/addon.xml b/plugin.image.iphoto/addon.xml
index f6669b2..1a92b1e 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.5.1"
provider-name="jingai">
+<addon id="plugin.image.iphoto" name="iPhoto" version="1.5.2"
provider-name="jingai">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/plugin.image.iphoto/changelog.txt
b/plugin.image.iphoto/changelog.txt
index 67542f4..c11832b 100644
--- a/plugin.image.iphoto/changelog.txt
+++ b/plugin.image.iphoto/changelog.txt
@@ -1,3 +1,6 @@
+1.5.2 - 20110705
+- Don't show empty events.
+
1.5.1 - 20110511
- Use xbmcvfs to access iPhoto XML.
diff --git a/plugin.image.iphoto/resources/lib/iphoto_parser.py
b/plugin.image.iphoto/resources/lib/iphoto_parser.py
index 22dd9c4..c7ace2d 100644
--- a/plugin.image.iphoto/resources/lib/iphoto_parser.py
+++ b/plugin.image.iphoto/resources/lib/iphoto_parser.py
@@ -357,7 +357,7 @@ class IPhotoDB:
try:
cur = self.dbconn.cursor()
cur.execute("""SELECT R.id, R.name, M.thumbpath, R.rolldate,
R.photocount
- FROM rolls R LEFT JOIN media M ON R.keyphotoid =
M.id""")
+ FROM rolls R LEFT JOIN media M ON R.keyphotoid = M.id
WHERE R.keyphotoid != 0""")
for tuple in cur:
rolls.append(tuple)
cur.close()
-----------------------------------------------------------------------
Summary of changes:
plugin.image.iphoto/addon.py | 30 ++++---------------
plugin.image.iphoto/addon.xml | 2 +-
plugin.image.iphoto/changelog.txt | 3 ++
plugin.image.iphoto/resources/lib/iphoto_parser.py | 2 +-
4 files changed, 12 insertions(+), 25 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
