The branch, eden-pre has been updated
via 9bae00bf5af17c1065ebff937499be202e10a5f2 (commit)
via 598bec027f636977500d9cc359d964b4cc0f8a0d (commit)
from 2a6450ea0b97b2ad26b93a11e0b74b4f4279f080 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9bae00bf5af17c1065ebff937499be202e10a5f2
commit 9bae00bf5af17c1065ebff937499be202e10a5f2
Author: spiff <[email protected]>
Date: Wed Feb 15 12:02:42 2012 +0100
[plugin.video.pakee] updated to version 1.0.4
diff --git a/plugin.video.pakee/addon.xml b/plugin.video.pakee/addon.xml
index 798384a..14225e4 100644
--- a/plugin.video.pakee/addon.xml
+++ b/plugin.video.pakee/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.pakee"
name="Pakee"
- version="1.0.3"
+ version="1.0.4"
provider-name="pakee">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.pakee/changelog.txt b/plugin.video.pakee/changelog.txt
index ab23dfb..8adf626 100644
--- a/plugin.video.pakee/changelog.txt
+++ b/plugin.video.pakee/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.0.4[/B]
+- Added live channel streams from LiveStream's plugins community-links
repository
+- Set default sorting to be by title for drama episodes
+
[B]Version 1.0.3[/B]
- Created new playlist settings for plugin:
@@ -10,6 +14,7 @@
[B]Version 1.0.2[/B]
- Created new setting for plugin: allow user to change sort order to title
across all views
+Note: Since XBMC caches the pages the user has browsed through, users may need
to clear the viewmode caches to see the updated sort order on previously
accessed pages (by rename files under
%AppData%\xbmc\userdata\Database\ViewModes*.db)
[B]Version 1.0.1[/B]
diff --git a/plugin.video.pakee/default.py b/plugin.video.pakee/default.py
index c04dd97..e0c7636 100644
--- a/plugin.video.pakee/default.py
+++ b/plugin.video.pakee/default.py
@@ -9,9 +9,9 @@ __plugin__ = 'Pakee'
__author__ = '[email protected]'
__url__ = 'http://code.google.com/p/pakee/'
__date__ = '01-04-2011'
-__version__ = '1.0.3'
+__version__ = '1.0.4'
__settings__ = xbmcaddon.Addon(id='plugin.video.pakee')
-__rooturl__ = 'http://pakee.hopto.org/pakee/pakee-betaplus.xml'
+__rooturl__ = 'http://pakee.hopto.org/pakee/pakee-xbmc.xml?a=9'
__language__ = __settings__.getLocalizedString
#plugin modes
@@ -25,6 +25,7 @@ PLUGIN_MODE_PLAY_AUDIO = 70
PLUGIN_MODE_PLAY_PLAYLIST = 80
PLUGIN_MODE_PLAY_SLIDESHOW = 90
PLUGIN_MODE_OPEN_SETTINGS = 100
+PLUGIN_MODE_PLAY_STREAM = 110
#view modes
VIEW_THUMB = 500
@@ -65,7 +66,7 @@ def play_youtube_video(video_id, name):
xbmc.Player( xbmc.PLAYER_CORE_DVDPLAYER ).play( str(url), listitem)
#Play a single song
-def play_audio(url, name):
+def play_stream(url, name):
print "playing audio file. name: " + name + " url: " + url
listitem = xbmcgui.ListItem( label = str(name), iconImage =
"DefaultVideo.png", thumbnailImage = xbmc.getInfoImage( "ListItem.Thumb" ),
path=url )
listitem.setInfo( type="video", infoLabels={ "Title": name, "Plot" :
name } )
@@ -215,7 +216,7 @@ def build_show_directory(origurl):
#if weird characters found in label or description, instead of
erroring out, empty their values (empty listitem will be shown)
try:
- xbmc.log('found in show_dir(): ' + clean(str(label)) +
' ' + str(url) + ' ' + str(rating) + ' ' + str(pubDate) + ' ' + str(duration) +
' ' + str(viewcount))
+ xbmc.log('found in show_dir(): ' + clean(str(label)) +
' ' + str(url) + ' ' + str(thumb) + ' ' + str(rating) + ' ' + str(pubDate) + '
' + str(duration) + ' ' + str(viewcount))
except:
label = ''
description = ''
@@ -228,7 +229,7 @@ def build_show_directory(origurl):
#For feeds with videos as their first item, show <play
all> listitem as first listitem
if 'youtube.com' in url or '(Playlist: ' in label:
if itemCount == 0:
- playAll = xbmcgui.ListItem( label =
'<Play all>', iconImage = pakee_thumb, thumbnailImage = pakee_thumb )
+ playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
@@ -249,7 +250,7 @@ def build_show_directory(origurl):
if url[-4:]=='.jpg' or url[-4:]=='.gif' or
url[-4:]=='.png':
#For folders with videos, show play all option
if itemCount == 0:
- playAll = xbmcgui.ListItem( label =
'<Start slideshow>', iconImage = pakee_thumb, thumbnailImage = pakee_thumb )
+ playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30051) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_SLIDESHOW)+"&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
isFolder = False
@@ -260,7 +261,7 @@ def build_show_directory(origurl):
#For feeds with mp3s as their first item, show
<play all> listitem as first listitem
if itemCount == 0:
- playAll = xbmcgui.ListItem( label =
'<Play all>', iconImage = pakee_thumb, thumbnailImage = pakee_thumb )
+ playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
isFolder = False
@@ -275,6 +276,15 @@ def build_show_directory(origurl):
url = origurl
+ if 'rtmp://' in url or 'mms://' in url:
+ isFolder = False
+ mode = PLUGIN_MODE_PLAY_STREAM
+
+ #For feeds with streams as their first item,
show <play all> listitem as first listitem
+ if itemCount == 0:
+ playAll = xbmcgui.ListItem( label = '<'
+ __settings__.getLocalizedString(30050) + '>', iconImage = pakee_thumb,
thumbnailImage = pakee_thumb )
+ xbmcplugin.addDirectoryItem( handle =
int( sys.argv[1] ), url = sys.argv[0] +
"?mode="+str(PLUGIN_MODE_PLAY_PLAYLIST)+"&index=0&name=Playlist&url=" +
urllib.quote_plus(origurl), listitem = playAll, isFolder = True )
+
itemCount=itemCount+1
@@ -375,6 +385,9 @@ def getItemFieldsBS(item):
if item('media:thumbnail'):
thumb = item('media:thumbnail')[0]['url']
+ elif item.thumbnail:
+ thumb = item.thumbnail.string
+
if item('media:content'):
duration = item('media:content')[0]['duration']
@@ -474,6 +487,8 @@ def getItemFields(item):
description = ''
if
item.getElementsByTagNameNS("http://search.yahoo.com/mrss/","thumbnail";):
thumb =
item.getElementsByTagNameNS("http://search.yahoo.com/mrss/","thumbnail";)[0].getAttribute('url')
+ elif item.getElementsByTagName("thumbnail"):
+ thumb =
clean(getText(item.getElementsByTagName("thumbnail")[0].childNodes))
else:
thumb = pakee_thumb
@@ -640,11 +655,13 @@ elif mode == PLUGIN_MODE_BUILD_YT_FAV:
build_ytuser_favs_directory()
elif mode == PLUGIN_MODE_PLAY_AUDIO:
#play_playlist(url, index)
- play_audio(url, name)
+ play_stream(url, name)
elif mode == PLUGIN_MODE_PLAY_PLAYLIST:
play_playlist(url, index)
elif mode == PLUGIN_MODE_PLAY_SLIDESHOW:
play_picture_slideshow(url, name)
+elif mode == PLUGIN_MODE_PLAY_STREAM:
+ play_stream(url, name)
elif mode == PLUGIN_MODE_OPEN_SETTINGS:
open_settings()
diff --git a/plugin.video.pakee/resources/language/English/strings.xml
b/plugin.video.pakee/resources/language/English/strings.xml
index 87a57fe..33e56e0 100644
--- a/plugin.video.pakee/resources/language/English/strings.xml
+++ b/plugin.video.pakee/resources/language/English/strings.xml
@@ -7,6 +7,8 @@
<string id="30022">Single: Play selected video only</string>
<string id="30023">Playlist: Start playlist at selected video</string>
+ <string id="30050">Play all</string>
+
<string id="30100">Default sort order</string>
<string id="30101">Default</string>
<string id="30102">Title</string>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=598bec027f636977500d9cc359d964b4cc0f8a0d
-----------------------------------------------------------------------
Summary of changes:
plugin.video.espn.video/addon.xml | 19 ++
plugin.video.espn.video/changelog.txt | 3 +
plugin.video.espn.video/default.py | 246 ++++++++++++++++++++
plugin.video.espn.video/icon.png | Bin 0 -> 14043 bytes
.../resources/language/English/strings.xml | 18 ++
.../resources/media/categories.png | Bin 19446 -> 19446 bytes
.../resources/media}/history.png | Bin 90968 -> 90968 bytes
.../resources/media/next.png | Bin 23910 -> 23910 bytes
.../resources/media/original.png | Bin 0 -> 37670 bytes
.../resources/media/search.png | Bin 41374 -> 41374 bytes
.../resources/media/tvshows.png | Bin 107413 -> 107413
bytes
plugin.video.espn.video/resources/settings.xml | 4 +
plugin.video.pakee/addon.xml | 2 +-
plugin.video.pakee/changelog.txt | 5 +
plugin.video.pakee/default.py | 33 ++-
.../resources/language/English/strings.xml | 2 +
16 files changed, 323 insertions(+), 9 deletions(-)
create mode 100644 plugin.video.espn.video/addon.xml
create mode 100644 plugin.video.espn.video/changelog.txt
create mode 100644 plugin.video.espn.video/default.py
create mode 100644 plugin.video.espn.video/icon.png
create mode 100644
plugin.video.espn.video/resources/language/English/strings.xml
copy plugin.video.bliptv/thumbnails/subscriptions.png =>
plugin.video.espn.video/resources/media/categories.png (100%)
copy {plugin.video.youtube/thumbnails =>
plugin.video.espn.video/resources/media}/history.png (100%)
copy {plugin.video.g4tv => plugin.video.espn.video}/resources/media/next.png
(100%)
create mode 100644 plugin.video.espn.video/resources/media/original.png
copy {plugin.video.g4tv => plugin.video.espn.video}/resources/media/search.png
(100%)
copy plugin.video.g4tv/resources/media/shows.png =>
plugin.video.espn.video/resources/media/tvshows.png (100%)
create mode 100644 plugin.video.espn.video/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
