The branch, frodo has been updated
       via  96ef1598021de633d587b5b3a8dd0112da8af3d3 (commit)
       via  68ed783a5e9ec5aa38c0dda66ccd7215c77f3371 (commit)
       via  d91fe5045d399d6b9dbf14f7e12b2c51462c1c69 (commit)
       via  16cb8d2cb91ba7f9bda5902ef8afbe3b055abb47 (commit)
      from  83ef7583020996425860d708b8bf95dcb69d8948 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=96ef1598021de633d587b5b3a8dd0112da8af3d3

commit 96ef1598021de633d587b5b3a8dd0112da8af3d3
Author: M. Kaijser <mcm.kaij...@gmail.com>
Date:   Tue Jul 23 13:49:23 2013 +0200

    [plugin.video.manoto] 1.0.8

diff --git a/plugin.video.manoto/addon.xml b/plugin.video.manoto/addon.xml
index 9e1e4a3..ec9d511 100755
--- a/plugin.video.manoto/addon.xml
+++ b/plugin.video.manoto/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <addon id="plugin.video.manoto"

        name="Manoto TV"

-       version="1.0.7"

+       version="1.0.8"

        provider-name="babak">

   <requires>

     <import addon="xbmc.python" version="2.1.0"/>

diff --git a/plugin.video.manoto/default.py b/plugin.video.manoto/default.py
index 6c04a20..880df60 100644
--- a/plugin.video.manoto/default.py
+++ b/plugin.video.manoto/default.py
@@ -42,8 +42,6 @@ def getStreamsFromPlayList(playlist):
                print("HTTP error trying to open playlist")
                return None
         
-        # store the base URI from the playlist
-        prefix=playlist[0:string.rfind(playlist,'/') + 1]
         lines = string.split(resp.read(), '\n')
 
         # parse the playlist file
@@ -62,7 +60,7 @@ def getStreamsFromPlayList(playlist):
                        bandwidth = line[idx + 10:len(line)].strip()
                elif len(line) > 0 and len(bandwidth) > 0:
                        # add the playlist
-                       streams[bandwidth] = (prefix + line).strip()
+                       streams[bandwidth] = line.strip()
 
        return streams
 

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=68ed783a5e9ec5aa38c0dda66ccd7215c77f3371

commit 68ed783a5e9ec5aa38c0dda66ccd7215c77f3371
Author: M. Kaijser <mcm.kaij...@gmail.com>
Date:   Tue Jul 23 13:42:00 2013 +0200

    [plugin.video.attactv] 1.1.2

diff --git a/plugin.video.attactv/addon.xml b/plugin.video.attactv/addon.xml
index bf44b44..8253ee3 100644
--- a/plugin.video.attactv/addon.xml
+++ b/plugin.video.attactv/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.attactv" name="attac tv" version="1.1.1" 
provider-name="jamontes">
+<addon id="plugin.video.attactv" name="attac tv" version="1.1.2" 
provider-name="Jose Antonio Montes (jamontes)">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="plugin.video.youtube" version="4.4.1"/>
diff --git a/plugin.video.attactv/changelog.txt 
b/plugin.video.attactv/changelog.txt
index 5f875a5..5d8ff9c 100644
--- a/plugin.video.attactv/changelog.txt
+++ b/plugin.video.attactv/changelog.txt
@@ -1,3 +1,5 @@
+1.1.2 (2013.07.21)
+- Modified video parser due to Dailymotion site changes.
 1.1.1
 - Added Add-on optional tags and forum support thread.
 - Fix for default language settings on first run.
diff --git a/plugin.video.attactv/default.py b/plugin.video.attactv/default.py
index c010ce6..6dc20a0 100644
--- a/plugin.video.attactv/default.py
+++ b/plugin.video.attactv/default.py
@@ -93,7 +93,7 @@ def main_list(params):
     videolist = lutil.find_multiple(buffer_web,pattern_videos)
 
     for url, title, thumbnail in videolist:
