The branch, dharma-pre has been updated
via c4b278096f50569283d74d8108b17e27fb8d2c71 (commit)
via b909eac24b7f21604da858823f40e81d529f131c (commit)
from 49036625757c867b4cc79dda22105d4191dd81e9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c4b278096f50569283d74d8108b17e27fb8d2c71
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b909eac24b7f21604da858823f40e81d529f131c
commit b909eac24b7f21604da858823f40e81d529f131c
Author: spiff <[email protected]>
Date: Fri Oct 29 09:05:01 2010 +0200
[plugin.audio.soundcloud] updated to version 0.1.4
diff --git a/plugin.audio.soundcloud/addon.xml
b/plugin.audio.soundcloud/addon.xml
index fb9d253..1203ac4 100644
--- a/plugin.audio.soundcloud/addon.xml
+++ b/plugin.audio.soundcloud/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.soundcloud"
name="SoundCloud"
- version="0.1.3"
+ version="0.1.4"
provider-name="Zsolt Török">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.audio.soundcloud/xbmcsc/client.py
b/plugin.audio.soundcloud/xbmcsc/client.py
index b92f7af..b12379d 100644
--- a/plugin.audio.soundcloud/xbmcsc/client.py
+++ b/plugin.audio.soundcloud/xbmcsc/client.py
@@ -87,15 +87,18 @@ class SoundCloudClient(object):
def get_track(self, permalink):
''' Return a track from SoundCloud based on the permalink. '''
- url = self.build_track_query_url(permalink)
+ url = self.build_track_query_url(permalink,
parameters={QUERY_CONSUMER_KEY: CONSUMER_KEY})
+ print 'track query url: ' + url
h = httplib2.Http()
resp, content = h.request(url, 'GET')
json_content = json.loads(content)
+ print 'track query response JSON: ' + str(json_content)
if TRACK_ARTWORK_URL in json_content and
json_content[TRACK_ARTWORK_URL]:
thumbnail_url = json_content[TRACK_ARTWORK_URL]
else:
thumbnail_url = json_content[TRACK_USER].get(USER_AVATAR_URL)
- return { TRACK_STREAM_URL: json_content[TRACK_STREAM_URL],
TRACK_TITLE: json_content[TRACK_TITLE], TRACK_ARTWORK_URL: thumbnail_url,
TRACK_GENRE: json_content[TRACK_GENRE] }
+ track_stream_url_with_consumer_key = '%s?%s' %
(json_content[TRACK_STREAM_URL], str(urllib.urlencode({QUERY_CONSUMER_KEY:
CONSUMER_KEY})))
+ return { TRACK_STREAM_URL: track_stream_url_with_consumer_key,
TRACK_TITLE: json_content[TRACK_TITLE], TRACK_ARTWORK_URL: thumbnail_url,
TRACK_GENRE: json_content[TRACK_GENRE] }
def get_group_tracks(self, offset, limit, mode, plugin_url, group_id):
''' Return a list of tracks belonging to the given group, based on the
specified parameters. '''
@@ -143,8 +146,8 @@ class SoundCloudClient(object):
url = '%s%s.%s?%s' % (base, resource_type, format,
str(urllib.urlencode(parameters)))
return url
- def build_track_query_url(self, permalink,
base="http://api.soundcloud.com/", format="json"):
- url = '%stracks/%s.%s' % (base, permalink, format)
+ def build_track_query_url(self, permalink, parameters,
base="http://api.soundcloud.com/", format="json"):
+ url = '%stracks/%s.%s?%s' % (base, permalink, format,
str(urllib.urlencode(parameters)))
return url
def build_groups_query_url(self, group_id, resource_type, parameters,
base="http://api.soundcloud.com/", format="json"):
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.soundcloud/addon.xml | 2 +-
plugin.audio.soundcloud/changelog.txt | 2 +
plugin.audio.soundcloud/xbmcsc/client.py | 11 +-
plugin.games.xbmame/LICENSE.txt | 470 ++++++++++++++++++++
plugin.games.xbmame/addon.xml | 22 +
plugin.games.xbmame/icon.png | Bin 0 -> 91295 bytes
.../resources/language/English/strings.xml | 97 ++++
plugin.games.xbmame/resources/lib/XBMame.py | 468 +++++++++++++++++++
plugin.games.xbmame/resources/lib/obj/DBHelper.py | 98 ++++
plugin.games.xbmame/resources/lib/obj/DIPSwitch.py | 71 +++
plugin.games.xbmame/resources/lib/obj/GameItem.py | 115 +++++
plugin.games.xbmame/resources/lib/obj/XMLHelper.py | 35 ++
plugin.games.xbmame/resources/media/all.png | Bin 0 -> 7019 bytes
plugin.games.xbmame/resources/media/bios.png | Bin 0 -> 15262 bytes
plugin.games.xbmame/resources/media/hdd.png | Bin 0 -> 12050 bytes
plugin.games.xbmame/resources/media/manu.png | Bin 0 -> 17677 bytes
plugin.games.xbmame/resources/media/text.png | Bin 0 -> 16326 bytes
plugin.games.xbmame/resources/media/year.png | Bin 0 -> 19422 bytes
.../resources/media/zoom-original.png | Bin 0 -> 18657 bytes
plugin.games.xbmame/resources/settings.xml | 39 ++
plugin.games.xbmame/xbmame.py | 26 ++
21 files changed, 1451 insertions(+), 5 deletions(-)
create mode 100644 plugin.audio.soundcloud/changelog.txt
create mode 100644 plugin.games.xbmame/LICENSE.txt
create mode 100644 plugin.games.xbmame/addon.xml
create mode 100644 plugin.games.xbmame/icon.png
create mode 100644 plugin.games.xbmame/resources/language/English/strings.xml
create mode 100644 plugin.games.xbmame/resources/lib/XBMame.py
create mode 100644 plugin.games.xbmame/resources/lib/obj/DBHelper.py
create mode 100644 plugin.games.xbmame/resources/lib/obj/DIPSwitch.py
create mode 100644 plugin.games.xbmame/resources/lib/obj/GameItem.py
create mode 100644 plugin.games.xbmame/resources/lib/obj/XMLHelper.py
create mode 100644 plugin.games.xbmame/resources/media/all.png
create mode 100644 plugin.games.xbmame/resources/media/bios.png
create mode 100644 plugin.games.xbmame/resources/media/hdd.png
create mode 100644 plugin.games.xbmame/resources/media/manu.png
create mode 100644 plugin.games.xbmame/resources/media/text.png
create mode 100644 plugin.games.xbmame/resources/media/year.png
create mode 100644 plugin.games.xbmame/resources/media/zoom-original.png
create mode 100644 plugin.games.xbmame/resources/settings.xml
create mode 100644 plugin.games.xbmame/xbmame.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons