The branch, frodo has been updated
via 13c6eb6ec8e7e9077d31fffce15ca059536dcd7f (commit)
from 1830f29ae72787cd53ae41a2417a3f7c7299d75d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=13c6eb6ec8e7e9077d31fffce15ca059536dcd7f
commit 13c6eb6ec8e7e9077d31fffce15ca059536dcd7f
Author: ronie <[email protected]>
Date: Sat Jun 22 13:34:47 2013 +0200
[plugin.image.500px] -v0.2.1
diff --git a/plugin.image.500px/addon.xml b/plugin.image.500px/addon.xml
index 32730ec..927f720 100644
--- a/plugin.image.500px/addon.xml
+++ b/plugin.image.500px/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.image.500px" name="500px" version="0.2.0"
+<addon id="plugin.image.500px" name="500px" version="0.2.1"
provider-name="Patrick L Archibald [[email protected]],
Clément MATHIEU [[email protected]]">
<requires>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/plugin.image.500px/changelog.txt b/plugin.image.500px/changelog.txt
index 983c4ba..0c93e28 100644
--- a/plugin.image.500px/changelog.txt
+++ b/plugin.image.500px/changelog.txt
@@ -1,4 +1,6 @@
-Version 0.2.0 -
+Version 0.2.1 - June 21, 2013
+- Rename module utils to resolve a confict.
+Version 0.2.0 - June 19, 2013
- Export features as directory rather than as a addon setting
- Added python-500px dependency
- Faster image list loading
diff --git a/plugin.image.500px/default.py b/plugin.image.500px/default.py
index 979d4a3..f5ed216 100644
--- a/plugin.image.500px/default.py
+++ b/plugin.image.500px/default.py
@@ -1,6 +1,6 @@
-import utils
-import utils.xbmc
+import fivehundredpxutils
+import fivehundredpxutils.xbmc
import xbmc
import xbmcgui
@@ -9,7 +9,7 @@ import xbmcplugin
from fivehundredpx.client import FiveHundredPXAPI
_CONSUMER_KEY = 'LvUFQHMQgSlaWe3aRQot6Ct5ZC2pdTMyTLS0GMfF'
-_RPP = int(xbmcplugin.getSetting(utils.xbmc.addon_handle, 'rpp'))
+_RPP = int(xbmcplugin.getSetting(fivehundredpxutils.xbmc.addon_handle, 'rpp'))
API = FiveHundredPXAPI()
@@ -24,7 +24,7 @@ class Image(object):
def feature():
- params = utils.xbmc.addon_params
+ params = fivehundredpxutils.xbmc.addon_params
feature = params['feature']
category = params.get('category', None)
page = int(params.get('page', 1))
@@ -32,14 +32,14 @@ def feature():
resp = API.photos(feature=feature, only=category, rpp=_RPP,
consumer_key=_CONSUMER_KEY, image_size=[2, 4], page=page)
for image in map(Image, resp['photos']):
- utils.xbmc.add_image(image)
+ fivehundredpxutils.xbmc.add_image(image)
if resp['current_page'] != resp['total_pages']:
next_page = page + 1
- url = utils.xbmc.encode_child_url('feature', feature=feature,
category=category, page=next_page)
- utils.xbmc.add_dir('Next page', url)
+ url = fivehundredpxutils.xbmc.encode_child_url('feature',
feature=feature, category=category, page=next_page)
+ fivehundredpxutils.xbmc.add_dir('Next page', url)
- utils.xbmc.end_of_directory()
+ fivehundredpxutils.xbmc.end_of_directory()
def search():
@@ -48,7 +48,7 @@ def search():
kb.doModal()
return kb.getText()
- params = utils.xbmc.addon_params
+ params = fivehundredpxutils.xbmc.addon_params
if 'term' not in params:
term = getTerm()
@@ -59,14 +59,14 @@ def search():
resp = API.photos_search(term=term, rpp=_RPP, consumer_key=_CONSUMER_KEY,
image_size=[2, 4], page=page)
for image in map(Image, resp['photos']):
- utils.xbmc.add_image(image)
+ fivehundredpxutils.xbmc.add_image(image)
if resp['current_page'] != resp['total_pages']:
next_page = page + 1
- url = utils.xbmc.encode_child_url('search', term=term, page=next_page)
- utils.xbmc.add_dir('Next page', url)
+ url = fivehundredpxutils.xbmc.encode_child_url('search', term=term,
page=next_page)
+ fivehundredpxutils.xbmc.add_dir('Next page', url)
- utils.xbmc.end_of_directory()
+ fivehundredpxutils.xbmc.end_of_directory()
def features():
@@ -79,13 +79,13 @@ def features():
)
for feature in features:
- url = utils.xbmc.encode_child_url('categories', feature=feature)
- utils.xbmc.add_dir(feature, url)
+ url = fivehundredpxutils.xbmc.encode_child_url('categories',
feature=feature)
+ fivehundredpxutils.xbmc.add_dir(feature, url)
- url = utils.xbmc.encode_child_url('search')
- utils.xbmc.add_dir('Search', url)
+ url = fivehundredpxutils.xbmc.encode_child_url('search')
+ fivehundredpxutils.xbmc.add_dir('Search', url)
- utils.xbmc.end_of_directory()
+ fivehundredpxutils.xbmc.end_of_directory()
def categories():
@@ -120,17 +120,17 @@ def categories():
'Wedding': 25,
}
- params = utils.xbmc.addon_params
+ params = fivehundredpxutils.xbmc.addon_params
feature = params['feature']
- url = utils.xbmc.encode_child_url('feature', feature=feature)
- utils.xbmc.add_dir('All', url)
+ url = fivehundredpxutils.xbmc.encode_child_url('feature', feature=feature)
+ fivehundredpxutils.xbmc.add_dir('All', url)
for category in sorted(categories):
- url = utils.xbmc.encode_child_url('feature', feature=feature,
category=category)
- utils.xbmc.add_dir(category, url)
+ url = fivehundredpxutils.xbmc.encode_child_url('feature',
feature=feature, category=category)
+ fivehundredpxutils.xbmc.add_dir(category, url)
- utils.xbmc.end_of_directory()
+ fivehundredpxutils.xbmc.end_of_directory()
try:
@@ -140,7 +140,7 @@ try:
'search': search,
}
- params = utils.xbmc.addon_params
+ params = fivehundredpxutils.xbmc.addon_params
mode_name = params['mode']
modes[mode_name]()
except KeyError:
-----------------------------------------------------------------------
Summary of changes:
plugin.image.500px/addon.xml | 2 +-
plugin.image.500px/changelog.txt | 4 +-
plugin.image.500px/default.py | 50 ++++++++++----------
.../lib/{utils => fivehundredpxutils}/__init__.py | 0
.../lib/{utils => fivehundredpxutils}/xbmc.py | 0
5 files changed, 29 insertions(+), 27 deletions(-)
rename plugin.image.500px/resources/lib/{utils =>
fivehundredpxutils}/__init__.py (100%)
rename plugin.image.500px/resources/lib/{utils => fivehundredpxutils}/xbmc.py
(100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
