The branch, dharma has been updated
via 35e250fc5ad3180430b9a8de1e13ff02d2577f13 (commit)
via 885b1c6dfff2bad2e63522a9beb3c3997d235668 (commit)
from a5a87be37e4b35e2c08c8e20f249acf53f8827fc (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=35e250fc5ad3180430b9a8de1e13ff02d2577f13
commit 35e250fc5ad3180430b9a8de1e13ff02d2577f13
Author: spiff <[email protected]>
Date: Wed Jul 6 11:26:40 2011 +0200
[plugin.audio.dr.dk.netradio] updated to version 1.1.1
diff --git a/.gitignore b/.gitignore
index 0667685..13e27d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ plugin.video.aljazeera/.git
plugin.video.aljazeera/.gitignore
plugin.video.dr.dk.podcast/.git
plugin.video.dr.dk.podcast/.idea
+plugin.audio.dr.dk.netradio/.git
diff --git a/plugin.audio.dr.dk.netradio/addon.py
b/plugin.audio.dr.dk.netradio/addon.py
index 5706396..7559ea2 100644
--- a/plugin.audio.dr.dk.netradio/addon.py
+++ b/plugin.audio.dr.dk.netradio/addon.py
@@ -21,7 +21,11 @@ def showChannels():
item.setInfo(type = 'audio', infoLabels = {
'title' : channel['title']
})
- xbmcplugin.addDirectoryItem(HANDLE, channel['mediaFile'], item)
+
+ if type(channel['mediaFile']) is list:
+ xbmcplugin.addDirectoryItem(HANDLE, channel['mediaFile'][0], item)
+ else:
+ xbmcplugin.addDirectoryItem(HANDLE, channel['mediaFile'], item)
xbmcplugin.endOfDirectory(HANDLE)
diff --git a/plugin.audio.dr.dk.netradio/addon.xml
b/plugin.audio.dr.dk.netradio/addon.xml
index 1d14217..a75223d 100644
--- a/plugin.audio.dr.dk.netradio/addon.xml
+++ b/plugin.audio.dr.dk.netradio/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.audio.dr.dk.netradio"
- version="1.1.0"
+ version="1.1.1"
name="DR.dk Netradio"
provider-name="stemann [[email protected]], twinther [[email protected]]">
<requires>
diff --git a/plugin.audio.dr.dk.netradio/changelog.txt
b/plugin.audio.dr.dk.netradio/changelog.txt
index 551f7c5..691c702 100644
--- a/plugin.audio.dr.dk.netradio/changelog.txt
+++ b/plugin.audio.dr.dk.netradio/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 1.1.1[/B]
+- Updated to match changes in RTMP links
+
[B]Version 1.1.0[/B]
- Dynamically load AAC channels, they are no longer hardcoded.
- Removed support for old low quality WMA channels
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=885b1c6dfff2bad2e63522a9beb3c3997d235668
commit 885b1c6dfff2bad2e63522a9beb3c3997d235668
Author: spiff <[email protected]>
Date: Wed Jul 6 11:23:51 2011 +0200
[plugin.image.iphoto] updated to version 1.4.6
diff --git a/plugin.image.iphoto/addon.py b/plugin.image.iphoto/addon.py
index 4c214da..412778c 100644
--- a/plugin.image.iphoto/addon.py
+++ b/plugin.image.iphoto/addon.py
@@ -157,10 +157,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)
@@ -204,9 +202,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)
@@ -244,9 +240,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)
@@ -311,9 +305,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):
@@ -353,11 +345,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):
@@ -521,33 +511,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 ee7cc12..bd0d4f3 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.4.5"
provider-name="jingai">
+<addon id="plugin.image.iphoto" name="iPhoto" version="1.4.6"
provider-name="jingai">
<requires>
<import addon="xbmc.python" version="1.0"/>
<import addon="script.module.pysqlite" version="2.5.6"/>
diff --git a/plugin.image.iphoto/changelog.txt
b/plugin.image.iphoto/changelog.txt
index 7c9b98b..07dcc35 100644
--- a/plugin.image.iphoto/changelog.txt
+++ b/plugin.image.iphoto/changelog.txt
@@ -1,3 +1,6 @@
+1.4.6 - 20110705
+- Don't show empty events.
+
1.4.5 - 20110511
- Replace with statement with while loop for Python 2.4.
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:
.gitignore | 1 +
plugin.audio.dr.dk.netradio/addon.py | 6 ++-
plugin.audio.dr.dk.netradio/addon.xml | 2 +-
plugin.audio.dr.dk.netradio/changelog.txt | 3 +
.../resources/language/Danish/strings.xml | 6 --
.../resources/language/English/strings.xml | 69 --------------------
plugin.audio.dr.dk.netradio/resources/settings.xml | 8 --
plugin.audio.dr.dk.netradio/test.py | 69 --------------------
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 +-
12 files changed, 22 insertions(+), 179 deletions(-)
delete mode 100644
plugin.audio.dr.dk.netradio/resources/language/Danish/strings.xml
delete mode 100644
plugin.audio.dr.dk.netradio/resources/language/English/strings.xml
delete mode 100644 plugin.audio.dr.dk.netradio/resources/settings.xml
delete mode 100644 plugin.audio.dr.dk.netradio/test.py
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
