The branch, eden-pre has been updated
via b8c093cdb5cae1b978ade1537716fd570ae0974b (commit)
via 87485d6c0a6fafcced1a1b9d25adaed775b531af (commit)
via aa8537be9bd71a4273052fd6ef36a7bb3cfea97f (commit)
from 4adf430d57c3667694efe06a0e80d16de84c9d37 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b8c093cdb5cae1b978ade1537716fd570ae0974b
commit b8c093cdb5cae1b978ade1537716fd570ae0974b
Author: spiff <[email protected]>
Date: Thu Feb 2 09:12:06 2012 +0100
[plugin.video.g4tv] updated to version 2.0.0
diff --git a/.gitignore b/.gitignore
index e632d27..11d8a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@ plugin.video.the.trailers/.gitignore
plugin.audio.radio_de/.git
plugin.video.jupiterbroadcasting/.git
plugin.video.news.tv2.dk/.git
+plugin.video.g4tv/.git
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=87485d6c0a6fafcced1a1b9d25adaed775b531af
commit 87485d6c0a6fafcced1a1b9d25adaed775b531af
Author: spiff <[email protected]>
Date: Thu Feb 2 09:10:38 2012 +0100
[plugin.video.revision3] updated to version 2.0.2
diff --git a/plugin.video.revision3/addon.xml b/plugin.video.revision3/addon.xml
index 1cc7271..8d602aa 100644
--- a/plugin.video.revision3/addon.xml
+++ b/plugin.video.revision3/addon.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.revision3"
name="Revision3"
- version="2.0.1"
+ version="2.0.2"
provider-name="stacked">
<requires>
<import addon="xbmc.python" version="2.0"/>
- <import addon="script.common.plugin.cache" version="0.9.0"/>
- <import addon="script.module.parsedom" version="0.9.0"/>
- <import addon="script.module.simple.downloader" version="0.9.0"/>
+ <import addon="script.module.parsedom" version="0.9.1"/>
+ <!-- Waiting for dependency to become final
+ <import addon="script.module.simple.downloader" version="0.9.1"/>
+ -->
</requires>
<extension point="xbmc.python.pluginsource"
library="default.py">
diff --git a/plugin.video.revision3/changelog.txt
b/plugin.video.revision3/changelog.txt
index db8a160..e0cab85 100644
--- a/plugin.video.revision3/changelog.txt
+++ b/plugin.video.revision3/changelog.txt
@@ -1,6 +1,10 @@
-[B]Version 2.0.1[/B]
+[B]Version 2.0.2[/B]
-- Added missing files
+- Fixed error on start up
+- Disabled Simple Downloader dependency until it's stable
+- Removed unneeded Common Cache dependency
+- Fixed fanart bug in "Recently Released"
+- Added English strings
[B]Version 2.0.0[/B]
diff --git a/plugin.video.revision3/default.py
b/plugin.video.revision3/default.py
index 5ce6227..65ac2d1 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-02-2012'
-__version__ = '2.0.1'
+__date__ = '02-01-2012'
+__version__ = '2.0.2'
settings = xbmcaddon.Addon(id='plugin.video.revision3')
dbg = False
dbglevel = 3
@@ -17,11 +17,11 @@ current_thumb = os.path.join( settings.getAddonInfo( 'path'
), 'resources', 'med
search_thumb = os.path.join( settings.getAddonInfo( 'path' ), 'resources',
'media', 'search.png' )
import CommonFunctions
-common = CommonFunctions.CommonFunctions()
-common.plugin = plugin
+common = CommonFunctions
+common.plugin = plugin + ' ' + __version__
-import SimpleDownloader as downloader
-downloader = downloader.SimpleDownloader()
+#import SimpleDownloader as downloader
+#downloader = downloader.SimpleDownloader()
def open_url(url):
req = urllib2.Request(url)
@@ -40,16 +40,16 @@ def build_main_directory(url):
plot = common.parseDOM(shows, "p", attrs = { "class": "description" })
if settings.getSetting('folder') == 'true' and settings.getSetting(
'downloadPath' ) and path == 'http://revision3.com/shows/':
url = settings.getSetting("downloadPath")
- listitem = xbmcgui.ListItem( label = "[ Downloads ]" ,
iconImage = downloads_thumb, thumbnailImage = downloads_thumb )
+ listitem = xbmcgui.ListItem(label = '[ ' +
settings.getLocalizedString( 30012 ) + ' ]', iconImage = downloads_thumb,
thumbnailImage = downloads_thumb )
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= url, listitem = listitem, isFolder = True)
if path == 'http://revision3.com/shows/':
- listitem = xbmcgui.ListItem(label = '[ Recently Released ]',
iconImage = current_thumb, thumbnailImage = current_thumb)
- u = sys.argv[0] + "?mode=1&name=" + urllib.quote_plus('Recently
Released') + "&url=" +
urllib.quote_plus('http://revision3.com/episodes/page?&hideArrows=1&type=recent&page=1')
+ listitem = xbmcgui.ListItem(label = '[ ' +
settings.getLocalizedString( 30013 ) + ' ]', iconImage = current_thumb,
thumbnailImage = current_thumb)
+ u = sys.argv[0] + "?mode=1&name=" +
urllib.quote_plus(settings.getLocalizedString( 30013 )) + "&url=" +
urllib.quote_plus('http://revision3.com/episodes/page?&hideArrows=1&type=recent&page=1')
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = True)
- listitem = xbmcgui.ListItem(label = '[ Archived Shows ]',
iconImage = old_thumb, thumbnailImage = old_thumb)
+ listitem = xbmcgui.ListItem(label = '[ ' +
settings.getLocalizedString( 30014 ) + ' ]', iconImage = old_thumb,
thumbnailImage = old_thumb)
u = sys.argv[0] + "?mode=3&url=" +
urllib.quote_plus('http://revision3.com/shows/archive')
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = True)
- listitem = xbmcgui.ListItem(label = '[ Search ]', iconImage =
search_thumb, thumbnailImage = search_thumb)
+ listitem = xbmcgui.ListItem(label = '[ ' +
settings.getLocalizedString( 30015 ) + ' ]', iconImage = search_thumb,
thumbnailImage = search_thumb)
u = sys.argv[0] + "?mode=4&url=" + urllib.quote_plus('search')
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = True)
count = 0
@@ -58,7 +58,7 @@ def build_main_directory(url):
url = 'http://revision3.com' + url + '/episodes'
listitem = xbmcgui.ListItem(label = name, iconImage =
image[count].replace('160x160','200x200'), thumbnailImage =
image[count].replace('160x160','200x200'))
listitem.setProperty('fanart_image',settings.getSetting(fanart))
- listitem.setInfo( type = "Video", infoLabels = { "Title": name,
"Studio": 'Revision3', "Plot": plot[count] } )
+ listitem.setInfo( type = "Video", infoLabels = { "Title": name,
"Studio": plugin, "Plot": plot[count] } )
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
@@ -68,6 +68,7 @@ def build_main_directory(url):
def build_sub_directory(url, name):
saveurl = url
studio = name
+ savestudio = name
#html = common.fetchPage({"link": url})['content']
html = open_url(url)
ret = common.parseDOM(html, "div", attrs = { "id": "main-episodes" })
@@ -91,7 +92,7 @@ def build_sub_directory(url, name):
else:
fanart = data[0]
settings.setSetting(img.rsplit('/')[6], fanart)
- if studio == 'Recently Released':
+ if studio == settings.getLocalizedString( 30013 ):
fanart = ''
except:
fanart = ''
@@ -140,9 +141,9 @@ def build_sub_directory(url, name):
u = sys.argv[0] + "?mode=2&name=" + urllib.quote_plus(plot) +
"&url=" + urllib.quote_plus(url) + "&plot=" + urllib.quote_plus(plot) +
"&studio=" + urllib.quote_plus(studio) + "&episode=" +
urllib.quote_plus(episode) + "&thumb=" + urllib.quote_plus(thumb)
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = False)
if next == True:
- listitem = xbmcgui.ListItem( label = 'Next Page (' + str(
int(current[0]) + 1 ) + ')' , iconImage = next_thumb, thumbnailImage =
next_thumb )
+ listitem = xbmcgui.ListItem( label =
settings.getLocalizedString( 30016 ) + ' (' + str( int(current[0]) + 1 ) + ')'
, iconImage = next_thumb, thumbnailImage = next_thumb )
listitem.setProperty('fanart_image',fanart)
- u = sys.argv[0] + "?mode=1&name=" + urllib.quote_plus(studio) +
"&url=" + urllib.quote_plus(saveurl)
+ u = sys.argv[0] + "?mode=1&name=" +
urllib.quote_plus(savestudio) + "&url=" + urllib.quote_plus(saveurl)
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = True)
xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ),
sortMethod=xbmcplugin.SORT_METHOD_UNSORTED )
xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ),
sortMethod=xbmcplugin.SORT_METHOD_DATE )
@@ -188,7 +189,7 @@ def build_search_directory(url):
u = sys.argv[0] + "?mode=2&name=" + urllib.quote_plus(title) +
"&url=" + urllib.quote_plus(url) + "&plot=" + urllib.quote_plus(plot) +
"&studio=" + urllib.quote_plus(studio) + "&episode=" + urllib.quote_plus('0') +
"&thumb=" + urllib.quote_plus(thumb)
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = False)
if next == True:
- listitem = xbmcgui.ListItem( label = 'Next Page (' + str(
int(current[0]) + 1 ) + ')' , iconImage = next_thumb, thumbnailImage =
next_thumb )
+ listitem = xbmcgui.ListItem( label =
settings.getLocalizedString( 30016 ) + ' (' + str( int(current[0]) + 1 ) + ')'
, iconImage = next_thumb, thumbnailImage = next_thumb )
u = sys.argv[0] + "?mode=4&name=" + urllib.quote_plus(studio) +
"&url=" + urllib.quote_plus(saveurl)
ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url
= u, listitem = listitem, isFolder = True)
xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ),
sortMethod=xbmcplugin.SORT_METHOD_UNSORTED )
@@ -199,6 +200,12 @@ def clean(name):
for trash, crap in remove:
name = name.replace(trash,crap)
return name
+
+def clean_file(name):
+ remove=[('\"',''),('\\',''),('/',''),(':',' -
'),('|',''),('>',''),('<',''),('?',''),('*','')]
+ for old, new in remove:
+ name=name.replace(old,new)
+ return name
def get_video(url, name, plot, studio, episode, thumb):
#result = common.fetchPage({"link": url})['content']
@@ -223,12 +230,16 @@ def get_video(url, name, plot, studio, episode, thumb):
ret = None
except:
dialog = xbmcgui.Dialog()
- ret = dialog.select('Video Type', dictList)
+ ret = dialog.select(settings.getLocalizedString( 30017 ),
dictList)
purl = durl[dictList[ret]]
if ret != -1:
if settings.getSetting('download') == 'true':
- params = { "videoid": str(episode), "video_url": purl,
"Title": name }
- downloader.downloadVideo(params)
+ while not settings.getSetting('downloadPath'):
+ dialog = xbmcgui.Dialog()
+ ok = dialog.ok(plugin,
settings.getLocalizedString( 30011 ))
+ settings.openSettings()
+ params = { "url": purl, "download_path":
settings.getSetting('downloadPath'), "Title": name }
+ downloader.download(clean_file(name) + '.' +
purl.split('/')[-1].split('.')[-1], params)
else:
#thumb = xbmc.getInfoImage( 'ListItem.Thumb' )
listitem = xbmcgui.ListItem(label = name , iconImage =
'DefaultVideo.png', thumbnailImage = thumb)
diff --git a/plugin.video.revision3/resources/language/English/strings.xml
b/plugin.video.revision3/resources/language/English/strings.xml
index cdb29bc..bba523e 100644
--- a/plugin.video.revision3/resources/language/English/strings.xml
+++ b/plugin.video.revision3/resources/language/English/strings.xml
@@ -6,9 +6,14 @@
<string id="30003">MP4:Phone</string>
<string id="30004">Enable Video Download</string>
<string id="30005">Download Location</string>
- <string id="30006">Hide during playback</string>
- <string id="30007">Notification length in seconds</string>
<string id="30008">Show Downloads Folder</string>
<string id="30009">No videos found. Please check your spelling</string>
<string id="30010">or try again using different search words.</string>
+ <string id="30011">Please set a Download Location.</string>
+ <string id="30012">Downloads</string>
+ <string id="30013">Recently Released</string>
+ <string id="30014">Archived Shows</string>
+ <string id="30015">Search</string>
+ <string id="30016">Next Page</string>
+ <string id="30017">Video Type</string>
</strings>
diff --git a/plugin.video.revision3/resources/settings.xml
b/plugin.video.revision3/resources/settings.xml
index 05380f0..151dc87 100644
--- a/plugin.video.revision3/resources/settings.xml
+++ b/plugin.video.revision3/resources/settings.xml
@@ -1,8 +1,8 @@
<settings>
<setting id="type" type="select" lvalues="30001|30002|30003" label="30000"
default="MP4:HD"/>
+ <!-- Waiting for simple downloader to become stable
<setting id="download" type="bool" label="30004" default="false"/>
<setting id="downloadPath" type="folder" enable="eq(-1,true)" label="30005"
default="" />
- <setting id="hideDuringPlayback" type="bool" enable="eq(-2,true)"
label="30006" default="true" />
- <setting id="notification_length" type="enum" enable="eq(-3,true)"
label="30007" values="1|2|3|4|5|6|7|8|9|10" default="2" />
- <setting id="folder" type="bool" enable="eq(-4,true)" label="30008"
default="true"/>
+ <setting id="folder" type="bool" enable="eq(-2,true)" label="30008"
default="true"/>
+ -->
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=aa8537be9bd71a4273052fd6ef36a7bb3cfea97f
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
.../LICENSE.txt | 0
{plugin.audio.twit => plugin.audio.npr}/addon.xml | 37 +-
plugin.audio.npr/changelog.txt | 6 +
plugin.audio.npr/default.py | 267 +++++++
plugin.audio.npr/icon.png | Bin 0 -> 76931 bytes
plugin.audio.npr/npr_stations.csv | 794 ++++++++++++++++++++
.../resources/language/English/strings.xml | 7 +
.../LICENSE.txt | 0
plugin.video.g4tv/addon.xml | 22 +
plugin.video.g4tv/changelog.txt | 3 +
plugin.video.g4tv/default.py | 197 +++++
plugin.video.g4tv/icon.png | Bin 0 -> 71265 bytes
.../resources/language/English/strings.xml | 21 +
.../resources/media/content.png | Bin 51020 -> 51020 bytes
.../resources/media}/downloads.png | Bin 23477 -> 23477 bytes
plugin.video.g4tv/resources/media/events.png | Bin 0 -> 22359 bytes
plugin.video.g4tv/resources/media/genre.png | Bin 0 -> 49852 bytes
.../resources/media/next.png | Bin 23910 -> 23910 bytes
plugin.video.g4tv/resources/media/platform.png | Bin 0 -> 41379 bytes
plugin.video.g4tv/resources/media/recent.png | Bin 0 -> 136248 bytes
plugin.video.g4tv/resources/media/search.png | Bin 0 -> 41374 bytes
plugin.video.g4tv/resources/media/shows.png | Bin 0 -> 107413 bytes
.../resources/settings_placeholder.xml | 5 +
plugin.video.revision3/addon.xml | 9 +-
plugin.video.revision3/changelog.txt | 8 +-
plugin.video.revision3/default.py | 49 +-
.../resources/language/English/strings.xml | 9 +-
plugin.video.revision3/resources/settings.xml | 6 +-
29 files changed, 1392 insertions(+), 49 deletions(-)
copy {plugin.audio.abradio.cz => plugin.audio.npr}/LICENSE.txt (100%)
copy {plugin.audio.twit => plugin.audio.npr}/addon.xml (54%)
create mode 100644 plugin.audio.npr/changelog.txt
create mode 100644 plugin.audio.npr/default.py
create mode 100644 plugin.audio.npr/icon.png
create mode 100644 plugin.audio.npr/npr_stations.csv
create mode 100644 plugin.audio.npr/resources/language/English/strings.xml
copy {plugin.audio.abradio.cz => plugin.video.g4tv}/LICENSE.txt (100%)
create mode 100644 plugin.video.g4tv/addon.xml
create mode 100644 plugin.video.g4tv/changelog.txt
create mode 100644 plugin.video.g4tv/default.py
create mode 100644 plugin.video.g4tv/icon.png
create mode 100644 plugin.video.g4tv/resources/language/English/strings.xml
copy plugin.video.bliptv/thumbnails/movies.png =>
plugin.video.g4tv/resources/media/content.png (100%)
copy {plugin.video.bliptv/thumbnails =>
plugin.video.g4tv/resources/media}/downloads.png (100%)
create mode 100644 plugin.video.g4tv/resources/media/events.png
create mode 100644 plugin.video.g4tv/resources/media/genre.png
copy {plugin.video.revision3 => plugin.video.g4tv}/resources/media/next.png
(100%)
create mode 100644 plugin.video.g4tv/resources/media/platform.png
create mode 100644 plugin.video.g4tv/resources/media/recent.png
create mode 100644 plugin.video.g4tv/resources/media/search.png
create mode 100644 plugin.video.g4tv/resources/media/shows.png
create mode 100644 plugin.video.g4tv/resources/settings_placeholder.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