-        title = title.replace('&quot;', '"').replace('&#039;', '´')  # 
Cleanup the title.
+        title = title.replace('&quot;', '"').replace('&#039;', 
'´').replace('&amp;', '&')  # Cleanup the title.
         lutil.log('Videolist: URL: "%s" Title: "%s" Thumbnail: "%s"' % (url, 
title, thumbnail))
         
         plot = title # The description only appears when we load the link, so 
a this point we copy the description with the title content.
@@ -221,15 +221,14 @@ def get_playable_kontexttv_url(html):
 
 # This function try to get a Dailymotion playable URL from the weblink and 
returns it reay to play it directly.
 def get_playable_dailymotion_url(html):
-    pattern_dailymotion = ' 
src="http://www.dailymotion.com/embed/video/([^"]*?)"'
-    #pattern_daily_video = '"hd720URL":"(.+?)"'
-    pattern_daily_video = '"hqURL":"(.+?)"'
-
-    video_id = lutil.find_first(html, pattern_dailymotion)
-    if video_id:
-        lutil.log("attactv.play: We have found a Dailymotion video with id: 
'%s'" % video_id)
-        daily_url = "http://www.dailymotion.com/sequence/%s"; % video_id
-        buffer_link = lutil.carga_web_dailymotion(daily_url)
+    pattern_dailymotion = ' 
src="(http://www.dailymotion.com/embed/video/[^"]*?)"'
+    #pattern_daily_video = '"hqURL":"(.+?)"'
+    pattern_daily_video = '"stream_h264_hq_url":"(.+?)"'
+
+    daily_url = lutil.find_first(html, pattern_dailymotion)
+    if daily_url:
+        lutil.log("attactv.play: We have found a Dailymotion video with URL: 
'%s'" % daily_url)
+        buffer_link = lutil.carga_web(daily_url)
         video_url = lutil.find_first(buffer_link, pattern_daily_video)
         if video_url:
             video_url = video_url.replace('\\','')

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d91fe5045d399d6b9dbf14f7e12b2c51462c1c69

commit d91fe5045d399d6b9dbf14f7e12b2c51462c1c69
Author: M. Kaijser <mcm.kaij...@gmail.com>
Date:   Tue Jul 23 13:38:48 2013 +0200

    [plugin.video.joeroganexperience] 2.0.0

diff --git a/plugin.video.joeroganexperience/addon.xml 
b/plugin.video.joeroganexperience/addon.xml
index 124a764..7f0fcd3 100644
--- a/plugin.video.joeroganexperience/addon.xml
+++ b/plugin.video.joeroganexperience/addon.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.joeroganexperience" name="The Joe Rogan Experience" 
version="1.0.0" provider-name="Lex Toumbourou (lexandstuff), paddycarey">
+<addon id="plugin.video.joeroganexperience" name="The Joe Rogan Experience" 
version="2.0.0" provider-name="Lex Toumbourou (lexandstuff) &amp; Paddy Carey 
(paddycarey)">
   <requires>
-    <import addon="xbmc.python" version="2.0"/>
-    <import addon="script.module.beautifulsoup"/>
-    <import addon="script.module.elementtree"/>
-    <import addon="script.common.plugin.cache" version="0.9.1"/>
-    <import addon="plugin.video.vimeo"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="script.module.xbmcswift2" version="2.4.0"/>
+    <import addon="script.module.beautifulsoup" version="3.2.1"/>
+    <import addon="script.module.youtube" version="3.1.0"/>
+    <import addon="script.module.vimeo" version="3.5.2"/>
   </requires>
-  <extension point="xbmc.python.pluginsource" library="default.py">
+  <extension point="xbmc.python.pluginsource" library="addon.py">
     <provides>video</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <platform>all</platform>
+    <language></language>
     <summary>Browse and stream videos from The Joe Rogan Experience 
Podcast</summary>
     <description>Browse and stream videos from The Joe Rogan Experience 
Podcast</description>
   </extension>
diff --git a/plugin.video.joeroganexperience/changelog.txt 
b/plugin.video.joeroganexperience/changelog.txt
index 81b0628..2acdb5b 100644
--- a/plugin.video.joeroganexperience/changelog.txt
+++ b/plugin.video.joeroganexperience/changelog.txt
@@ -1,16 +1,23 @@
-[B]1.0.0[/B]
+2.0.0
+- Totally rewrote backend to utilise xbmcswift2
+- Fixed scraper to support new Joe Rogan Experience homepage
+
+1.0.0
 - Version bump for PR to official repo as dharma version begins 0.x
 
-[B]0.9.1[/B]
-- Now using plugin.video.vimeo to play videos from vimeo rather than scraping 
urls manually
+0.9.1
+- Now using plugin.video.vimeo to play videos from vimeo rather than scraping
+urls manually
 - Further cleanup and commenting
 
-[B]0.9[/B]
+0.9
 - Updated for eden
 
-[B]0.2.1[/B]
-- Removed the broken live link (will add it in future releases, working 
properly)
-- Changed the behaviour to scrape the joerogan.net page for links, using Vimeo 
where available
+0.2.1
+- Removed the broken live link (will add it in future releases, working
+properly)
+- Changed the behaviour to scrape the joerogan.net page for links, using Vimeo
+where available
 
-[B]0.1[/B]
+0.1
 - Initial working version
diff --git a/plugin.video.joeroganexperience/fanart.jpg 
b/plugin.video.joeroganexperience/fanart.jpg
index 9f859a7..c26519c 100644
Binary files a/plugin.video.joeroganexperience/fanart.jpg and 
b/plugin.video.joeroganexperience/fanart.jpg differ
diff --git a/plugin.video.joeroganexperience/icon.png 
b/plugin.video.joeroganexperience/icon.png
index d60d485..fcfe658 100644
Binary files a/plugin.video.joeroganexperience/icon.png and 
b/plugin.video.joeroganexperience/icon.png differ

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=16cb8d2cb91ba7f9bda5902ef8afbe3b055abb47

commit 16cb8d2cb91ba7f9bda5902ef8afbe3b055abb47
Author: M. Kaijser <mcm.kaij...@gmail.com>
Date:   Tue Jul 23 13:36:50 2013 +0200

    [plugin.video.twit] 2.0.3

diff --git a/plugin.video.twit/addon.xml b/plugin.video.twit/addon.xml
index bbcb5aa..20cce18 100644
--- a/plugin.video.twit/addon.xml
+++ b/plugin.video.twit/addon.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.twit"
        name="TWiT"
-       version="2.0.2"
+       version="2.0.3"
        provider-name="divingmule">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
-    <import addon="script.module.beautifulsoup" version="3.0.8"/>
-    <import addon="script.common.plugin.cache" version="1.0.0"/>
+    <import addon="script.module.beautifulsoup" version="3.2.0"/>
+    <import addon="script.common.plugin.cache" version="2.5.2"/>
     <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"/>
diff --git a/plugin.video.twit/changelog.txt b/plugin.video.twit/changelog.txt
index f90d51d..9c4e125 100644
--- a/plugin.video.twit/changelog.txt
+++ b/plugin.video.twit/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.3
+added retired shows
+
 Version 2.0.2
 fix new shows, this week in youtube, omgcraft
 added support for IrcChat addon when watching twit live
diff --git a/plugin.video.twit/default.py b/plugin.video.twit/default.py
index abf82fe..d58c3a4 100644
--- a/plugin.video.twit/default.py
+++ b/plugin.video.twit/default.py
@@ -32,6 +32,7 @@ def addon_log(string):
 
 
 def cache_shows_file():
+        ''' creates an initial cache from the shows file '''
         show_file = os.path.join(home, 'resources', 'shows')
         cache.set("shows", open(show_file, 'r').read())
 
@@ -55,13 +56,14 @@ def make_request(url):
 
 
 def shows_cache(shows):
+        ''' this function checks for new shows that haven't been cached '''
         url = 'http://twit.tv/shows'
         soup = BeautifulSoup(make_request(url), 
convertEntities=BeautifulSoup.HTML_ENTITIES)
         show_items = soup.findAll('div', attrs={'class' : 
'item-list'})[2]('li')
         for i in show_items:
             name = str(i('a')[-1].string)
             try:
-                show = shows[name]
+                show = shows['active'][name]
             except:
                 addon_log('Show not in cache: '+name)
                 show_url = 
('http://twit.tv/show/'+name.replace("'",'').replace('.','').replace(' 
','-').lower()
@@ -73,6 +75,7 @@ def shows_cache(shows):
 
 
 def cache_show(name, url):
+        ''' a helper function to cache new shows '''
         shows = eval(cache.get('shows'))
         soup = BeautifulSoup(make_request(url), 
convertEntities=BeautifulSoup.HTML_ENTITIES)
         try:
@@ -87,24 +90,35 @@ def cache_show(name, url):
         except:
             addon_log('thumb exception: '+name)
             thumb = icon
-        shows[name] = {'show_url': url, 'thumb': thumb, 'description': desc}
+        shows['active'][name] = {'show_url': url, 'thumb': thumb, 
'description': desc}
         cache.set("shows", repr(shows))
         return True
 
 
 def get_shows(shows):
-        addDir(__language__(30000),'latest_episodes',4,icon)
-        addLink(__language__(30001),'twit_live','','',3,live_icon)
+        ''' loads the main directory '''
+        addDir(__language__(30000), 'latest_episodes', 4, icon)
+        addLink(__language__(30001), 'twit_live', '', '', 3, live_icon)
         cache_shows = eval(cache.cacheFunction(shows_cache, shows))
         if not cache_shows:
             addon_log('shows_cache FAILED')
-        items = sorted(shows.keys(), key=str.lower)
+        items = sorted(shows['active'].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'])
+            addDir(i, shows['active'][i]['show_url'], 1, 
shows['active'][i]['thumb'], shows['active'][i]['description'])
+        addDir('Retired Shows', 'retired_shows', 6, icon)
 
 
-def index(url,iconimage):
+def get_retired_shows():
+        ''' mode 6, loads the retired shows directory '''
+        shows = eval(cache.get('shows'))
+        items = sorted(shows['retired'].keys(), key=str.lower)
+        for i in items:
+            if i == 'Radio Leo': continue
+            addDir(i, shows['retired'][i]['show_url'], 1, 
shows['retired'][i]['thumb'], shows['retired'][i]['description'])
+
+def index(url, iconimage):
+        ''' mode 1, loads episodes of a specific show '''
         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:
@@ -152,7 +166,7 @@ def cache_latest_episods():
                 continue
             name = '%s - %s' %(show, episode)
             try:
-                thumbnail = shows[show]['thumb']
+                thumbnail = shows['active'][show]['thumb']
             except:
                 addon_log('thumbnail exception: '+show)
                 thumbnail = thumb
@@ -200,7 +214,8 @@ def set_media_url(url):
         if not playback_url:
             dialog = xbmcgui.Dialog()
             ret = dialog.select(__language__(30002), media_urls.keys())
-            playback_url = media_urls.values()[ret]
+            if ret >= 0:
+                playback_url = media_urls.values()[ret]
 
         if playback_url:
             success = True
@@ -310,7 +325,6 @@ def get_params():
 def addLink(name,url,description,date,mode,iconimage):
         
u=(sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)+
            
"&iconimage="+urllib.quote_plus(iconimage)+"&content_type="+content_type)
-        ok=True
         episode = None
         try: episode = int(re.findall('#(.+?):', name)[0])
         except:
@@ -323,19 +337,16 @@ def addLink(name,url,description,date,mode,iconimage):
         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
+        xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz)
 
 
 def addDir(name,url,mode,iconimage,description=None):
         
u=(sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)+
            
"&iconimage="+urllib.quote_plus(iconimage)+"&content_type="+content_type)
-        ok=True
         liz=xbmcgui.ListItem(name, iconImage=iconimage, 
thumbnailImage=iconimage)
         liz.setInfo(type="Video", infoLabels={"Title": name, 
"Plot":description})
         liz.setProperty( "Fanart_Image", fanart )
-        
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
-        return ok
+        
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
 
 
 def run_ircchat():
@@ -472,3 +483,8 @@ elif mode==4:
 
 elif mode==5:
     run_ircchat()
+
+elif mode==6:
+    get_retired_shows()
+    xbmcplugin.setContent(int(sys.argv[1]), 'tvshows')
+    xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.twit/resources/language/English/strings.xml 
b/plugin.video.twit/resources/language/English/strings.xml
index 04b3265..0673203 100644
--- a/plugin.video.twit/resources/language/English/strings.xml
+++ b/plugin.video.twit/resources/language/English/strings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
-  <string id='30000'>Latest Episodes</string>
+  <string id="30000">Latest Episodes</string>
   <string id="30001">TWiT Live</string>
   <string id="30002">Available Streams</string>
   <string id="30003">Bitgravity (hls 1 mbps)</string>
   <string id="30004">Bitgravity (hls 400 kbps)</string>
-  <string id='30005'>Bitgravity (http 1 mbps)</string>
+  <string id="30005">Bitgravity (http 1 mbps)</string>
   <string id="30006">Bitgravity (http 400 kbps)</string>
   <string id="30007">Ustream (rtmp 1.5 mbps)</string>
   <string id="30008">JustinTV (rtmp 1 mbps)</string>
   <string id="30009">Flosoft.biz (hls 1.5 mbps)</string>
-  <string id='30010'>Flosoft.biz (hls 1 mbps)</string>
-  <string id='30011'>Flosoft.biz (hls 600 kbps)</string>
+  <string id="30010">Flosoft.biz (hls 1 mbps)</string>
+  <string id="30011">Flosoft.biz (hls 600 kbps)</string>
   <string id="30012">Flosoft.biz (hls 400 kbps)</string>
   <string id="30013">Audio TWiT.am/listen</string>
   <string id="30014">Playback Type</string>
diff --git a/plugin.video.twit/resources/shows 
b/plugin.video.twit/resources/shows
index 83b1812..6645bd9 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://twi
 t-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 benchm
 arks and what not-yet-released products might be on the horizon. Hosted by 
Ryan Shrout of PC Perspective and Patrick Norton.Contact TWiCH 
attw...@twit.tv.Recordsliveevery 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, cooles
 t tricks, and essential news surrounding the iPad revolution. "iPad Today" is 
smart, informative, and lots of fun.Contact iPad Today atipadto...@twit.tvor 
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 tobyb@twit.tvand 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 sm
 artest 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 or...@twit.tv.Recordsliveevery 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 pod
 cast."}, '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 An
 droid enthusiasts Jason Howell, Gina Trapani, Ron Richards, and a variety of 
special guests along the way.Viewers have a voice by sending emails 
to...@twit.tvor 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 
toknow...@twit.tvor 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 atthesocialh...@twit.tvor 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 
atframer...@twit.tv.Recordsliveevery 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-gu
 y', '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-xb
 mc.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
+{'active': {'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. If you have videos, send them 
tohamnationvid...@twit.tv.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 d
 esigning 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 
attw...@twit.tv.Recordsliveevery 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 atipadto...@twit.tvor 
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 tobyb@twit.tvand 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 theupc
 oming 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 or...@twit.tv.Recordsliveevery 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 to...@twit.tvor 
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 shows you tech 
projects that you can do yourself and explains everything from tech basics to 
advanced techniques.Send your questions and suggestions toknow...@twit.tvor 
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 
atthesocialh...@twit.tvor 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 
atframer...@twit.tv.Recordsliveevery 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.\nHosted by Lamarr Wilson, your favorite 
YouTube Comedic Vlogger, Chad Johnson, the host of TWiT's Minecraft gaming show 
OMGcraft. The show records live Mondays at 5pm PT / 8pm 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-spe
 cials', '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.'}}, 'retired': {'Jumping Monkeys': {'show_url': 
'http://twit.tv/show/jumping-monkeys', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/jummok.jpg', 'description': u"#72: 
RattleMeRattleMe, Smart Girls and Smart Boys, Ze Frank's Flickr memory game, 
school tech, and more."}, 'This Week in Radio Tech': {'show_url': 
'http://twit.tv/show/this-week-in-radio-tech', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/twirt600.jpg', 'description': 
u'#134: Bees in the Feed HornThis week we talk about nanotechnology, tiny 
capacitors, skin effect, and bees in the feed horn.'}, "Dr. Kiki's Science 
Hour": {'show_url': 'http://twit.tv/show/dr-kikis-science-hour', 'thu
 mb': 'http://twit-xbmc.googlecode.com/svn/images/drkiki600.jpg', 
'description': u"#149: Tear Down the WallWe're talking open access publishing 
with Peter Binfield and Jason Hoyt from PeerJ"}, 'Science News Weekly': 
{'show_url': 'http://twit.tv/show/science-news-weekly', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/snw600.jpg', 'description': u'#16: 
Transit the sunVenus moves, we hit dinosaurs with lasers, and spies give space 
a present.'}, 'Green Tech Today': {'show_url': 
'http://twit.tv/show/green-tech-today', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/gtt600.jpg', 'description': u'#26: 
First WindFirst Wind is an independent wind energy company based in Boston, 
that has developed and currently operates wind energy projects in the 
Northeast, the West and in Hawaii, with total installed capacity of 534 
megawatts (MW).'}, "Abby's Road": {'show_url': 
'http://twit.tv/show/abbys-road', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/abbysroad.jpg', 'description': u
 '#12: Eating Disorders with Lori HansonAuthor Lori Hanson discusses her 
personal battle with bulimia and shares five key strategies to recovery.'}, 
'TWiT Photo': {'show_url': 'http://twit.tv/show/twit-photo', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/photo600.jpg', 'description': 
u'#66: Pixel Perfect ElevendyElevendy.com returns with amazing creative 
tips.'}, "Maxwell's House": {'show_url': 'http://twit.tv/show/maxwells-house', 
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/mh600.jpg', 'description': 
u'#78: RPVs and R/C AircraftLarge remotely piloted vehicles and small radio 
controlled aircraft, aviation news, answers to your questions, and more.'}, 
'Current Geek Weekly': {'show_url': 'http://twit.tv/show/current-geek-weekly', 
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/cgw600.jpg', 
'description': u'#36: The Last Weekly EpisodeCES, Augmented Reality, Makerbot, 
DC Universe, and the slow-death of Smallville.'}, 'Tech History Today': 
{'show_url': 'http://twit.
 tv/show/tech-history-today', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/tht600.jpg', 'description': u'#123: 
January 31Three of the most important events in tech history that happened on 
January 31st.'}, 'this WEEK in FUN': {'show_url': 
'http://twit.tv/show/this-week-in-fun', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/twif600.jpg', 'description': u'#49: 
Hotties And ZlotysDating sight ban, Weight Watchers floor collapses, sex doll 
stops suicide, street-walking taxes, and more.'}, 'The Laporte Report': 
{'show_url': 'http://twit.tv/show/the-laporte-report', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/tlr.jpg', 'description': u'#16: Leo 
on CFRB with John Donabie - Tech News SummaryBlackberry outage, Vista SP-1, and 
another blow to HD-DVD...'}, 'Game On!': {'show_url': 
'http://twit.tv/show/game-on', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/go600.jpg', 'description': u'#13: 
Game Over & Would You Like To Continue?Leisure Suit Larry\u2019s Al Lowe, ar
 cade documentary 100 Yen, we say goodbye, insert coins'}, 'FourCast': 
{'show_url': 'http://twit.tv/show/fourcast', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/fc600.jpg', 'description': u'#122: 
LastcastScott and Tom share their predictions in this the triumphant finale of 
FourCast.'}, 'Futures in Biotech': {'show_url': 
'http://twit.tv/show/futures-in-biotech', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/fib600.jpg', 'description': u'#95: 
So Long and Thanks for all the FiBsWe bring back all the co-hosts, panelists, 
and subject matter experts for a touchy feeling - warm and fuzzy feel good 
farewell.'}, 'MacBreak': {'show_url': 'http://twit.tv/show/macbreak', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/macbreak.jpg', 'description': 
u'#64: Apple TVLeo and Merlin discuss the new Apple TV at the Pixel Corps Gear 
Media Tech conference.'}, 'net@night with Amber and Leo': {'show_url': 
'http://twit.tv/show/netnight-amber-and-leo', 'thumb': 
'http://twit-xbmc.googleco
 de.com/svn/images/natn600.jpg', 'description': u'#230: SXSWastedTrends and 
news from SXSW 2011, How social media and the internet helped Japan in time of 
crisis, and more.'}, 'Roz Rows The Pacific': {'show_url': 
'http://twit.tv/show/roz-rows-the-pacific', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/rrtp.jpg', 'description': u'#68: 
The End Of The LineRoz receives a phenomenal welcome as she completes her solo 
row across the Pacific Ocean with a triumphant landing at Madang, Papua New 
Guinea.'}, "Trey's Variety Hour": {'show_url': 
'http://twit.tv/show/treys-variety-hour', 'thumb': 
'http://twit-xbmc.googlecode.com/svn/images/tvh600.jpg', 'description': u'#44: 
General Hangout Overdrive + Live How-ToHangout with great photographers and 
Lightroom 4 demo.'}, 'Munchcast': {'show_url': 'http://twit.tv/show/munchcast', 
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/munchcast.jpg', 
'description': u'#85: Frozen ConcoctionsFrom Slurpees to frappaccinos, we look 
at the most popular
  summertime brain freezers.'}}}
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 plugin.video.attactv/addon.xml                     |    2 +-
 plugin.video.attactv/changelog.txt                 |    2 +
 plugin.video.attactv/default.py                    |   19 +-
 plugin.video.joeroganexperience/.gitignore         |    3 +
 plugin.video.joeroganexperience/README.markdown    |   12 +
 plugin.video.joeroganexperience/addon.py           |   50 +++++
 plugin.video.joeroganexperience/addon.xml          |   15 +-
 plugin.video.joeroganexperience/changelog.txt      |   23 ++-
 plugin.video.joeroganexperience/default.py         |   74 -------
 plugin.video.joeroganexperience/fanart.jpg         |  Bin 78919 -> 85451 bytes
 plugin.video.joeroganexperience/icon.png           |  Bin 84892 -> 87338 bytes
 plugin.video.joeroganexperience/readme.txt         |   10 -
 .../resources/language/English/strings.xml         |   10 +-
 .../resources/lib/joerogan.py                      |  111 ----------
 .../resources/lib/scraper.py                       |   48 ++++
 .../resources/lib/utils.py                         |  229 --------------------
 plugin.video.manoto/addon.xml                      |    2 +-
 plugin.video.manoto/default.py                     |    4 +-
 plugin.video.twit/addon.xml                        |    6 +-
 plugin.video.twit/changelog.txt                    |    3 +
 plugin.video.twit/default.py                       |   46 +++--
 .../resources/language/English/strings.xml         |    8 +-
 plugin.video.twit/resources/shows                  |    2 +-
 23 files changed, 197 insertions(+), 482 deletions(-)
 create mode 100644 plugin.video.joeroganexperience/.gitignore
 create mode 100644 plugin.video.joeroganexperience/README.markdown
 create mode 100644 plugin.video.joeroganexperience/addon.py
 delete mode 100644 plugin.video.joeroganexperience/default.py
 delete mode 100644 plugin.video.joeroganexperience/readme.txt
 copy {plugin.video.documentary.net => 
plugin.video.joeroganexperience}/resources/language/English/strings.xml (64%)
 delete mode 100644 plugin.video.joeroganexperience/resources/lib/joerogan.py
 create mode 100644 plugin.video.joeroganexperience/resources/lib/scraper.py
 delete mode 100644 plugin.video.joeroganexperience/resources/lib/utils.py


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to