The branch, dharma has been updated
via cc088c7f48ddf8b8e1b2e228f79fcaae4871141f (commit)
via 8659f1018acebc8240f9cf58bacffee46dd911a2 (commit)
from 986dd7454e824d3b3b01fd74aee7bf74e317b5c4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=cc088c7f48ddf8b8e1b2e228f79fcaae4871141f
commit cc088c7f48ddf8b8e1b2e228f79fcaae4871141f
Author: spiff <[email protected]>
Date: Tue Feb 8 22:46:10 2011 +0100
[plugin.video.revision3] updated to version 1.0.6
diff --git a/plugin.video.revision3/addon.xml b/plugin.video.revision3/addon.xml
index ec2deae..04c93c9 100644
--- a/plugin.video.revision3/addon.xml
+++ b/plugin.video.revision3/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.revision3"
name="Revision3"
- version="1.0.5"
+ version="1.0.6"
provider-name="stacked">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.revision3/changelog.txt
b/plugin.video.revision3/changelog.txt
index eee8c5f..8405552 100644
--- a/plugin.video.revision3/changelog.txt
+++ b/plugin.video.revision3/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.0.6[/B]
+
+- Updated Video formats
+
[B]Version 1.0.5[/B]
- Cleaned up info labels
diff --git a/plugin.video.revision3/default.py
b/plugin.video.revision3/default.py
index ebfff6e..af6eb70 100644
--- a/plugin.video.revision3/default.py
+++ b/plugin.video.revision3/default.py
@@ -4,8 +4,8 @@ import xbmc, xbmcgui, xbmcplugin, urllib2, urllib, re, string,
sys, os, tracebac
__plugin__ = 'Revision3'
__author__ = 'stacked <[email protected]>'
__url__ = 'http://code.google.com/p/plugin/'
-__date__ = '01-17-2011'
-__version__ = '1.0.5'
+__date__ = '02-08-2011'
+__version__ = '1.0.6'
__settings__ = xbmcaddon.Addon(id='plugin.video.revision3')
def open_url(url):
@@ -16,7 +16,7 @@ def open_url(url):
return data
def build_main_directory():
- quality = __settings__.getSetting('format')
+ quality = __settings__.getSetting('type')
url = 'http://revision3.com/shows/'
data = open_url(url)
match = re.compile('<ul id="shows">(.+?)<div id="footer"
class="clear">', re.DOTALL).findall(data)
@@ -29,6 +29,8 @@ def build_main_directory():
u = sys.argv[0] + "?mode=1&name=" + urllib.quote_plus(name) +
"&url=" + urllib.quote_plus(url)
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = True)
count += 1
+ xbmcplugin.addSortMethod( handle = int(sys.argv[ 1 ]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
+ xbmcplugin.endOfDirectory(int(sys.argv[1]))
def build_sub_directory(url, name):
genre = name
@@ -52,6 +54,7 @@ def build_sub_directory(url, name):
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = False)
count += 1
xbmcplugin.addSortMethod( handle = int(sys.argv[ 1 ]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
+ xbmcplugin.endOfDirectory(int(sys.argv[1]))
def clean(name):
remove = [('&','&'), ('"','"'), (''','\''), ('\r\n',''),
(''','\'')]
@@ -122,6 +125,3 @@ elif mode == 1:
build_sub_directory(url, name)
elif mode == 2:
play_video(url, name, plot, genre, episode)
-
-xbmcplugin.addSortMethod( handle = int(sys.argv[ 1 ]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
-xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.revision3/resources/language/English/strings.xml
b/plugin.video.revision3/resources/language/English/strings.xml
index 762e745..f7f376e 100644
--- a/plugin.video.revision3/resources/language/English/strings.xml
+++ b/plugin.video.revision3/resources/language/English/strings.xml
@@ -3,11 +3,8 @@
<string id="30000">Video Quality (Restart Required)</string>
<string id="30001">It appears there are no episodes available in
the</string>
<string id="30002"> format. Change the quality settings.</string>
- <string id="30003">quicktime-high-definition</string>
- <string id="30004">quicktime-large</string>
- <string id="30005">quicktime-small</string>
- <string id="30006">wmv-large</string>
- <string id="30007">wmv-small</string>
- <string id="30008">xvid-large</string>
- <string id="30009">xvid-small</string>
+ <string id="30003">MP4-HD30</string>
+ <string id="30004">MP4-Large</string>
+ <string id="30005">MP4-Small</string>
+ <string id="30006">WMV-Large</string>
</strings>
diff --git a/plugin.video.revision3/resources/language/Finnish/strings.xml
b/plugin.video.revision3/resources/language/Finnish/strings.xml
index 0059a34..40ad631 100644
--- a/plugin.video.revision3/resources/language/Finnish/strings.xml
+++ b/plugin.video.revision3/resources/language/Finnish/strings.xml
@@ -3,11 +3,8 @@
<string id="30000">Videolaatu (Käynnistä lisäke uudelleen)</string>
<string id="30001">Näyttää siltä, ei ole jaksoja saatavilla</string>
<string id="30002"> muodossa. Muuta laatu asetuksia.</string>
- <string id="30003">quicktime-high-definition</string>
- <string id="30004">quicktime-large</string>
- <string id="30005">quicktime-small</string>
- <string id="30006">wmv-large</string>
- <string id="30007">wmv-small</string>
- <string id="30008">xvid-large</string>
- <string id="30009">xvid-small</string>
+ <string id="30003">MP4-HD30</string>
+ <string id="30004">MP4-Large</string>
+ <string id="30005">MP4-Small</string>
+ <string id="30006">WMV-Large</string>
</strings>
diff --git a/plugin.video.revision3/resources/language/Hungarian/strings.xml
b/plugin.video.revision3/resources/language/Hungarian/strings.xml
index 56f30e8..128ad0f 100644
--- a/plugin.video.revision3/resources/language/Hungarian/strings.xml
+++ b/plugin.video.revision3/resources/language/Hungarian/strings.xml
@@ -3,11 +3,8 @@
<string id="30000">MinÅség (újraindÃtás szükséges)</string>
<string id="30001">Ãgy tűnik nincs epizód ebben a formátumban.</string>
<string id="30002">Változtass a minÅségi beállÃtásokon.</string>
- <string id="30003">quicktime-high-definition</string>
- <string id="30004">quicktime-large</string>
- <string id="30005">quicktime-small</string>
- <string id="30006">wmv-large</string>
- <string id="30007">wmv-small</string>
- <string id="30008">xvid-large</string>
- <string id="30009">xvid-small</string>
+ <string id="30003">MP4-HD30</string>
+ <string id="30004">MP4-Large</string>
+ <string id="30005">MP4-Small</string>
+ <string id="30006">WMV-Large</string>
</strings>
diff --git a/plugin.video.revision3/resources/language/Swedish/strings.xml
b/plugin.video.revision3/resources/language/Swedish/strings.xml
index d7e27f8..649a495 100644
--- a/plugin.video.revision3/resources/language/Swedish/strings.xml
+++ b/plugin.video.revision3/resources/language/Swedish/strings.xml
@@ -3,11 +3,8 @@
<string id="30000">Videokvalitet (omstart krävs)</string>
<string id="30001">Det verkar inte finns några episoder finns i</string>
<string id="30002"> format. Ãndra kvalitet inställningar.</string>
- <string id="30003">quicktime-high-definition</string>
- <string id="30004">quicktime-large</string>
- <string id="30005">quicktime-small</string>
- <string id="30006">wmv-large</string>
- <string id="30007">wmv-small</string>
- <string id="30008">xvid-large</string>
- <string id="30009">xvid-small</string>
+ <string id="30003">MP4-HD30</string>
+ <string id="30004">MP4-Large</string>
+ <string id="30005">MP4-Small</string>
+ <string id="30006">WMV-Large</string>
</strings>
diff --git a/plugin.video.revision3/resources/settings.xml
b/plugin.video.revision3/resources/settings.xml
index 9e1ecf2..a8aa46c 100644
--- a/plugin.video.revision3/resources/settings.xml
+++ b/plugin.video.revision3/resources/settings.xml
@@ -1,3 +1,3 @@
<settings>
- <setting id="format" type="select"
lvalues="30003|30004|30005|30006|30007|30008|30009" label="30000"
default="quicktime-high-definition"/>
+ <setting id="type" type="select" lvalues="30003|30004|30005|30006"
label="30000" default="MP4-HD30"/>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8659f1018acebc8240f9cf58bacffee46dd911a2
commit 8659f1018acebc8240f9cf58bacffee46dd911a2
Author: spiff <[email protected]>
Date: Tue Feb 8 22:45:18 2011 +0100
[plugin.video.pbs] updated to version 1.0.3
diff --git a/.gitignore b/.gitignore
index bf9c7ef..59ec451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ plugin.video.raiclick/.git
plugin.audio.relive/.git
plugin.audio.modland/.git
plugin.video.svtplay/.git
+plugin.video.pbs/.git
diff --git a/plugin.video.pbs/addon.xml b/plugin.video.pbs/addon.xml
index 7f74d74..08f4e5b 100644
--- a/plugin.video.pbs/addon.xml
+++ b/plugin.video.pbs/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.pbs"
name="PBS"
- version="1.0.2"
+ version="1.0.3"
provider-name="stacked">
<requires>
<import addon="xbmc.python" version="1.0"/>
@@ -14,5 +14,6 @@
<summary>PBS: Discover award-winning programming â right at your
fingertips.</summary>
<description>Watch award-winning national programming and locally produced
shows. Catch up on the episodes you may have missed and watch your favorite,
full-length shows free and on-demand.</description>
<platform>all</platform>
+ <disclaimer>Some videos may not play. Please record any videos not
playing, save the xbmc debug log, and email [email protected].</disclaimer>
</extension>
</addon>
diff --git a/plugin.video.pbs/changelog.txt b/plugin.video.pbs/changelog.txt
index 4c522e9..c3887f3 100644
--- a/plugin.video.pbs/changelog.txt
+++ b/plugin.video.pbs/changelog.txt
@@ -1,3 +1,10 @@
+[B]Version 1.0.3[/B]
+
+- Added duration to the video listings
+- Fixed video summary issue under the search menu
+- Added support for HTTP 404 and HTTP 503 errors
+- Video clips now start at the appropriate time
+
[B]Version 1.0.2[/B]
- Fixed play back error
diff --git a/plugin.video.pbs/default.py b/plugin.video.pbs/default.py
index 84fc25e..2b9fff1 100644
--- a/plugin.video.pbs/default.py
+++ b/plugin.video.pbs/default.py
@@ -1,12 +1,13 @@
import xbmc, xbmcgui, xbmcplugin, urllib2, urllib, re, string, sys, os,
traceback, time, xbmcaddon
from urllib2 import Request, urlopen, URLError, HTTPError
+import datetime
__plugin__ = "PBS"
__author__ = 'stacked <[email protected]>'
__url__ = 'http://code.google.com/p/plugin/'
-__date__ = '01-11-2011'
-__version__ = '1.0.2'
+__date__ = '02-08-2011'
+__version__ = '1.0.3'
__settings__ = xbmcaddon.Addon( id = 'plugin.video.pbs' )
programs_thumb = os.path.join( __settings__.getAddonInfo( 'path' ),
'resources', 'media', 'programs.png' )
@@ -14,10 +15,10 @@ topics_thumb = os.path.join( __settings__.getAddonInfo(
'path' ), 'resources', '
collections_thumb = os.path.join( __settings__.getAddonInfo( 'path' ),
'resources', 'media', 'collections.png' )
search_thumb = os.path.join( __settings__.getAddonInfo( 'path' ), 'resources',
'media', 'search.png' )
next_thumb = os.path.join( __settings__.getAddonInfo( 'path' ), 'resources',
'media', 'next.png' )
-
+
def open_url( url ):
retries = 0
- while retries < 3:
+ while retries < 4:
try:
req = urllib2.Request( url )
content = urllib2.urlopen( req )
@@ -26,13 +27,9 @@ def open_url( url ):
return data
except HTTPError,e:
print 'PBS - Error code: ', e.code
- if e.code == 503:
- dialog = xbmcgui.Dialog()
- ok = dialog.ok( __plugin__ , 'HTTP Error 503.
Please try again.' )
- return "data"
if e.code == 404:
dialog = xbmcgui.Dialog()
- ok = dialog.ok( __plugin__ , 'HTTP Error 404.
Page not found.' )
+ ok = dialog.ok( __plugin__ ,
__settings__.getLocalizedString( 30006 ) + '\n' +
__settings__.getLocalizedString( 30007 ) )
build_main_directory()
return "data"
retries += 1
@@ -41,7 +38,9 @@ def open_url( url ):
else:
break
else:
- print 'PBS - Fetch of ' + url + ' failed after ' + str( retries
) + 'tries.'
+ print 'PBS - Fetch of ' + url + ' failed after ' + str( retries
) + ' tries.'
+ build_main_directory()
+ return "data"
def clean( string ):
list = [( '&', '&' ), ( '"', '"' ), ( ''', '\'' ), (
'\n',' ' ), ( '\r', ' '), ( '\t', ' '), ( '</p>', '' )]
@@ -138,7 +137,8 @@ def build_search_directory( url, page ):
programs_info = re.compile( '<div class="program_description">
<p>(.+?)</div>' ).findall( data )
video_count = re.compile( '<span class="resultnum">(.+?) Video
Results</span>' ).findall( data )[0]
id_title = re.compile( '<p class="info">(.*?)<a
href="http://video.pbs.org/video/(.+?)/(\?starttime=(.*?))?" class="title"
title="(.+?)">(.+?)</a>', re.DOTALL ).findall( video_data )
- info = re.compile( '<span class="list">(.*?)</span>', re.DOTALL
).findall( video_data )[0]
+ info = re.compile( '<span class="list">(.*?)</span>', re.DOTALL
).findall( video_data )
+ duration = re.compile( '<span class="time">\((.*?)\)</span>' ).findall(
video_data )
thumb = re.compile('<img src="(.+?)" alt="(.+?)" />').findall(
video_data )
item_count = 0
if len( programs_id_title ) > 0:
@@ -150,13 +150,13 @@ def build_search_directory( url, page ):
ok = xbmcplugin.addDirectoryItem( handle = int(
sys.argv[1] ), url = u, listitem = listitem, isFolder = True )
item_count += 1
item_count = 0
- for trash1, id, trash2, trash3, trash4, title in id_title:
+ for trash1, id, trash2, starttime, trash4, title in id_title:
url = 'http://video.pbs.org/xbmc/' + id
studio = clean(title).rsplit(' | ',2)[0]
name = clean(title).replace(studio+' | ','')
- listitem = xbmcgui.ListItem( label = name, iconImage =
thumb[item_count][0], thumbnailImage = thumb[item_count][0] )
- listitem.setInfo( type="Video", infoLabels={ "Title": name ,
"Director": "PBS", "Studio": studio, "Plot": clean( info ) } )
- u = sys.argv[0] + "?mode=5&name=" + urllib.quote_plus( name ) +
"&url=" + urllib.quote_plus( url ) + "&thumb=" + urllib.quote_plus(
thumb[item_count][0] ) + "&plot=" + urllib.quote_plus( clean( info ) ) +
"&studio=" + urllib.quote_plus( studio )
+ listitem = xbmcgui.ListItem( label = name, iconImage = clean(
thumb[item_count][0] ), thumbnailImage = clean( thumb[item_count][0] ) )
+ listitem.setInfo( type="Video", infoLabels={ "Title": name ,
"Director": "PBS", "Studio": studio, "Plot": clean( info[item_count] ),
"Duration": duration[item_count] } )
+ u = sys.argv[0] + "?mode=5&name=" + urllib.quote_plus( name ) +
"&url=" + urllib.quote_plus( url ) + "&thumb=" + urllib.quote_plus( clean(
thumb[item_count][0] ) ) + "&plot=" + urllib.quote_plus( clean(
info[item_count] ) ) + "&studio=" + urllib.quote_plus( studio ) + "&starttime="
+ urllib.quote_plus( starttime )
ok = xbmcplugin.addDirectoryItem( handle = int( sys.argv[1] ),
url = u, listitem = listitem, isFolder = False )
item_count += 1
if ( int( video_count ) - ( 10 * int( page ) ) ) > 10:
@@ -168,22 +168,22 @@ def build_search_directory( url, page ):
def find_videos( url ):
data = open_url( url )
- title_id_info = re.compile(
'<item><title>(.+?)</title><link>http://(.+?)/video/(.+?)/</link><description>(.+?)</description>'
).findall( data )
- thumb = re.compile( '<media:thumbnail url="(.+?)" type' ).findall( data
)
+ title_id_info = re.compile(
'<item><title>(.+?)</title><link>http://(.+?)/video/(.+?)/</link><description>(.+?)</description>',
re.DOTALL ).findall( data )
+ duration_thumb = re.compile( 'duration="(.*?)" /><media:thumbnail
url="(.*?)" type' ).findall( data )
item_count = 0
for title, trash, id, info in title_id_info:
url = 'http://video.pbs.org/xbmc/' + id
studio = clean( title ).rsplit( ' | ', 2 )[0]
name = clean( title ).replace( studio + ' | ', '' )
- listitem = xbmcgui.ListItem( label = name, iconImage =
thumb[item_count], thumbnailImage = thumb[item_count] )
- listitem.setInfo( type="Video", infoLabels={ "Title": name,
"Director": "PBS", "Studio": studio, "Plot": clean( info ) } )
- u = sys.argv[0] + "?mode=5&name=" + urllib.quote_plus( name ) +
"&url=" + urllib.quote_plus( url ) + "&thumb=" + urllib.quote_plus(
thumb[item_count] ) + "&plot=" + urllib.quote_plus( clean( info ) ) +
"&studio=" + urllib.quote_plus( studio )
+ listitem = xbmcgui.ListItem( label = name, iconImage =
duration_thumb[item_count][1], thumbnailImage = duration_thumb[item_count][1] )
+ listitem.setInfo( type="Video", infoLabels={ "Title": name,
"Director": "PBS", "Studio": studio, "Plot": clean( info ), "Duration":
str(datetime.timedelta(milliseconds=int(duration_thumb[item_count][0]))) } )
+ u = sys.argv[0] + "?mode=5&name=" + urllib.quote_plus( name ) +
"&url=" + urllib.quote_plus( url ) + "&thumb=" + urllib.quote_plus(
duration_thumb[item_count][1] ) + "&plot=" + urllib.quote_plus( clean( info ) )
+ "&studio=" + urllib.quote_plus( studio )
ok = xbmcplugin.addDirectoryItem( handle = int( sys.argv[1] ),
url = u, listitem = listitem, isFolder = False )
item_count += 1
xbmcplugin.addSortMethod( handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_NONE )
xbmcplugin.endOfDirectory( int( sys.argv[1] ) )
-def play_video( name, url, thumb, plot, studio ):
+def play_video( name, url, thumb, plot, studio, starttime ):
data = open_url( url )
id = re.compile(
'http%3A//release.theplatform.com/content.select%3Fpid%3D(.+?)%26UserName'
).findall( data )[0]
url = 'http://release.theplatform.com/content.select?pid=' + id +
'&format=SMIL'
@@ -199,7 +199,13 @@ def play_video( name, url, thumb, plot, studio ):
playpath = src
item = xbmcgui.ListItem( label = name, iconImage = "DefaultVideo.png",
thumbnailImage = thumb )
item.setInfo( type="Video", infoLabels={ "Title": name , "Director":
"PBS", "Studio": "PBS: " + studio, "Plot": plot } )
- xbmc.Player( xbmc.PLAYER_CORE_DVDPLAYER ).play( rtmp_url, item )
+ xbmc.Player( xbmc.PLAYER_CORE_DVDPLAYER ).play( clean( rtmp_url ), item
)
+ if starttime != None:
+ while( 1 ):
+ if xbmc.Player().isPlayingVideo():
+ xbmc.sleep( 50 )
+ xbmc.Player( xbmc.PLAYER_CORE_DVDPLAYER
).seekTime( int( starttime ) / 1000 )
+ break
def get_params():
param = []
@@ -219,6 +225,7 @@ def get_params():
return param
params = get_params()
+starttime = None
mode = None
name = None
url = None
@@ -255,6 +262,10 @@ try:
studio = urllib.unquote_plus( params["studio"] )
except:
pass
+try:
+ starttime = int( params["starttime"] )
+except:
+ pass
if mode == None:
build_main_directory()
@@ -269,6 +280,6 @@ elif mode == 3:
elif mode == 4:
build_search_keyboard()
elif mode == 5:
- play_video( name, url, thumb, plot, studio )
+ play_video( name, url, thumb, plot, studio, starttime )
elif mode == 6:
build_search_directory( url, page )
diff --git a/plugin.video.pbs/resources/language/English/strings.xml
b/plugin.video.pbs/resources/language/English/strings.xml
index a0f5b98..f59009c 100644
--- a/plugin.video.pbs/resources/language/English/strings.xml
+++ b/plugin.video.pbs/resources/language/English/strings.xml
@@ -6,4 +6,6 @@
<string id="30003">Search</string>
<string id="30004">No videos found. Please check your spelling,</string>
<string id="30005">or try again using different search words.</string>
+ <string id="30006">HTTP Error 404. Please report this problem
to</string>
+ <string id="30007">[email protected]</string>
</strings>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
plugin.video.pbs/addon.xml | 3 +-
plugin.video.pbs/changelog.txt | 7 +++
plugin.video.pbs/default.py | 57 ++++++++++++--------
.../resources/language/English/strings.xml | 2 +
plugin.video.revision3/addon.xml | 2 +-
plugin.video.revision3/changelog.txt | 4 ++
plugin.video.revision3/default.py | 12 ++--
.../resources/language/English/strings.xml | 11 ++---
.../resources/language/Finnish/strings.xml | 11 ++---
.../resources/language/Hungarian/strings.xml | 11 ++---
.../resources/language/Swedish/strings.xml | 11 ++---
plugin.video.revision3/resources/settings.xml | 2 +-
13 files changed, 74 insertions(+), 60 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
