The branch, eden has been updated
via 23ef66b374df07ae4111bc76503ed612899d59e8 (commit)
from 4d1e6dc3f24aaeb84092788d679ddc8b6c6c9588 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=23ef66b374df07ae4111bc76503ed612899d59e8
commit 23ef66b374df07ae4111bc76503ed612899d59e8
Author: spiff <[email protected]>
Date: Thu Sep 13 18:04:52 2012 +0200
[plugin.video.ted.talks] updated to version 3.1.4
diff --git a/plugin.video.ted.talks/addon.xml b/plugin.video.ted.talks/addon.xml
index 01cb2bd..53dd750 100644
--- a/plugin.video.ted.talks/addon.xml
+++ b/plugin.video.ted.talks/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.ted.talks" name="TED Talks" version="3.1.3"
provider-name="rwparris2, moreginger">
+<addon id="plugin.video.ted.talks" name="TED Talks" version="3.1.4"
provider-name="rwparris2, moreginger">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/plugin.video.ted.talks/changelog.txt
b/plugin.video.ted.talks/changelog.txt
index fa86f13..3aeb29d 100644
--- a/plugin.video.ted.talks/changelog.txt
+++ b/plugin.video.ted.talks/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 3.1.4[/B]
+Respect order of custom language codes when fetching subtitles (issue#26)
+Allow subtitles to be disabled (issue#27)
+
[B]Version 3.1.3[/B]
Fix subtitles (issue#25)
diff --git a/plugin.video.ted.talks/resources/lib/model/subtitles_scraper.py
b/plugin.video.ted.talks/resources/lib/model/subtitles_scraper.py
index 29748e0..4959081 100644
--- a/plugin.video.ted.talks/resources/lib/model/subtitles_scraper.py
+++ b/plugin.video.ted.talks/resources/lib/model/subtitles_scraper.py
@@ -97,7 +97,7 @@ def get_subtitles_for_talk(talk_soup, accepted_languages,
logger):
msg = 'No subtitles found'
logger(msg, msg)
return None
- matches = [l for l in languages if l in accepted_languages]
+ matches = [l for l in accepted_languages if l in languages]
if not matches:
msg = 'No subtitles in: %s' % (",".join(accepted_languages))
logger(msg, msg)
diff --git
a/plugin.video.ted.talks/resources/lib/model/subtitles_scraper_test.py
b/plugin.video.ted.talks/resources/lib/model/subtitles_scraper_test.py
index 4cade9e..9735966 100644
--- a/plugin.video.ted.talks/resources/lib/model/subtitles_scraper_test.py
+++ b/plugin.video.ted.talks/resources/lib/model/subtitles_scraper_test.py
@@ -47,10 +47,10 @@ World
self.assertTrue('15330', flashvars['introDuration']) # TED intro, need
to offset subtitles with this
self.assertEquals('1253', flashvars['ti']) # talk ID
- expected = set(['sq', 'ar', 'hy', 'bg', 'ca', 'zh-cn', 'zh-tw', 'hr',
'cs', 'da', 'nl', 'en', 'fr', 'ka', 'de', 'el', 'he', 'hu', 'id', 'it', 'ja',
'ko', 'fa', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sr', 'sk', 'es', 'th', 'tr',
'uk', 'vi'])
+ expected = set(['sq', 'ar', 'hy', 'bg', 'ca', 'zh-cn', 'zh-tw', 'hr',
'cs', 'da', 'nl', 'en', 'fr', 'ka', 'de', 'el', 'he', 'hu', 'id', 'it', 'ja',
'ko', 'fa', 'mk', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sr', 'sk', 'es', 'th',
'tr', 'uk', 'vi'])
self.assertEquals(expected, set(subtitles_scraper.get_languages(soup)))
- subs = subtitles_scraper.get_subtitles_for_talk(soup, ['banana',
'fr'], None)
+ subs = subtitles_scraper.get_subtitles_for_talk(soup, ['banana', 'fr',
'en'], None)
self.assertTrue(subs.startswith('''1
00:00:15,330 --> 00:00:18,330
Vous savez tous que ce que je vais dire est vrai.
diff --git a/plugin.video.ted.talks/resources/lib/settings.py
b/plugin.video.ted.talks/resources/lib/settings.py
index a49cb51..4af701d 100644
--- a/plugin.video.ted.talks/resources/lib/settings.py
+++ b/plugin.video.ted.talks/resources/lib/settings.py
@@ -28,7 +28,7 @@ def get_subtitle_languages():
Returns list of ISO639-1 language codes in order of preference,
or None if disabled.
'''
- if not enable_subtitles:
+ if enable_subtitles == 'false':
return None
if not subtitle_language.strip():
return language_mapping.get_language_code(xbmc_language)
diff --git a/plugin.video.ted.talks/resources/lib/settings_test.py
b/plugin.video.ted.talks/resources/lib/settings_test.py
index 1af3257..865d8f8 100644
--- a/plugin.video.ted.talks/resources/lib/settings_test.py
+++ b/plugin.video.ted.talks/resources/lib/settings_test.py
@@ -17,15 +17,15 @@ class TestSettings(unittest.TestCase):
unittest.TestCase.tearDown(self)
def test_get_subtitle_languages_disabled(self):
- settings.enable_subtitles = False
+ settings.enable_subtitles = 'false'
self.assertIsNone(settings.get_subtitle_languages())
def test_get_subtitle_languages_enabled_standard(self):
- settings.enable_subtitles = True
+ settings.enable_subtitles = 'true'
settings.xbmc_language = 'English'
self.assertEqual(['en'], settings.get_subtitle_languages())
def test_get_subtitle_languages_enabled_custom(self):
- settings.enable_subtitles = True
+ settings.enable_subtitles = 'true'
settings.subtitle_language = 'en,fr , de ,'
self.assertEqual(['en', 'fr', 'de'], settings.get_subtitle_languages())
diff --git a/plugin.video.ted.talks/resources/lib/ted_talks.py
b/plugin.video.ted.talks/resources/lib/ted_talks.py
index bd5627a..79a5502 100644
--- a/plugin.video.ted.talks/resources/lib/ted_talks.py
+++ b/plugin.video.ted.talks/resources/lib/ted_talks.py
@@ -137,6 +137,7 @@ class UI:
def themes(self):
themes = Themes(self.get_HTML)
for title, link, img, count in themes.get_themes():
+ # Need to associate count with the item so that we can use it when
that one selected.
self.addItem(title, 'themeVids', link, img, isFolder=True)
self.endofdirectory()
-----------------------------------------------------------------------
Summary of changes:
plugin.video.ted.talks/addon.xml | 2 +-
plugin.video.ted.talks/changelog.txt | 4 ++++
.../resources/lib/model/subtitles_scraper.py | 2 +-
.../resources/lib/model/subtitles_scraper_test.py | 4 ++--
plugin.video.ted.talks/resources/lib/settings.py | 2 +-
.../resources/lib/settings_test.py | 6 +++---
plugin.video.ted.talks/resources/lib/ted_talks.py | 1 +
7 files changed, 13 insertions(+), 8 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
