The branch, frodo has been updated
via 0cef127ee610fa025855cf8f0511db03ab21f9b9 (commit)
via ac6b9a7d76a520e58aad51a9c6d81d786bb8358a (commit)
from 902107ea213b7de2b0ff890d22f3607861d74846 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0cef127ee610fa025855cf8f0511db03ab21f9b9
commit 0cef127ee610fa025855cf8f0511db03ab21f9b9
Author: beenje <[email protected]>
Date: Wed May 1 18:37:51 2013 +0200
[plugin.video.irishtv] updated to version 2.0.10
diff --git a/plugin.video.irishtv/addon.xml b/plugin.video.irishtv/addon.xml
index 49cdb87..88cee51 100644
--- a/plugin.video.irishtv/addon.xml
+++ b/plugin.video.irishtv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.irishtv"
name="Irish TV"
- version="2.0.9"
+ version="2.0.10"
provider-name="mossy">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -17,7 +17,11 @@
<language>en</language>
<platform>all</platform>
<summary>Irish TV On Demand</summary>
- <description>Irish TV On Demand. RTE, TV3, AerTV, TG4</description>
- <disclaimer>May not work outside Ireland</disclaimer>
+ <description>Catchup with RTE, TV3, TG4 or watch live with
AerTV.</description>
+ <disclaimer>May not work outside Ireland</disclaimer>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+ <forum>http://forum.xbmc.org/showthread.php?tid=152897</forum>
+ <website>http://code.google.com/p/mossy-xbmc-repo/</website>
+
<source>http://code.google.com/p/plugin-video-irishtv/source/browse/</source>
</extension>
</addon>
diff --git a/plugin.video.irishtv/aertv.py b/plugin.video.irishtv/aertv.py
index 2df9da3..d8a3ee7 100644
--- a/plugin.video.irishtv/aertv.py
+++ b/plugin.video.irishtv/aertv.py
@@ -36,6 +36,7 @@ from provider import Provider
from brightcove import BrightCoveProvider
urlRoot = u"http://www.aertv.ie";
+apiRoot = u"http://api.aertv.ie";
c_brightcove = u"http://c.brightcove.com";
# Default values only used if we can't get the info from the net, e.g. only
used if we can't get the info from the net
@@ -69,23 +70,25 @@ class AerTVProvider(BrightCoveProvider):
def GetJSONPath(self):
epochTimeMS = int(round(time.time() * 1000.0))
- # POST /?callback=jQuery18208056761118918062_1358250191844 HTTP/1.1
- callbackToken = "/?callback=jQuery1820%s_%s" % (
random.randint(3000000, 90000000000), epochTimeMS)
+ # POST ?callback=jQuery18208056761118918062_1358250191844 HTTP/1.1
+ callbackToken = "?callback=jQuery1820%s_%s" % (
random.randint(3000000, 90000000000), epochTimeMS)
return callbackToken
def ShowRootMenu(self):
self.log(u"", xbmc.LOGDEBUG)
try:
- url = urlRoot + self.GetJSONPath()
- values = {'source':'ddl', 'length':'24', 'type':'basic'}
ddlJSONText = None
- ddlJSONText = self.httpManager.GetWebPage(url, 7200, values =
values)
-
- ddlJSONText = utils.extractJSON (ddlJSONText)
- ddlJSON = simplejson.loads(ddlJSONText)
-
epgJSON = None
+ values = {'api':'ddl', 'type':'basic'}
+ url = self.GetAPIUrl(values)
+
+ ddlJSONText = self.httpManager.GetWebPage(url, 7200)
+ ddlJSONText = utils.extractJSON(ddlJSONText)
+ ddlJSON = simplejson.loads(ddlJSONText)
+
+ values = {'api':'epg', 'type':'basic'}
+ url = self.GetAPIUrl(values)
epgJSON = self.GetEpgJSON(url)
return self.ShowChannelList(url, ddlJSON, epgJSON)
@@ -99,14 +102,23 @@ class AerTVProvider(BrightCoveProvider):
exception.addLogMessage(msg)
if epgJSON is not None:
- msg = "epgJSON:\n\n%s\n\n" % repr(epgJSON)
+ msg = "epgJSON:\n\n%s\n\n" % utils.drepr(epgJSON)
exception.addLogMessage(msg)
-
+
# Cannot show root menu
exception.addLogMessage(self.language(30010))
exception.process(severity = self.logLevel(xbmc.LOGERROR))
return False
+ def GetAPIUrl(self, parameters):
+ # {'api':'ddl', 'type':'basic'} => www.apiRoot.com/api/ddl/type/basic
+ url = apiRoot
+
+ for key in parameters:
+ url = url + '/' + key + '/' + parameters[key]
+
+ return url + self.GetJSONPath()
+
def ParseCommand(self, mycgi):
self.log(u"", xbmc.LOGDEBUG)
(channel, url) = mycgi.Params( u'channel', u'url')
@@ -316,13 +328,14 @@ class AerTVProvider(BrightCoveProvider):
def PlayChannel(self, channel, epgUrl):
try:
- url = urlRoot + self.GetJSONPath()
- values = {'source':'player', 'type':'name', 'val':channel}
+ jsonData = None
+ values = {'api':'player', 'type':'name', 'val':channel}
+ url = self.GetAPIUrl(values)
# "Getting channel information"
self.dialog.update(10, self.language(32730))
- jsonData = self.httpManager.GetWebPage(url, 20000, values = values)
-
+
+ jsonData = self.httpManager.GetWebPage(url, 20000)
jsonText = utils.extractJSON (jsonData)
playerJSON=simplejson.loads(jsonText)
self.log("json data:" + unicode(playerJSON))
@@ -426,8 +439,7 @@ class AerTVProvider(BrightCoveProvider):
def GetEpgJSON(self, url):
- values = {'source':'epg', 'length':'24', 'type':'basic',
'check_account' : ''}
- epgJSONText = self.httpManager.GetWebPage(url, 300, values = values)
+ epgJSONText = self.httpManager.GetWebPage(url, 300)
epgJSONText = utils.extractJSON (epgJSONText)
epgJSON = simplejson.loads(epgJSONText)
diff --git a/plugin.video.irishtv/changelog.txt
b/plugin.video.irishtv/changelog.txt
index a761eaa..ae5d830 100644
--- a/plugin.video.irishtv/changelog.txt
+++ b/plugin.video.irishtv/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.10
+- Fix root menu error in AerTV - due to changes in AerTV's API
+
Version 2.0.9
- Fix Now and Next times in AerTV. There is now a local time offset option in
the plugin settings for people in foreign timezones.
- Fix: TV3 RTMP streams now require verification
diff --git a/plugin.video.irishtv/resources/language/English/strings.po
b/plugin.video.irishtv/resources/language/English/strings.po
index 67fa252..db53e7d 100644
--- a/plugin.video.irishtv/resources/language/English/strings.po
+++ b/plugin.video.irishtv/resources/language/English/strings.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2013-03-15 22:51+0000\n"
+"POT-Creation-Date: 2013-04-16 15:44+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ac6b9a7d76a520e58aad51a9c6d81d786bb8358a
commit ac6b9a7d76a520e58aad51a9c6d81d786bb8358a
Author: beenje <[email protected]>
Date: Wed May 1 18:36:58 2013 +0200
[plugin.video.twit] updated to version 2.0.2
diff --git a/plugin.video.twit/addon.xml b/plugin.video.twit/addon.xml
index efd34ef..bbcb5aa 100644
--- a/plugin.video.twit/addon.xml
+++ b/plugin.video.twit/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.twit"
name="TWiT"
- version="2.0.1"
+ version="2.0.2"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -9,6 +9,7 @@
<import addon="script.common.plugin.cache" version="1.0.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
<import addon="script.module.pyamf" version="0.6.1"/>
+ <import addon="script.ircchat" version="1.0.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
<provides>audio video</provides>
diff --git a/plugin.video.twit/changelog.txt b/plugin.video.twit/changelog.txt
index cb5e1f2..f90d51d 100644
--- a/plugin.video.twit/changelog.txt
+++ b/plugin.video.twit/changelog.txt
@@ -1,3 +1,8 @@
+Version 2.0.2
+fix new shows, this week in youtube, omgcraft
+added support for IrcChat addon when watching twit live
+added add-on setting for setting the view mode for episodes
+
Version 2.0.1
fix ustream live stream
diff --git a/plugin.video.twit/default.py b/plugin.video.twit/default.py
index a08e46d..abf82fe 100644
--- a/plugin.video.twit/default.py
+++ b/plugin.video.twit/default.py
@@ -20,7 +20,7 @@ addon_version = addon.getAddonInfo('version')
home = xbmc.translatePath(addon.getAddonInfo('path'))
fanart = os.path.join(home, 'fanart.jpg')
icon = os.path.join(home, 'icon.png')
-live_icon = os.path.join(home, 'resources', 'live.png')
+live_icon = 'http://twit-xbmc.googlecode.com/svn/images/live_icon.png'
cache = StorageServer.StorageServer("twit", 2)
debug = addon.getSetting('debug')
first_run = addon.getSetting('first_run')
@@ -98,7 +98,8 @@ def get_shows(shows):
cache_shows = eval(cache.cacheFunction(shows_cache, shows))
if not cache_shows:
addon_log('shows_cache FAILED')
- for i in shows.keys():
+ items = sorted(shows.keys(), key=str.lower)
+ for i in items:
if i == 'Radio Leo': continue
addDir(i, shows[i]['show_url'], 1, shows[i]['thumb'],
shows[i]['description'])
@@ -107,7 +108,10 @@ def index(url,iconimage):
soup = BeautifulSoup(make_request(url),
convertEntities=BeautifulSoup.HTML_ENTITIES)
items = soup.findAll('div', attrs={'id' : "primary"})[0]('div',
attrs={'class' : 'field-content'})
for i in items:
- url = i.a['href']
+ try:
+ url = i.a['href']
+ except TypeError:
+ continue
if url.startswith('http://twit.tv/show/'):
name = i.a.string.encode('ascii', 'ignore')
try:
@@ -316,6 +320,9 @@ def addLink(name,url,description,date,mode,iconimage):
liz.setInfo(type="Video", infoLabels={"Title": name,
"Plot":description, "Aired": date, "episode": episode})
liz.setProperty("Fanart_Image", fanart)
liz.setProperty('IsPlayable', 'true')
+ if name == __language__(30001):
+ contextMenu = [('Run IrcChat',
"RunPlugin(plugin://plugin.video.twit/?mode=5)")]
+ liz.addContextMenuItems(contextMenu)
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz)
return ok
@@ -331,14 +338,67 @@ def addDir(name,url,mode,iconimage,description=None):
return ok
+def run_ircchat():
+ # check_chat_args
+ nickname = addon.getSetting('nickname')
+ username = addon.getSetting('username')
+ try:
+ ok = nickname
+ if ok is None or ok == '': raise
+ ok = username
+ if ok is None or ok == '': raise
+ except:
+ xbmc.executebuiltin("XBMC.Notification(%s, %s,10000,%s)"
+ %('IrcChat', language(30024), icon))
+ addon.openSettings()
+ nickname = addon.getSetting('nickname')
+ username = addon.getSetting('username')
+ try:
+ ok = nickname
+ if ok is None or ok == '': raise
+ ok = username
+ if ok is None or ok == '': raise
+ except:
+ return
+ # run ircchat script
+ xbmc.executebuiltin(
+ "RunScript(script.ircchat,
run_irc=True&nickname=%s&username=%s&password=%s&host=irc.twit.tv&channel=twitlive)"
+ %(nickname, username, addon.getSetting('password'))
+ )
+
+
+def setViewMode():
+ if not addon.getSetting('view_mode') == "0":
+ try:
+ if addon.getSetting('view_mode') == "1": # List
+ xbmc.executebuiltin('Container.SetViewMode(502)')
+ elif addon.getSetting('view_mode') == "2": # Big List
+ xbmc.executebuiltin('Container.SetViewMode(51)')
+ elif addon.getSetting('view_mode') == "3": # Thumbnails
+ xbmc.executebuiltin('Container.SetViewMode(500)')
+ elif addon.getSetting('view_mode') == "4": # Poster Wrap
+ xbmc.executebuiltin('Container.SetViewMode(501)')
+ elif addon.getSetting('view_mode') == "5": # Fanart
+ xbmc.executebuiltin('Container.SetViewMode(508)')
+ elif addon.getSetting('view_mode') == "6": # Media info
+ xbmc.executebuiltin('Container.SetViewMode(504)')
+ elif addon.getSetting('view_mode') == "7": # Media info 2
+ xbmc.executebuiltin('Container.SetViewMode(503)')
+ elif addon.getSetting('view_mode') == "8": # Media info 3
+ xbmc.executebuiltin('Container.SetViewMode(515)')
+ except:
+ addon_log("SetViewMode Failed: "+addon.getSetting('view_mode'))
+ addon_log("Skin: "+xbmc.getSkinDir())
+
+
if debug == 'true':
cache.dbg = True
-if first_run == 'true':
+if first_run != addon_version:
cache_shows_file()
addon_log('first_run, caching shows file')
xbmc.sleep(1000)
- addon.setSetting('first_run', 'false')
+ addon.setSetting('first_run', addon_version)
params=get_params()
url=None
@@ -393,6 +453,7 @@ if mode==None:
elif mode==1:
index(url,iconimage)
xbmcplugin.setContent(int(sys.argv[1]), 'episodes')
+ setViewMode()
xbmcplugin.endOfDirectory(int(sys.argv[1]))
elif mode==2:
@@ -400,8 +461,14 @@ elif mode==2:
elif mode==3:
twit_live()
+ xbmc.sleep(1000)
+ if addon.getSetting('run_chat') == 'true':
+ run_ircchat()
elif mode==4:
get_latest_episodes()
xbmcplugin.setContent(int(sys.argv[1]), 'episodes')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+elif mode==5:
+ run_ircchat()
diff --git a/plugin.video.twit/resources/language/English/strings.xml
b/plugin.video.twit/resources/language/English/strings.xml
index 02d195b..04b3265 100644
--- a/plugin.video.twit/resources/language/English/strings.xml
+++ b/plugin.video.twit/resources/language/English/strings.xml
@@ -20,5 +20,19 @@
<string id="30017">Video (low/mobile) 640x368 Bitrate 256</string>
<string id="30018">Audio</string>
<string id="30019">Add-on Debugging</string>
- <string id="30020"></string>
+ <string id="30020">Run IrcChat when TWiT Live is started</string>
+ <string id="30021">Chat Nickname</string>
+ <string id="30022">Chat User Name</string>
+ <string id="30023">Password</string>
+ <string id="30024">Nickname and User Name are required</string>
+ <string id="30025">Set View Mode For Episodes</string>
+ <string id="30026">Default</string>
+ <string id="30027">List</string>
+ <string id="30028">Big List</string>
+ <string id="30029">Thumbnail</string>
+ <string id="30030">Poster Wrap</string>
+ <string id="30031">Fanart</string>
+ <string id="30032">Media Info</string>
+ <string id="30033">Media Info 2</string>
+ <string id="30034">Media Info 3</string>
</strings>
\ No newline at end of file
diff --git a/plugin.video.twit/resources/settings.xml
b/plugin.video.twit/resources/settings.xml
index fc94a39..d9e3120 100644
--- a/plugin.video.twit/resources/settings.xml
+++ b/plugin.video.twit/resources/settings.xml
@@ -1,6 +1,15 @@
<settings>
- <setting id="playback" type="enum" lvalues="30015|30016|30017|30018"
label="30014" default="1" />
- <setting id="twit_live" label="30001" type="select"
lvalues="30003|30004|30005|30006|30007|30008|30009|30010|30011|30012|30013"
default="4" />
- <setting id="debug" type="bool" label="30019" default="false" />
- <setting id="first_run" type="bool" visible="false" default="true" />
+ <category label="General">
+ <setting id="playback" type="enum" lvalues="30015|30016|30017|30018"
label="30014" default="1" />
+ <setting id="debug" type="bool" label="30019" default="false" />
+ <setting id="view_mode" type="enum" label="30025"
lvalues="30026|30027|30028|30029|30030|30031|30032|30033|30034" default="8" />
+ <setting id="first_run" type="text" visible="false" default="true" />
+ </category>
+ <category label="30001">
+ <setting id="twit_live" label="30001" type="select"
lvalues="30003|30004|30005|30006|30007|30008|30009|30010|30011|30012|30013"
default="4" />
+ <setting id="run_chat" type="bool" label="30020" default="false" />
+ <setting id="nickname" type="text" label="30021" default="" />
+ <setting id="username" type="text" label="30022" default="" />
+ <setting id="password" type="text" label="30023" default=""
option="hidden" />
+ </category>
</settings>
\ No newline at end of file
diff --git a/plugin.video.twit/resources/shows
b/plugin.video.twit/resources/shows
index db7b478..83b1812 100644
--- a/plugin.video.twit/resources/shows
+++ b/plugin.video.twit/resources/shows
@@ -1 +1 @@
-{'Ham Nation': {'show_url': 'http://twit.tv/show/ham-nation', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/hn600.jpg', 'description': u'Bob
Heil, with various co-hosts and guests, will cover the excitement and
importance of ham radio - from tossing an antenna wire in a tree allowing you
to talk to the world, to the importance of ham radio operators in time of
disasters.Recordsliveevery Wednesday at 6:00pm PT/9:00pm ET.'}, 'The Giz Wiz':
{'show_url': 'http://twit.tv/show/weekly-daily-giz-wiz', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/dgw600.jpg', 'description': u"MAD's
maddest writer and The Giz Wiz,Dick DeBartolo, showcases useful, unique and
sometimes silly gadgets and gizmos from his studio, his warehouse, trade shows,
and even from those late night TV ads. He's joined by co-host Leo
Laporte.Recordsliveevery Tuesday at 2:00pm PT/5:00pm ET.Bandwidth provided
byAOL."}, 'This Week in Tech': {'show_url':
'http://twit.tv/show/this-week-in-tech', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/twit600.jpg', 'description': u'Your
first podcast of the week is the last word in tech. Join the top tech pundits
in a roundtable discussion of the latest trends in high tech.Recordsliveevery
Sunday at 3:00pm PT/6:00pm ET.Bandwidth is provided by Winamp,winamp.com,
andCachefly.'}, 'NSFW': {'show_url': 'http://twit.tv/show/nsfw', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/nsfw600.jpg', 'description':
u'Magician and scam artist Brian Brushwood teams with sidekick Justin Robert
Young for a weekly irreverent fun fest featuring unusual guests, bizarre games,
and strange and wonderful tales.Recordsliveevery Tuesday at 7:00pm PT/10:00pm
ET.'}, 'Security Now': {'show_url': 'http://twit.tv/show/security-now',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/sn600.jpg', 'description':
u'Steve Gibson, the man who coined the term spyware and created the first
anti-spyware program, creator ofSpinriteandShieldsUP, discusses the hot topics
in security today with Leo Laporte.Recordsliveevery Wednesday at 11:00am
PT/2:00pm ET.Bandwidth is provided byWinampandCachefly.'}, 'This Week in
Enterprise Tech': {'show_url':
'http://twit.tv/show/this-week-in-enterprise-tech', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/twiet600.jpg', 'description':
u'This Week in Enterprise Tech explores the complex, cutting edge world of
enterprise technology. Hosted by Father Robert Ballecer, aka Friar Tech, TWiET
features IT professionals explaining the ins and outs of enterprise
solutions.RecordsliveMondays at 12:00pm PT/3:00pm ET.'}, 'This Week In Computer
Hardware': {'show_url': 'http://twit.tv/show/this-week-in-computer-hardware',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/twich600.png',
'description': u"Building a new computer? This Week in Computer Hardware is the
show where you'll find out the latest in motherboards, CPUs, GPUs, and RAM
you'll want to use when designing your machine. TWiCH gives you the latest in
hardware benchmarks and what not-yet-released products might be on the horizon.
Hosted by Ryan Shrout of PC Perspective and Patrick Norton.Contact TWiCH
[email protected] Thursday at 6:00pm PT/9:00pm ET."}, 'Radio
Leo': {'show_url': 'http://twit.tv/show/radio-leo', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/nsfw600.jpg', 'description': u"A
compendium of netcasts from the Chief TWiT, Leo Laporte.This feed includes all
of Leo's audio releases and often includes his appearances on other netcasts.
One feed to serve them all.Individual episodes will not appear on this page.
You must subscribe to the feed in a podcast client using the dropdown on the
left."}, 'iPad Today': {'show_url': 'http://twit.tv/show/ipad-today', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ipad600.jpg', 'description': u'Tech
geeks Leo Laporte and Sarah Lane love their iPads so much, they\'ve created
"iPad Today," the TWiT network\'s first show highlighting the best apps, most
helpful tools, coolest tricks, and essential news surrounding the iPad
revolution. "iPad Today" is smart, informative, and lots of fun.Contact iPad
Today [email protected] 757-504-IPAD (4723).Recordsliveevery Thursday at
1:00pm PT/4:00pm ET.'}, 'Before You Buy': {'show_url':
'http://twit.tv/show/before-you-buy', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/byb600.jpg', 'description':
u'Before You Buy is a product reviews show on the TWiT Network. TWiT staff get
together to test out the latest gadgets--everything from phones to cameras--to
help consumers make wise buying decisions. Make sure you watch... Before You
Buy!Send feedback [email protected] subscribe to @bybreviews on Twitter for the
latest updates. For individual reviews on YouTube, please go
toyoutube.com/twitand look for the BYB Full Reviews channel.'},
'Triangulation': {'show_url': 'http://twit.tv/show/triangulation', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/tri600.jpg', 'description': u'Every
week Leo talks to the smartest people in the world about the most important
topics in technology.Recordsliveevery Wednesday at 3:00pm PT/6:00pm ET.'},
'This Week in Law': {'show_url': 'http://twit.tv/show/this-week-in-law',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/twil600.jpg',
'description': u'JoinDenise Howelland the TWiL panel as they discuss breaking
issues in technology law including patents, copyrights, and
more.Recordsliveevery Friday at 11:00am PT/2:00pm ET.Bandwidth provided
byCachefly.'}, 'FLOSS Weekly': {'show_url': 'http://twit.tv/show/floss-weekly',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/floss600.jpg',
'description': u"We're not talking dentistry here; FLOSS all about Free Libre
Open Source Software. Join hostRandal Schwartzand his rotating panel of
co-hosts every Wednesday as they talk with the most interesting and important
people in the Open Source and Free Software community. Take a peek at
theupcoming guests.Recordsliveevery Wednesday at 8:30am PT/11:30pm ET.Thanks
toCacheflyfor providing the bandwidth for this podcast."}, 'Tech News Today':
{'show_url': 'http://twit.tv/show/tech-news-today', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/tnt600.jpg', 'description': u'Tom
Merritt brings you "Tech News Today" with co-hosts Sarah Lane (TechTV,
Revision3), Iyaz Akhtar (PC Mag, TechVi) and others. Get up to speed, with a
fun and friendly ride through the need-to-know tech news of the day.Your calls
and emails welcome at 260-TNT-SHOW [email protected] weekday at
10:00am PT/1:00pm ET.'}, 'This Week in Google': {'show_url':
'http://twit.tv/show/this-week-in-google', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/twig600.jpg', 'description': u'Leo
Laporte, Gina Trapani, Jeff Jarvis and their guests talk about the latest
Google and cloud computing news.Recordsliveevery Wednesday at 1:00pm PT/4:00pm
ET.'}, 'MacBreak Weekly': {'show_url': 'http://twit.tv/show/macbreak-weekly',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/mbw600.jpg',
'description': u'Get the latest Apple news and views from the top names in Mac,
iPhone, iPod, and iPad journalism.Recordsliveevery Tuesday at 11:00am PT/2:00pm
ET.Bandwidth is provided byWinampandCachefly.'}, 'All About Android':
{'show_url': 'http://twit.tv/show/all-about-android', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/aaa600.jpg', 'description': u"All
About Android delivers everything you want to know about Android each week--the
biggest news, freshest hardware, best apps and geekiest how-to's--with Android
enthusiasts Jason Howell, Gina Trapani, Ron Richards, and a variety of special
guests along the way.Viewers have a voice by sending emails [email protected]
calling 347-SHOW-AAA.Recordsliveevery Tuesday at 5:00pm PT/8:00pm ET."}, 'iFive
for the iPhone': {'show_url': 'http://twit.tv/show/ifive-iphone', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ifive600.jpg', 'description':
u'iFive for the iPhone is your top five list of the best the iPhone has to
offer. Find the hottest new apps and learn helpful tricks to get the most out
of your iPhone. Hosted by Sarah Lane, this fast-paced show will make you an
iPhone master in no time.RecordsliveMondays at 11:00am PT/2:00pm ET.'}, 'Know
How...': {'show_url': 'http://twit.tv/show/know-how', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/kh600.jpg', 'description': u'Get
the know how to make technology work for you. Iyaz Akhtar and Leo Laporte show
you tech projects that you can do yourself and explain everything from tech
basics to advanced techniques.Send your questions and suggestions
[email protected] leave a voicemail at 408-800-KNOW.Records live every
Thursday at 3:00pm PT/6:00pm ET.'}, 'The Social Hour': {'show_url':
'http://twit.tv/show/the-social-hour', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/tsh600.jpg', 'description':
u'Social web addicts Sarah Lane and Amber MacArthur have teamed up to create
"The Social Hour," your source for the best social tools, news, and fascinating
folks building the next generation of the Internet.Contact The Social Hour
[email protected] 2626-SOCIAL (262-676-2425).Recordsliveevery Friday at
1:00pm PT/4:00pm ET.'}, 'Windows Weekly': {'show_url':
'http://twit.tv/show/windows-weekly', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ww600.jpg', 'description': u'A
weekly look at all things Microsoft, including Windows, Windows Phone, Office,
Xbox, and more, from two of the foremost Windows watchers in the world, Paul
Thurrott of theSuper Site for Windowsand Mary Jo Foley ofAll About
Microsoft.Recordsliveevery Thursday at 11:00am PT/2:00pm ET.Bandwidth is
provided byCachefly.'}, 'Frame Rate': {'show_url':
'http://twit.tv/show/frame-rate', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/fr600.jpg', 'description': u'The
best ways to watch Internet TV and the best stuff to watch. Tom Merritt and
Brian Brushwood scour everything from Hollywood to Hackers to help you get
closer to cutting the cord.Contact Frame Rate
[email protected] Monday at 3:30pm PT/6:30pm ET.'}, 'The
Tech Guy': {'show_url': 'http://twit.tv/show/the-tech-guy', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ttg600.jpg', 'description': u'No
one does a better job of explaining technology, computers, and the Internet
than Leo Laporte. This feed contains the full audio of his twice weekly radio
talk show as heard on stations all over the US on the Premiere Radio Networks
and XM Satellite Channel 166.For show notes and more
visittechguylabs.com.Recordsliveweekends at 11:00am PT/2:00pm ET.'}, 'Home
Theater Geeks': {'show_url': 'http://twit.tv/show/home-theater-geeks', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/htg600.jpg', 'description': u"Scott
Wilkinson, online editor at HomeTheaterHiFi.com, interviews the leaders and
pioneers behind today's home theater technology. Scott is a regular on The Tech
Guy with Leo Laporte, and here he explores the technologies behind your
screen.Recordsliveevery Monday at 2:00pm PT/5:00pm ET."}, 'TWiT Live Specials':
{'show_url': 'http://twit.tv/show/twit-live-specials', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/specials600.jpg', 'description':
u'Leo Laporte and the TWiTs go off the beaten path to bring you non-standard
shows from the network, including live-on-location events, special interviews,
shows in beta, and geek conference expeditions. Broadcast live
athttp://twit.tv.'}}
\ No newline at end of file
+{'Ham Nation': {'show_url': 'http://twit.tv/show/ham-nation', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/hn600.jpg', 'description': u'Bob
Heil, with various co-hosts and guests, will cover the excitement and
importance of ham radio - from tossing an antenna wire in a tree allowing you
to talk to the world, to the importance of ham radio operators in time of
disasters.Recordsliveevery Wednesday at 6:00pm PT/9:00pm ET.'}, 'The Giz Wiz':
{'show_url': 'http://twit.tv/show/weekly-daily-giz-wiz', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/dgw600.jpg', 'description': u"MAD's
maddest writer and The Giz Wiz,Dick DeBartolo, showcases useful, unique and
sometimes silly gadgets and gizmos from his studio, his warehouse, trade shows,
and even from those late night TV ads. He's joined by co-host Leo
Laporte.Recordsliveevery Tuesday at 2:00pm PT/5:00pm ET.Bandwidth provided
byAOL."}, 'This Week in Tech': {'show_url':
'http://twit.tv/show/this-week-in-tech', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/twit600.jpg', 'description': u'Your
first podcast of the week is the last word in tech. Join the top tech pundits
in a roundtable discussion of the latest trends in high tech.Recordsliveevery
Sunday at 3:00pm PT/6:00pm ET.Bandwidth is provided by Winamp,winamp.com,
andCachefly.'}, 'NSFW': {'show_url': 'http://twit.tv/show/nsfw', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/nsfw600.jpg', 'description':
u'Magician and scam artist Brian Brushwood teams with sidekick Justin Robert
Young for a weekly irreverent fun fest featuring unusual guests, bizarre games,
and strange and wonderful tales.Recordsliveevery Tuesday at 7:00pm PT/10:00pm
ET.'}, 'Security Now': {'show_url': 'http://twit.tv/show/security-now',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/sn600.jpg', 'description':
u'Steve Gibson, the man who coined the term spyware and created the first
anti-spyware program, creator ofSpinriteandShieldsUP, discusses the hot topics
in security today with Leo Laporte.Recordsliveevery Wednesday at 11:00am
PT/2:00pm ET.Bandwidth is provided byWinampandCachefly.'}, 'This Week in
Enterprise Tech': {'show_url':
'http://twit.tv/show/this-week-in-enterprise-tech', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/twiet600.jpg', 'description':
u'This Week in Enterprise Tech explores the complex, cutting edge world of
enterprise technology. Hosted by Father Robert Ballecer, aka Friar Tech, TWiET
features IT professionals explaining the ins and outs of enterprise
solutions.RecordsliveMondays at 12:00pm PT/3:00pm ET.'}, 'This Week In Computer
Hardware': {'show_url': 'http://twit.tv/show/this-week-in-computer-hardware',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/twich600.png',
'description': u"Building a new computer? This Week in Computer Hardware is the
show where you'll find out the latest in motherboards, CPUs, GPUs, and RAM
you'll want to use when designing your machine. TWiCH gives you the latest in
hardware benchmarks and what not-yet-released products might be on the horizon.
Hosted by Ryan Shrout of PC Perspective and Patrick Norton.Contact TWiCH
[email protected] Thursday at 6:00pm PT/9:00pm ET."}, 'Radio
Leo': {'show_url': 'http://twit.tv/show/radio-leo', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/nsfw600.jpg', 'description': u"A
compendium of netcasts from the Chief TWiT, Leo Laporte.This feed includes all
of Leo's audio releases and often includes his appearances on other netcasts.
One feed to serve them all.Individual episodes will not appear on this page.
You must subscribe to the feed in a podcast client using the dropdown on the
left."}, 'iPad Today': {'show_url': 'http://twit.tv/show/ipad-today', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ipad600.jpg', 'description': u'Tech
geeks Leo Laporte and Sarah Lane love their iPads so much, they\'ve created
"iPad Today," the TWiT network\'s first show highlighting the best apps, most
helpful tools, coolest tricks, and essential news surrounding the iPad
revolution. "iPad Today" is smart, informative, and lots of fun.Contact iPad
Today [email protected] 757-504-IPAD (4723).Recordsliveevery Thursday at
1:00pm PT/4:00pm ET.'}, 'Before You Buy': {'show_url':
'http://twit.tv/show/before-you-buy', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/byb600.jpg', 'description':
u'Before You Buy is a product reviews show on the TWiT Network. TWiT staff get
together to test out the latest gadgets--everything from phones to cameras--to
help consumers make wise buying decisions. Make sure you watch... Before You
Buy!Send feedback [email protected] subscribe to @bybreviews on Twitter for the
latest updates. For individual reviews on YouTube, please go
toyoutube.com/twitand look for the BYB Full Reviews channel.'},
'Triangulation': {'show_url': 'http://twit.tv/show/triangulation', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/tri600.jpg', 'description': u'Every
week Leo talks to the smartest people in the world about the most important
topics in technology.Recordsliveevery Wednesday at 3:00pm PT/6:00pm ET.'},
'This Week in Law': {'show_url': 'http://twit.tv/show/this-week-in-law',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/twil600.jpg',
'description': u'JoinDenise Howelland the TWiL panel as they discuss breaking
issues in technology law including patents, copyrights, and
more.Recordsliveevery Friday at 11:00am PT/2:00pm ET.Bandwidth provided
byCachefly.'}, 'iFive for the iPhone': {'show_url':
'http://twit.tv/show/ifive-iphone', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ifive600.jpg', 'description':
u'iFive for the iPhone is your top five list of the best the iPhone has to
offer. Find the hottest new apps and learn helpful tricks to get the most out
of your iPhone. Hosted by Sarah Lane, this fast-paced show will make you an
iPhone master in no time.RecordsliveMondays at 11:00am PT/2:00pm ET.'}, 'Tech
News Today': {'show_url': 'http://twit.tv/show/tech-news-today', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/tnt600.jpg', 'description': u'Tom
Merritt brings you "Tech News Today" with co-hosts Sarah Lane (TechTV,
Revision3), Iyaz Akhtar (PC Mag, TechVi) and others. Get up to speed, with a
fun and friendly ride through the need-to-know tech news of the day.Your calls
and emails welcome at 260-TNT-SHOW [email protected] weekday at
10:00am PT/1:00pm ET.'}, 'FLOSS Weekly': {'show_url':
'http://twit.tv/show/floss-weekly', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/floss600.jpg', 'description':
u"We're not talking dentistry here; FLOSS all about Free Libre Open Source
Software. Join hostRandal Schwartzand his rotating panel of co-hosts every
Wednesday as they talk with the most interesting and important people in the
Open Source and Free Software community. Take a peek at theupcoming
guests.Recordsliveevery Wednesday at 8:30am PT/11:30pm ET.Thanks toCacheflyfor
providing the bandwidth for this podcast."}, 'MacBreak Weekly': {'show_url':
'http://twit.tv/show/macbreak-weekly', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/mbw600.jpg', 'description': u'Get
the latest Apple news and views from the top names in Mac, iPhone, iPod, and
iPad journalism.Recordsliveevery Tuesday at 11:00am PT/2:00pm ET.Bandwidth is
provided byWinampandCachefly.'}, 'This Week in Google': {'show_url':
'http://twit.tv/show/this-week-in-google', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/twig600.jpg', 'description': u'Leo
Laporte, Gina Trapani, Jeff Jarvis and their guests talk about the latest
Google and cloud computing news.Recordsliveevery Wednesday at 1:00pm PT/4:00pm
ET.'}, 'All About Android': {'show_url':
'http://twit.tv/show/all-about-android', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/aaa600.jpg', 'description': u"All
About Android delivers everything you want to know about Android each week--the
biggest news, freshest hardware, best apps and geekiest how-to's--with Android
enthusiasts Jason Howell, Gina Trapani, Ron Richards, and a variety of special
guests along the way.Viewers have a voice by sending emails [email protected]
calling 347-SHOW-AAA.Recordsliveevery Tuesday at 5:00pm PT/8:00pm ET."}, 'Know
How...': {'show_url': 'http://twit.tv/show/know-how', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/kh600.jpg', 'description': u'Get
the know how to make technology work for you. Iyaz Akhtar and Leo Laporte show
you tech projects that you can do yourself and explain everything from tech
basics to advanced techniques.Send your questions and suggestions
[email protected] leave a voicemail at 408-800-KNOW.Records live every
Thursday at 3:00pm PT/6:00pm ET.'}, 'The Social Hour': {'show_url':
'http://twit.tv/show/the-social-hour', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/tsh600.jpg', 'description':
u'Social web addicts Sarah Lane and Amber MacArthur have teamed up to create
"The Social Hour," your source for the best social tools, news, and fascinating
folks building the next generation of the Internet.Contact The Social Hour
[email protected] 2626-SOCIAL (262-676-2425).Recordsliveevery Friday at
1:00pm PT/4:00pm ET.'}, 'Windows Weekly': {'show_url':
'http://twit.tv/show/windows-weekly', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/ww600.jpg', 'description': u'A
weekly look at all things Microsoft, including Windows, Windows Phone, Office,
Xbox, and more, from two of the foremost Windows watchers in the world, Paul
Thurrott of theSuper Site for Windowsand Mary Jo Foley ofAll About
Microsoft.Recordsliveevery Thursday at 11:00am PT/2:00pm ET.Bandwidth is
provided byCachefly.'}, 'OMGcraft': {'show_url':
'http://twit.tv/show/omgcraft', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/omgcraft600.jpg', 'description':
u'OMGcraft is your one-stop-shop for everything Minecraft. Discover the big new
tips, tricks, and stuff you should know about Minecraft. Hosted by Chad
Johnson, this show will make you a Minecraft expert in no time.'}, 'Frame
Rate': {'show_url': 'http://twit.tv/show/frame-rate', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/fr600.jpg', 'description': u'The
best ways to watch Internet TV and the best stuff to watch. Tom Merritt and
Brian Brushwood scour everything from Hollywood to Hackers to help you get
closer to cutting the cord.Contact Frame Rate
[email protected] Monday at 3:30pm PT/6:30pm ET.'}, 'This
Week in YouTube': {'show_url': 'http://twit.tv/show/this-week-in-youtube',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/yt600.jpg', 'description':
u'This Week in YouTube explores the world of online viral video, including
news, trends, and even production tips.Hosted by Lamarr Wilson, your favorite
YouTube Comedic Vlogger, Chad Johnson, the host of Minecraft gaming show
OMGcraft, and Leo Laporte, the Chief TWiT.The show records live Sundays at 2pm
PT / 5pm ET'}, 'The Tech Guy': {'show_url': 'http://twit.tv/show/the-tech-guy',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/ttg600.jpg',
'description': u'No one does a better job of explaining technology, computers,
and the Internet than Leo Laporte. This feed contains the full audio of his
twice weekly radio talk show as heard on stations all over the US on the
Premiere Radio Networks and XM Satellite Channel 166.For show notes and more
visittechguylabs.com.Recordsliveweekends at 11:00am PT/2:00pm ET.'}, 'Home
Theater Geeks': {'show_url': 'http://twit.tv/show/home-theater-geeks', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/htg600.jpg', 'description': u"Scott
Wilkinson, online editor at HomeTheaterHiFi.com, interviews the leaders and
pioneers behind today's home theater technology. Scott is a regular on The Tech
Guy with Leo Laporte, and here he explores the technologies behind your
screen.Recordsliveevery Monday at 2:00pm PT/5:00pm ET."}, 'TWiT Live Specials':
{'show_url': 'http://twit.tv/show/twit-live-specials', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/specials600.jpg', 'description':
u'Leo Laporte and the TWiTs go off the beaten path to bring you non-standard
shows from the network, including live-on-location events, special interviews,
shows in beta, and geek conference expeditions. Broadcast live
athttp://twit.tv.'}}
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.irishtv/addon.xml | 10 ++-
plugin.video.irishtv/aertv.py | 46 ++++++++-----
plugin.video.irishtv/changelog.txt | 3 +
.../resources/language/English/strings.po | 2 +-
plugin.video.twit/addon.xml | 3 +-
plugin.video.twit/changelog.txt | 5 ++
plugin.video.twit/default.py | 77 ++++++++++++++++++--
.../resources/language/English/strings.xml | 16 ++++-
plugin.video.twit/resources/live.png | Bin 14425 -> 0 bytes
plugin.video.twit/resources/settings.xml | 17 ++++-
plugin.video.twit/resources/shows | 2 +-
11 files changed, 148 insertions(+), 33 deletions(-)
delete mode 100644 plugin.video.twit/resources/live.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
