The branch, frodo has been updated
via 27fc1e4f397e99819eda3c8770341526d1b9dc24 (commit)
via 733afd024169db26d7bc63e358551cab5680b7a1 (commit)
via 2ec7614a8723885b9db6d4dc9ee1ad05cdc7fa50 (commit)
via 823b4d6bb6f44de0fa3a49fbbf4b38437d6372ac (commit)
from c969ab96566a210ef6ffd42f42210d06324c97bb (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=27fc1e4f397e99819eda3c8770341526d1b9dc24
commit 27fc1e4f397e99819eda3c8770341526d1b9dc24
Author: sphere <[email protected]>
Date: Thu Mar 20 10:27:48 2014 +0100
[plugin.video.abcradionational] updated to version 1.0.4
diff --git a/plugin.video.abcradionational/addon.xml
b/plugin.video.abcradionational/addon.xml
index 9eb1224..cb51edb 100644
--- a/plugin.video.abcradionational/addon.xml
+++ b/plugin.video.abcradionational/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.abcradionational" name="RNTV - Radio National TV"
version="1.0.3" provider-name="Damon Toumbourou">
+<addon id="plugin.video.abcradionational" name="RNTV - Radio National TV"
version="1.0.4" provider-name="Damon Toumbourou">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcswift2" version="2.4.0"/>
diff --git a/plugin.video.abcradionational/changelog.txt
b/plugin.video.abcradionational/changelog.txt
index 26019ad..eb27a71 100644
--- a/plugin.video.abcradionational/changelog.txt
+++ b/plugin.video.abcradionational/changelog.txt
@@ -2,4 +2,5 @@
#version 0.0.1 - Initial working version.
#version 1.0.2 - Fix index out of range error.
-#version 1.0.3 - Rectify issue with the thumbs scraper.
\ No newline at end of file
+#version 1.0.3 - Rectify issue with the thumbs scraper.
+#version 1.0.4 - Updates to website scraper code.
\ No newline at end of file
diff --git a/plugin.video.abcradionational/resources/lib/abcradionational.py
b/plugin.video.abcradionational/resources/lib/abcradionational.py
index e024cfb..739cf09 100644
--- a/plugin.video.abcradionational/resources/lib/abcradionational.py
+++ b/plugin.video.abcradionational/resources/lib/abcradionational.py
@@ -23,7 +23,7 @@ def get_podcasts():
info_out.append(info.text)
print len(info_out)
- thumb_sec = thumbs[1:38]
+ thumb_sec = thumbs[1:42]
thumb_out = []
for thumb in thumb_sec:
thumb_out.append(thumb['src'])
@@ -45,7 +45,8 @@ def get_podcasts():
print len(path_out)
output = []
- for x in range(len(title_out)):
+
+ for x in range(len(title_out)):
items = {
'title': title_out[x],
'thumb': thumb_out[x],
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=733afd024169db26d7bc63e358551cab5680b7a1
commit 733afd024169db26d7bc63e358551cab5680b7a1
Author: sphere <[email protected]>
Date: Thu Mar 20 10:27:13 2014 +0100
[plugin.video.ted.talks] updated to version 4.2.1
diff --git a/plugin.video.ted.talks/addon.xml b/plugin.video.ted.talks/addon.xml
index 941ddc2..a03c874 100644
--- a/plugin.video.ted.talks/addon.xml
+++ b/plugin.video.ted.talks/addon.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.ted.talks" name="TED Talks" version="4.2.0"
provider-name="rwparris2, moreginger">
+<addon id="plugin.video.ted.talks" name="TED Talks" version="4.2.1"
provider-name="rwparris2, moreginger">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
- <import addon="script.module.beautifulsoup" version="3.0.8"/>
<import addon="script.module.elementtree" version="1.2.7"/>
<import addon="script.module.parsedom" version="0.9.1"/>
</requires>
diff --git a/plugin.video.ted.talks/changelog.txt
b/plugin.video.ted.talks/changelog.txt
index a1bbeca..727edf0 100644
--- a/plugin.video.ted.talks/changelog.txt
+++ b/plugin.video.ted.talks/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 4.2.1[/B]
+Fix speakers (issue#45)
+Fix newest talks for Python <2.7 (issue#41)
+
[B]Version 4.2.0[/B]
Updates to support new TED site (issue#45)
Added support for talk search (issue#12)
diff --git a/plugin.video.ted.talks/resources/lib/model/fetcher.py
b/plugin.video.ted.talks/resources/lib/model/fetcher.py
index 84b0e28..44640e1 100644
--- a/plugin.video.ted.talks/resources/lib/model/fetcher.py
+++ b/plugin.video.ted.talks/resources/lib/model/fetcher.py
@@ -24,17 +24,17 @@ class Fetcher:
if data:
headers = headers + [('Content-type',
'application/x-www-form-urlencoded')]
- #create cookiejar
+ # create cookiejar
cj = cookielib.LWPCookieJar()
cookiefile = self.getTranslatedPath('special://temp/ted-cookies.lwp')
- #load any existing cookies
+ # load any existing cookies
if os.path.isfile(cookiefile):
cj.load(cookiefile)
- #log what cookies were loaded
+ # log what cookies were loaded
for index, cookie in enumerate(cj):
self.logger('loaded cookie : %s from %s' % (cookie,
cookiefile))
- #build opener with automagic cookie handling abilities.
+ # build opener with automagic cookie handling abilities.
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
opener.addheaders = headers
try:
@@ -46,5 +46,6 @@ class Fetcher:
except urllib2.HTTPError, error:
self.logger('%s error:\n%s\n%s\n%s' % (__name__, error.code,
error.msg, error.geturl()))
except Exception, error:
- print Exception.__module__
- print dir(error)
+ import xbmc
+ xbmc.log(Exception.__module__, level=xbmc.LOGERROR)
+ xbmc.log(Exception.__module__, level=xbmc.LOGERROR)
diff --git a/plugin.video.ted.talks/resources/lib/model/rss_scraper.py
b/plugin.video.ted.talks/resources/lib/model/rss_scraper.py
index e0f76c7..e4ab7df 100644
--- a/plugin.video.ted.talks/resources/lib/model/rss_scraper.py
+++ b/plugin.video.ted.talks/resources/lib/model/rss_scraper.py
@@ -6,8 +6,17 @@ so keep it for now.
import urllib2
import time
-import datetime
-from resources.lib.model import url_constants
+from datetime import timedelta
+try:
+ timedelta.total_seconds
+except AttributeError:
+ # People still using Python <2.7 201303 :(
+ # Cleverness from
http://stackoverflow.com/questions/3318348/how-can-i-extend-pythons-datetime-datetime-with-my-own-methods/14214646#14214646
+ def total_seconds(td):
+ return float((td.microseconds + (td.seconds + td.days * 24 * 3600) *
10 ** 6)) / 10 ** 6
+ d = _get_dict(timedelta)[0]
+ d['total_seconds'] = total_seconds
+
try:
from elementtree.ElementTree import fromstring
except ImportError:
@@ -41,7 +50,7 @@ class NewTalksRss:
pic =
item.find('./{http://search.yahoo.com/mrss/}thumbnail').get('url')
duration =
item.find('./{http://www.itunes.com/dtds/podcast-1.0.dtd}duration').text
duration = time.strptime(duration, '%H:%M:%S')
- duration_seconds = datetime.timedelta(hours=duration.tm_hour,
minutes=duration.tm_min, seconds=duration.tm_sec).total_seconds()
+ duration_seconds = timedelta(hours=duration.tm_hour,
minutes=duration.tm_min, seconds=duration.tm_sec).total_seconds()
plot =
item.find('./{http://www.itunes.com/dtds/podcast-1.0.dtd}summary').text
link = item.find('./link').text
@@ -61,7 +70,7 @@ class NewTalksRss:
Returns talks as dicts {title:, author:, thumb:, date:, duration:,
link:}.
"""
talksByTitle = {}
- rss = get_document(url_constants.URLRSS)
+ rss = get_document('http://feeds.feedburner.com/tedtalks_video')
for item in fromstring(rss).findall('channel/item'):
talk = self.get_talk_details(item)
talksByTitle[talk['title']] = talk
diff --git a/plugin.video.ted.talks/resources/lib/model/speakers_scraper.py
b/plugin.video.ted.talks/resources/lib/model/speakers_scraper.py
index 510e153..7581694 100644
--- a/plugin.video.ted.talks/resources/lib/model/speakers_scraper.py
+++ b/plugin.video.ted.talks/resources/lib/model/speakers_scraper.py
@@ -50,7 +50,7 @@ class Speakers:
Yields tuples of title, link, img.
'''
html = self.get_HTML(url)
- for talk in xbmc_common.parseDOM(html, 'div', {'class':'col-lg-4
profile-talks__talk'}):
+ for talk in xbmc_common.parseDOM(html, 'div', {'class':'talk-link'}):
link = xbmc_common.parseDOM(talk, 'a', ret='href')[0]
img = xbmc_common.parseDOM(talk, 'img', ret='src')[0]
div = xbmc_common.parseDOM(talk, 'div',
{'class':'media__message'})[0]
diff --git a/plugin.video.ted.talks/resources/lib/model/themes_scraper_test.py
b/plugin.video.ted.talks/resources/lib/model/themes_scraper_test.py
index c0cdd26..611935a 100644
--- a/plugin.video.ted.talks/resources/lib/model/themes_scraper_test.py
+++ b/plugin.video.ted.talks/resources/lib/model/themes_scraper_test.py
@@ -34,7 +34,7 @@ class TestThemesScraper(unittest.TestCase):
self.assertLess(0, len(e_talks))
self.assertLessEqual(120, len(e_talks))
sample_talk = [t for t in e_talks if t[0] == "T. Boone Pickens: Let's
transform energy -- with natural gas"][0]
-
self.assertEqual('http://www.ted.com/talks/t_boone_pickens_let_s_transform_energy_with_natural_gas.html',
sample_talk[1])
+
self.assertEqual('http://www.ted.com/talks/t_boone_pickens_let_s_transform_energy_with_natural_gas',
sample_talk[1])
self.assertEqual('http://images.ted.com/images/ted/94552e20361ccd9b4b707563d62b5fec0e3d9813_113x85.jpg',
sample_talk[2])
def test_get_talks_performance(self):
diff --git a/plugin.video.ted.talks/resources/lib/model/url_constants.py
b/plugin.video.ted.talks/resources/lib/model/url_constants.py
index 7a526ab..116a7d1 100644
--- a/plugin.video.ted.talks/resources/lib/model/url_constants.py
+++ b/plugin.video.ted.talks/resources/lib/model/url_constants.py
@@ -1,6 +1,3 @@
URLTED = 'http://www.ted.com'
-URLPROFILES = URLTED + '/profiles'
-URLFAVORITES = URLPROFILES + '/%s/talks/'
URLTHEMES = URLTED + '/themes'
-URLRSS = 'http://feeds.feedburner.com/tedtalks_video'
URLSEARCH = URLTED + '/search?cat=talks&q=%s&page=%s'
diff --git a/plugin.video.ted.talks/resources/lib/plugin.py
b/plugin.video.ted.talks/resources/lib/plugin.py
index 21da332..2291182 100644
--- a/plugin.video.ted.talks/resources/lib/plugin.py
+++ b/plugin.video.ted.talks/resources/lib/plugin.py
@@ -19,7 +19,8 @@ def init():
__pluginLS__ = getLS(30000)
__author__ = addon.getAddonInfo('author')
__version__ = addon.getAddonInfo('version')
- print "[PLUGIN] '%s: version %s' initialized!" % (__plugin__, __version__)
+ import xbmc
+ xbmc.log("[PLUGIN] '%s: version %s' initialized!" % (__plugin__,
__version__), level=xbmc.LOGERROR)
def report(gnarly_message, friendly_message=None):
import xbmc
diff --git a/plugin.video.ted.talks/resources/lib/ted_talks.py
b/plugin.video.ted.talks/resources/lib/ted_talks.py
index 269ab2c..9012477 100644
--- a/plugin.video.ted.talks/resources/lib/ted_talks.py
+++ b/plugin.video.ted.talks/resources/lib/ted_talks.py
@@ -3,11 +3,9 @@ import urllib
import ted_talks_scraper
import plugin
import settings
-from talkDownloader import Download
from model.fetcher import Fetcher
from model.user import User
from model.rss_scraper import NewTalksRss
-from model.favorites_scraper import Favorites
from model.speakers_scraper import Speakers
from model.themes_scraper import Themes
from model.util import resizeImage
@@ -143,14 +141,6 @@ class UI:
self.addItem(title, 'playVideo', link, img, isFolder=False)
self.endofdirectory()
- def favorites(self):
- # attempt to login
- userID, realname = login(self.user, settings.username,
settings.password)
- if userID:
- for title, url, img in Favorites(plugin.report,
self.get_HTML).getFavoriteTalks(userID):
- self.addItem(title, 'playVideo', url=url, img=img,
isFolder=False)
- self.endofdirectory()
-
class Action(object):
'''
@@ -268,16 +258,6 @@ class ThemeVideosAction(Action):
self.ui.themeVids(args['url'])
-class FavoritesAction(Action):
-
- def __init__(self, ui, *args, **kwargs):
- super(FavoritesAction, self).__init__('favorites', [], *args, **kwargs)
- self.ui = ui
-
- def run_internal(self, args):
- self.ui.favorites()
-
-
class SearchActionBase(Action):
def __init__(self, ui, get_HTML, *args, **kwargs):
@@ -328,16 +308,6 @@ class SearchMoreAction(SearchActionBase):
self.__add_items__(search_term, page + 1, [], False)
-class DownloadVideoAction(Action):
-
- def __init__(self, logger, main):
- super(DownloadVideoAction, self).__init__('downloadVideo', ['url'],
logger)
- self.main = main
-
- def run_internal(self, args):
- self.main.downloadVid(args['url'], False)
-
-
class Main:
def __init__(self, args_map):
@@ -346,15 +316,6 @@ class Main:
self.user = User(self.get_HTML)
self.ted_talks = ted_talks_scraper.TedTalks(self.get_HTML,
plugin.report)
- def downloadVid(self, url):
- video = self.ted_talks.getVideoDetails(url)
- if settings.download_mode == 'true':
- downloadPath = xbmcgui.Dialog().browse(3, plugin.getLS(30096),
'files')
- else:
- downloadPath = settings.download_path
- if downloadPath:
- Download(plugin.getLS, video['Title'], video['url'], downloadPath)
-
def run(self):
ui = UI(self.get_HTML, self.ted_talks, self.user)
if 'mode' not in self.args_map:
@@ -369,9 +330,7 @@ class Main:
SpeakerGroupAction(ui, self.get_HTML, logger=plugin.report),
SpeakerVideosAction(ui, logger=plugin.report),
ThemesAction(ui, logger=plugin.report),
- ThemeVideosAction(ui, logger=plugin.report),
- FavoritesAction(ui, logger=plugin.report),
- # DownloadVideoAction(plugin.report, self),
+ ThemeVideosAction(ui, logger=plugin.report)
]
modes = dict([(m.mode, m) for m in modes])
mode = self.args_map['mode']
diff --git a/plugin.video.ted.talks/resources/settings.xml
b/plugin.video.ted.talks/resources/settings.xml
index 9f672f1..3708d70 100644
--- a/plugin.video.ted.talks/resources/settings.xml
+++ b/plugin.video.ted.talks/resources/settings.xml
@@ -8,9 +8,4 @@
<setting type="sep"/>
<setting id="subtitle_language" type="text" default="" label="30113"
enable="eq(-2,true)"/>
</category>
- <!--Login-->
- <category label="30075">
- <setting id="username" type="text" label="30070" default="" />
- <setting id="password" type="text" option="hidden" label="30071"
default="" />
- </category>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2ec7614a8723885b9db6d4dc9ee1ad05cdc7fa50
commit 2ec7614a8723885b9db6d4dc9ee1ad05cdc7fa50
Author: sphere <[email protected]>
Date: Thu Mar 20 10:26:02 2014 +0100
[plugin.video.peoplesvoice] updated to version 0.1.6
diff --git a/plugin.video.peoplesvoice/addon.xml
b/plugin.video.peoplesvoice/addon.xml
index 25969b6..6848c80 100644
--- a/plugin.video.peoplesvoice/addon.xml
+++ b/plugin.video.peoplesvoice/addon.xml
@@ -3,7 +3,7 @@
id="plugin.video.peoplesvoice"
name="The People's Voice"
provider-name="celadoor"
- version="0.1.5">
+ version="0.1.6">
<requires>
<import addon="xbmc.python" version="2.1.0" />
<import addon="script.common.plugin.cache" version="1.5.1" />
@@ -15,13 +15,13 @@
</extension>
<extension point="xbmc.addon.metadata">
<summary lang="en">The People's Voice video plugin - Please Donate, and
support the video content provider!</summary>
- <description lang="en">VIEWER EXPECTATION[CR]The People's Voice has been
established to balance mainstream media bias which refuses to give voice to
people with views at odds with mainstream thinking and belief. You can expect
to hear all aspects of mainstream society questioned and debated. What viewers
choose to accept or believe is for them to decide after hearing the evidence
and opinion broadcast by The People's Voice and the information and opinion
broadcast by mainstream sources.[CR][CR]Some programmes may include swearing,
but only after 9pm UK time...</description>
+ <description lang="en">VIEWER EXPECTATION[CR]The People's Voice has been
established to balance mainstream media bias which refuses to give voice to
people with views at odds with mainstream thinking and belief. You can expect
to hear all aspects of mainstream society questioned and debated. What viewers
choose to accept or believe is for them to decide after hearing the evidence
and opinion broadcast by The People's Voice and the information and opinion
broadcast by mainstream sources.[CR][CR]Some programmes may include swearing
and adult content after 9pm UK time...</description>
<language>en</language>
<platform>all</platform>
<license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
<forum>http://forum.xbmc.org/showthread.php?tid=178078</forum>
<website>http://www.thepeoplesvoice.tv</website>
<email></email>
- <source></source>
+ <source>http://celadoor.github.io/plugin.video.peoplesvoice.zip</source>
</extension>
</addon>
\ No newline at end of file
diff --git a/plugin.video.peoplesvoice/changelog.txt
b/plugin.video.peoplesvoice/changelog.txt
index 27138bc..b2d6e37 100644
--- a/plugin.video.peoplesvoice/changelog.txt
+++ b/plugin.video.peoplesvoice/changelog.txt
@@ -1,4 +1,6 @@
Plays the People's Voice live video stream. created by celadoor.
+Version 0.1.6 -Fixed schedule and added day of the week, fixed video quality
options.
+
Version 0.1.5 -Fixed video quality options and made error checking go to
xbmc.log()
Version 0.1.3 -Fixed urls added error checking
diff --git a/plugin.video.peoplesvoice/default.py
b/plugin.video.peoplesvoice/default.py
index 3e04808..c6669cf 100644
--- a/plugin.video.peoplesvoice/default.py
+++ b/plugin.video.peoplesvoice/default.py
@@ -22,7 +22,7 @@ def INDEX(url):
link=response.read()
response.close()
#Scrape video source
- match=re.compile('href="(.+?)"><span style="color: #ffffff;"><font
size="3" color="black">(.+?)</span>').findall(link)
+ match=re.compile('<a href="(.+?)" target="TPV"><span style="color:
#ffffff;"><font size="3" color="black">(.+?)</span>').findall(link)
if len(match) > 0:
for url,name in match:
addDir(__language__(30010)+name,url,2,'http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30014)+__language__(30015)+__language__(30012))
@@ -38,11 +38,20 @@ def INDEX2(url):
link=response.read()
response.close()
#Scrape program schedule
- match=re.compile('src="(.+?)" width="200" height="150"
align="left"/></td>\n<td><b>(.+?)</b>').findall(link)
+ match=re.compile('src="(.+?)"
width=".+?></td>\n<td><b>(.+?)<').findall(link)#schedule
+ week =
[__language__(30021),__language__(30022),__language__(30023),__language__(30024),__language__(30025),__language__(30026),__language__(30027)]
+ day = 0
+ dayset = 0
if len(match) > 0:
for image,name in match:
name = name.replace('"', '"').replace(''',
"'").replace('&', '&').replace('’', "'") # Cleanup the title.
- addDir(name,'',0,image,name)
+ name = name.replace(' GMT', 'GMT').replace('T 0:', 'T
00:').replace('T 1:', 'T 01:').replace('T 2:', 'T 02:').replace('T 3:', 'T
03:').replace('T 4:', 'T 04:').replace('T 5:', 'T 05:').replace('T 6:', 'T
06:').replace('T 7:', 'T 07:').replace('T 8:', 'T 08:').replace('T 9:', 'T 09:')
+ if name[4] < dayset and dayset == "2":
+ day = day +1
+ if day > 6:
+ day = 0
+ dayset = name[4]
+ addDir(week[day]+name,'',0,image,week[day]+name)
else:
xbmc.log(__language__(30020), xbmc.LOGERROR )
xbmcgui.Dialog().ok(__language__(30010), __language__(30020))
diff --git a/plugin.video.peoplesvoice/resources/language/English/strings.xml
b/plugin.video.peoplesvoice/resources/language/English/strings.xml
index ea7350f..2aa5882 100644
--- a/plugin.video.peoplesvoice/resources/language/English/strings.xml
+++ b/plugin.video.peoplesvoice/resources/language/English/strings.xml
@@ -2,13 +2,20 @@
<strings>
<string id="30010">The People's Voice </string>
<string id="30011"> Live</string>
-<string id="30012">[CR]Some programmes may include swearing, but only after
9pm UK time...[CR]</string>
+<string id="30012">[CR]Some programmes may include swearing and adult content
after 9pm UK time...[CR]</string>
<string id="30013">[B]VIEWER EXPECTATION[/B][CR]The People's Voice has been
established to balance mainstream media bias which refuses to give voice to
people with views at odds with mainstream thinking and belief. You can expect
to hear all aspects of mainstream society questioned and debated. What viewers
choose to accept or believe is for them to decide after hearing the evidence
and opinion broadcast by The People's Voice and the information and opinion
broadcast by mainstream sources.</string>
-<string id="30014">Please Donate, and support the video content
provider![CR]</string>
-<string
id="30015">[B]http://www.thepeoplesvoice.tv/donate/[/B][CR][CR]</string>
+<string id="30014">[COLOR yellow]Please Donate, and support the video content
provider![CR][/COLOR]</string>
+<string id="30015">[COLOR
yellow][B]http://www.thepeoplesvoice.tv/donate/[/B][CR][CR][/COLOR]</string>
<string id="30016">Today's Schedule[CR][CR]</string>
<string id="30017">The People's Voice Shows</string>
<string id="30018">Direct Video Link</string>
<string id="30019">Media url not found!</string>
<string id="30020">Schedule url not found!</string>
+<string id="30021">[COLOR red] Monday [/COLOR]</string>
+<string id="30022">[COLOR yellow] Tuesday [/COLOR]</string>
+<string id="30023">[COLOR blue] Wednesday [/COLOR]</string>
+<string id="30024">[COLOR purple] Thursday [/COLOR]</string>
+<string id="30025">[COLOR orange] Friday [/COLOR]</string>
+<string id="30026">[COLOR pink] Saturday [/COLOR]</string>
+<string id="30027">[COLOR green] Sunday [/COLOR]</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=823b4d6bb6f44de0fa3a49fbbf4b38437d6372ac
commit 823b4d6bb6f44de0fa3a49fbbf4b38437d6372ac
Author: sphere <[email protected]>
Date: Thu Mar 20 10:24:34 2014 +0100
[plugin.video.yousee.tv] updated to version 3.0.3
diff --git a/plugin.video.yousee.tv/addon.py b/plugin.video.yousee.tv/addon.py
index a3b2441..58f0f99 100644
--- a/plugin.video.yousee.tv/addon.py
+++ b/plugin.video.yousee.tv/addon.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2013 Tommy Winther
+# Copyright (C) 2014 Tommy Winther
# http://tommy.winther.nu
#
# This Program is free software; you can redistribute it and/or modify
@@ -47,6 +47,9 @@ class YouSeeTv(object):
xbmc.log("Caught exception while generating channel icons!")
for channel in channels:
+ if channel['encrypted']:
+ continue
+
iconImage = os.path.join(CACHE_PATH, str(channel['id']) + '.png')
if not os.path.exists(iconImage):
iconImage = channel['logos']['large']
diff --git a/plugin.video.yousee.tv/addon.xml b/plugin.video.yousee.tv/addon.xml
index 6fccc79..9e48a6a 100644
--- a/plugin.video.yousee.tv/addon.xml
+++ b/plugin.video.yousee.tv/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.yousee.tv" version="3.0.2" name="YouSee web-tv"
provider-name="twinther">
+<addon id="plugin.video.yousee.tv" version="3.0.3" name="YouSee web-tv"
provider-name="twinther">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.buggalo" version="1.1.5"/>
diff --git a/plugin.video.yousee.tv/changelog.txt
b/plugin.video.yousee.tv/changelog.txt
index d700fdf..e958101 100644
--- a/plugin.video.yousee.tv/changelog.txt
+++ b/plugin.video.yousee.tv/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 3.0.3 - 2014-03-07[/B]
+- Hide encrypted channels
+
[B]Version 3.0.2 - 2013-12-07[/B]
- Removed dependency on script.module.pil (seems to be removed in Gotham)
- Removed Cinema navigation
-----------------------------------------------------------------------
Summary of changes:
plugin.video.abcradionational/addon.xml | 2 +-
plugin.video.abcradionational/changelog.txt | 3 +-
.../resources/lib/abcradionational.py | 5 +-
plugin.video.peoplesvoice/addon.xml | 6 +-
plugin.video.peoplesvoice/changelog.txt | 2 +
plugin.video.peoplesvoice/default.py | 15 +-
.../resources/language/English/strings.xml | 13 +-
plugin.video.ted.talks/addon.xml | 3 +-
plugin.video.ted.talks/changelog.txt | 4 +
.../resources/lib/model/ClientForm.py | 3401 --------------------
.../resources/lib/model/favorites_scraper.py | 24 -
.../resources/lib/model/favorites_scraper_test.py | 36 -
.../resources/lib/model/fetcher.py | 13 +-
.../resources/lib/model/rss_scraper.py | 17 +-
.../resources/lib/model/speakers_scraper.py | 2 +-
.../resources/lib/model/themes_scraper_test.py | 2 +-
.../resources/lib/model/url_constants.py | 3 -
plugin.video.ted.talks/resources/lib/model/user.py | 52 -
.../resources/lib/model/user_test.py | 45 -
plugin.video.ted.talks/resources/lib/plugin.py | 3 +-
.../resources/lib/talkDownloader.py | 64 -
plugin.video.ted.talks/resources/lib/ted_talks.py | 43 +-
plugin.video.ted.talks/resources/settings.xml | 5 -
plugin.video.yousee.tv/addon.py | 5 +-
plugin.video.yousee.tv/addon.xml | 2 +-
plugin.video.yousee.tv/changelog.txt | 3 +
26 files changed, 71 insertions(+), 3702 deletions(-)
delete mode 100644 plugin.video.ted.talks/resources/lib/model/ClientForm.py
delete mode 100644
plugin.video.ted.talks/resources/lib/model/favorites_scraper.py
delete mode 100644
plugin.video.ted.talks/resources/lib/model/favorites_scraper_test.py
delete mode 100644 plugin.video.ted.talks/resources/lib/model/user.py
delete mode 100644 plugin.video.ted.talks/resources/lib/model/user_test.py
delete mode 100644 plugin.video.ted.talks/resources/lib/talkDownloader.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
