The branch, eden has been updated
via 2474ceb4a164b99390bad742c5d4b73f3de3dfb6 (commit)
from aef98953bdc27225d8aed5d3f328f619178c8be7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2474ceb4a164b99390bad742c5d4b73f3de3dfb6
commit 2474ceb4a164b99390bad742c5d4b73f3de3dfb6
Author: Martijn Kaijser <[email protected]>
Date: Sat Dec 1 01:18:46 2012 +0100
[plugin.video.the.trailers] -v0.9.3
diff --git a/plugin.video.the.trailers/addon.py
b/plugin.video.the.trailers/addon.py
index 1bde826..6759e05 100644
--- a/plugin.video.the.trailers/addon.py
+++ b/plugin.video.the.trailers/addon.py
@@ -173,6 +173,7 @@ def get_trailer(source_id, movie_title, mode):
except NoDownloadPath:
xbmcgui.Dialog().ok(_('no_download_path'),
_('no_download_path'))
+ return
except (NoQualitySelected, NoTrailerSelected):
return
@@ -193,8 +194,11 @@ def ask_trailer_type(source, movie_title):
# if the user wants to be asked, show the select dialog
if plugin.get_setting('ask_trailer') == 'true':
trailer_types = source.get_trailer_types(movie_title)
+ if not trailer_types:
+ __log('there are no trailers found for selection')
+ return 'trailer'
# is there more than one trailer_types, ask
- if len(trailer_types) > 1:
+ elif len(trailer_types) > 1:
dialog = xbmcgui.Dialog()
selected = dialog.select(_('choose_trailer_type'),
[t['title'] for t in trailer_types])
@@ -324,7 +328,11 @@ def download_trailer(local_path, remote_url, trailer_id):
@plugin.route('/add_to_couchpotato/<movie_title>')
def add_to_couchpotato(movie_title):
__log('add_to_couchpotato started with movie_title=%s' % movie_title)
- import resources.lib.couchpotato as couchpotato
+ cp_version = int(plugin.get_setting('cp_version'))
+ if cp_version == 0:
+ import resources.lib.couchpotatov1 as couchpotato
+ else:
+ import resources.lib.couchpotatov2 as couchpotato
couchpotato.Main()
return
@@ -361,6 +369,7 @@ def __format_movie(m):
'is_playable': True,
'is_folder': False,
'iconImage': m.get('thumb', 'DefaultVideo.png'),
+ 'thumbnail': m.get('thumb', 'DefaultVideo.png'),
'info': {'title': m.get('title'),
'duration': m.get('duration', '0:00'),
'size': int(m.get('size', 0)),
@@ -482,4 +491,4 @@ if __name__ == '__main__':
__log('NetworkError: %s' % e)
xbmcgui.Dialog().ok(_('neterror_title'),
_('neterror_line1'),
- _('neterror_line2'))
\ No newline at end of file
+ _('neterror_line2'))
diff --git a/plugin.video.the.trailers/addon.xml
b/plugin.video.the.trailers/addon.xml
index 617ff65..3f1faf1 100644
--- a/plugin.video.the.trailers/addon.xml
+++ b/plugin.video.the.trailers/addon.xml
@@ -2,7 +2,7 @@
<addon
id="plugin.video.the.trailers"
name="The Trailers"
- version="0.9.0"
+ version="0.9.3"
provider-name="Martijn, Sphere">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.the.trailers/changelog.txt
b/plugin.video.the.trailers/changelog.txt
index 956ba0f..45aa3d6 100644
--- a/plugin.video.the.trailers/changelog.txt
+++ b/plugin.video.the.trailers/changelog.txt
@@ -1 +1,12 @@
-unreleased
\ No newline at end of file
+[B]0.9.3[/B]
+- Fix empty ListItem.Art(thumb)
+- Fix error when canncelling if asked for download path
+
+[B]0.9.2[/B]
+- Added Couchpotato v2 support in settings
+
+[B]0.9.0[/B]
+- Catch error when no trailers types are avaiable
+
+[B]0.9.0[/B]
+- Eden repo release
\ No newline at end of file
diff --git a/plugin.video.the.trailers/resources/language/English/strings.xml
b/plugin.video.the.trailers/resources/language/English/strings.xml
index 09fd226..610f74d 100644
--- a/plugin.video.the.trailers/resources/language/English/strings.xml
+++ b/plugin.video.the.trailers/resources/language/English/strings.xml
@@ -46,4 +46,7 @@
<string id="30264">Port</string>
<string id="30265">Use HTTPS</string>
<string id="30266">Couch Potato</string>
-</strings>
\ No newline at end of file
+ <string id="30267">Server version</string>
+ <string id="30268">V1</string>
+ <string id="30269">V2</string>
+</strings>
diff --git a/plugin.video.the.trailers/resources/settings.xml
b/plugin.video.the.trailers/resources/settings.xml
index 8439718..7c54837 100644
--- a/plugin.video.the.trailers/resources/settings.xml
+++ b/plugin.video.the.trailers/resources/settings.xml
@@ -23,5 +23,6 @@
<setting label="30265" type="bool" id="cp_use_https" default="false"
visible="eq(-3,true)"/>
<setting label="30261" type="text" id="cp_user" default=""
visible="eq(-4,true)"/>
<setting label="30262" type="text" id="cp_password" default=""
enable="!eq(-1,)" visible="eq(-5,true)" option="hidden"/>
+ <setting label="30267" type="enum" id="cp_version" default="0"
lvalues="30268|30269" visible="eq(-6,true)"/>
</category>
</settings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.the.trailers/addon.py | 15 ++-
plugin.video.the.trailers/addon.xml | 2 +-
plugin.video.the.trailers/changelog.txt | 13 ++-
.../resources/language/English/strings.xml | 5 +-
.../lib/{couchpotato.py => couchpotatov1.py} | 0
.../resources/lib/couchpotatov2.py | 178 ++++++++++++++++++++
plugin.video.the.trailers/resources/settings.xml | 1 +
7 files changed, 208 insertions(+), 6 deletions(-)
rename plugin.video.the.trailers/resources/lib/{couchpotato.py =>
couchpotatov1.py} (100%)
create mode 100644 plugin.video.the.trailers/resources/lib/couchpotatov2.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
INSIGHTS What's next for parallel hardware, programming and related areas?
Interviews and blogs by thought leaders keep you ahead of the curve.
http://goparallel.sourceforge.net
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
