The branch, frodo has been updated
via 76c2a0d353dde365f2707e563240c6a3e7bc55a5 (commit)
via f267f3b61eaec7ba3284b26253e53d27ae5d2493 (commit)
from 7596ec0e2bc3f412fb728cdeacb2b79eda830fa9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=76c2a0d353dde365f2707e563240c6a3e7bc55a5
commit 76c2a0d353dde365f2707e563240c6a3e7bc55a5
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 13 19:21:12 2014 +0200
[plugin.video.twit] 2.0.7
diff --git a/plugin.video.twit/addon.xml b/plugin.video.twit/addon.xml
index 473274d..a3fcfa4 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.6"
+ version="2.0.7"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
- <import addon="script.module.beautifulsoup4" version="4.3.1"/>
- <import addon="script.common.plugin.cache" version="2.5.2"/>
+ <import addon="script.module.beautifulsoup4" version="4.3.2"/>
+ <import addon="script.common.plugin.cache" version="2.5.5"/>
<import addon="script.ircchat" version="1.0.0" optional="true"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
diff --git a/plugin.video.twit/changelog.txt b/plugin.video.twit/changelog.txt
index 00e7b4b..eff6da8 100644
--- a/plugin.video.twit/changelog.txt
+++ b/plugin.video.twit/changelog.txt
@@ -1,3 +1,7 @@
+Version 2.0.7
+fix new shows being cached with a bad urls
+fix remove retired shows from the active show cache
+
Version 2.0.6
fix the tech guy episodes
release to xbmc.org repository
diff --git a/plugin.video.twit/default.py b/plugin.video.twit/default.py
index b7c880d..e9a05da 100644
--- a/plugin.video.twit/default.py
+++ b/plugin.video.twit/default.py
@@ -59,7 +59,8 @@ def make_request(url, locate=False):
def shows_cache():
- ''' this function checks for shows that haven't been cached '''
+ ''' this function updates the shows cache '''
+ shows = eval(cache.get('shows'))
url = base_url + '/shows'
soup = BeautifulSoup(make_request(url), 'html.parser')
active_list = soup.findAll('div', class_='item-list')[2]('li')
@@ -82,7 +83,27 @@ def shows_cache():
thumb = addon_icon
try:
location = make_request(base_url + i('a')[-1]['href'],
True)
- show_url = location.rsplit('/', 1)[0]
+ # the location url points to an episode, we want the full
list
+ show_url = None
+ episode == location.rsplit('/', 1)[1]
+ # sometimes the episode is seperated with a dash instead
of a slash
+ if '-' in episode:
+ episode == location.rsplit('-', 1)[1]
+ try:
+ int(episode)
+ show_url = location.rsplit('-', 1)[0]
+ except ValueError:
+ pass
+ else:
+ try:
+ int(episode)
+ show_url = location.rsplit('/', 1)[0]
+ except ValueError:
+ pass
+ # if there is not an episode we will skip caching
+ if show_url is None:
+ addon_log('Not caching new show: %s' %name)
+ return "True"
addon_log('Show URL: %s' %show_url)
soup = BeautifulSoup(make_request(show_url), 'html.parser')
desc_tag = soup.find('div', class_='field-content')
@@ -94,20 +115,23 @@ def shows_cache():
if thumb_tag and thumb_tag.find('img'):
thumb = thumb_tag.img['src']
shows[show_type][name] = {'show_url': url, 'thumb': thumb,
'description': desc}
- cache.set('shows', repr(shows))
addon_log('Cached new show: %s' %name)
except:
addon_log('addonException cache new show: %s' %format_exc)
+ if shows['active'].has_key(name) and show_type == 'retired':
+ del shows['active'][name]
+ cache.set('shows', repr(shows))
return "True"
def display_shows():
''' display the main directory '''
- # check for new shows at the set cacheFunction interval
+ # update the show cache at the set cacheFunction interval
cache_shows = eval(cache.cacheFunction(shows_cache))
live_icon = 'http://twit-xbmc.googlecode.com/svn/images/live_icon.png'
add_dir(language(30000), 'latest_episodes', addon_icon, 'latest_episodes')
add_dir(language(30001), 'twit_live', live_icon, 'twit_live')
+ shows = eval(cache.get('shows'))
items = sorted(shows['active'].keys(), key=str.lower)
for i in items:
item = shows['active'][i]
diff --git a/plugin.video.twit/resources/settings.xml
b/plugin.video.twit/resources/settings.xml
index 4448247..49d3730 100644
--- a/plugin.video.twit/resources/settings.xml
+++ b/plugin.video.twit/resources/settings.xml
@@ -2,7 +2,6 @@
<settings>
<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="show_art" type="bool" label="30035" default="true" />
<setting id="first_run" type="text" visible="false" default="true" />
diff --git a/plugin.video.twit/resources/shows
b/plugin.video.twit/resources/shows
index 781ce2a..75625ef 100644
--- a/plugin.video.twit/resources/shows
+++ b/plugin.video.twit/resources/shows
@@ -1 +1 @@
-{'active': {'This Week in Computer Hardware': {'show_url':
'http://twit.tv/show/this-week-in-computer-hardware', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/twich1400.jpg', '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.\nContact TWiCH at
[email protected].\nRecords live every Thursday at 6:00pm PT/9:00pm ET.\n"}, 'Tech
News 2Night': {'show_url': 'http://twit.tv/show/tech-news-2night', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/tn2n1400.jpg', 'description': u"Get
your tech news and get on your way. Tech News 2Night brings you the evening's
top tech news plus a deep dive into the big stories of the day. It's hosted by
Mike Elgan, Sarah Lane, Father Robert
Ballecer, Jason Howell, and Shannon Morse and airs live weeknights at 4pm
PT/7pm ET.\n"}, 'Ham Nation': {'show_url': 'http://twit.tv/show/ham-nation',
'thumb': u'http://feeds.twit.tv/podcasts/coverart/hn1400.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 to [email protected].\nRecords
live every Wednesday at 6:00pm PT/9:00pm ET.\n'}, 'The Giz Wiz': {'show_url':
'http://twit.tv/show/weekly-daily-giz-wiz', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/dgw1400.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 Chad
Johnson.\nRecords live every
Wednesday at 5:00pm PT/8:00pm ET.\n"}, 'This Week in Tech': {'show_url':
'http://twit.tv/show/this-week-in-tech', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/twit1400.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.\nRecords live
every Sunday at 3:00pm PT/6:00pm ET.\n'}, 'NSFW': {'show_url':
'http://twit.tv/show/nsfw', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/nsfw1400.jpg', 'description':
u'Magician and scam artist Brian Brushwood teams with Justin Robert Young for a
weekly irreverent fun fest featuring unusual guests, bizarre games, and strange
and wonderful tales.\nRecords live every Tuesday at 7:00pm PT/10:00pm ET.\n'},
'Security Now': {'show_url': 'http://twit.tv/show/security-now', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/sn1400.jpg', 'description': u'Steve
Gibson, the man who coined the term spyware and created the first anti-spyware
pr
ogram, creator of Spinrite and ShieldsUP, discusses the hot topics in security
today with Leo Laporte. \nRecords live every Tuesday at 1:00pm PT/4:00pm
ET.\n'}, 'This Week in Enterprise Tech': {'show_url':
'http://twit.tv/show/this-week-in-enterprise-tech', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/twiet1400.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.\nRecords
live every Monday at 2:30pm PT/5:30pm ET.\n'}, 'TWiT Live Specials':
{'show_url': 'http://twit.tv/show/twit-live-specials', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/specials1400.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. Broa
dcast live at http://twit.tv.\n'}, 'iPad Today': {'show_url':
'http://twit.tv/show/ipad-today', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/ipad1400.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.\nContact iPad
Today at [email protected] or 757-504-IPAD (4723).\nRecorded live on Mondays at
11:00am PT / 2:00pm ET.\n'}, 'Before You Buy': {'show_url':
'http://twit.tv/show/before-you-buy', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/byb1400.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!\nSend feedbac
k to [email protected] and subscribe to @bybreviews on Twitter for the latest
updates. For individual reviews on YouTube, please go to
youtube.com/beforeyoubuy.\n'}, 'Triangulation': {'show_url':
'http://twit.tv/show/triangulation', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/tri1400.jpg', 'description': u'Every
week Leo talks to the smartest people in the world about the most important
topics in technology. \nRecords live every Monday at 1:00pm PT/4:00pm ET.\n'},
'This Week in Law': {'show_url': 'http://twit.tv/show/this-week-in-law',
'thumb': u'http://feeds.twit.tv/podcasts/coverart/twil1400.jpg', 'description':
u'Join Denise Howell and the TWiL panel as they discuss breaking issues in
technology law including patents, copyrights, and more.\nRecords live every
Friday at 11:00am PT/2:00pm ET.\n'}, 'FLOSS Weekly': {'show_url':
'http://twit.tv/show/floss-weekly', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/floss1400.jpg', 'description': u"We're
not talking dentistry here; FLOS
S all about Free Libre Open Source Software. Join host Randal Schwartz and 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 the upcoming guests.\nRecords live every Wednesday at
8:30am PT/11:30pm ET.\n"}, 'Tech News Today': {'show_url':
'http://twit.tv/show/tech-news-today', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/tnt1400.jpg', 'description': u'Tech
News Today, with Mike Elgan, Sarah Lane and Jason Howell, delivers the top tech
news in 30 minutes or less live each weekday at 10:00am Pacific, 1:00pm
Eastern.\nGive us your news and views at 260-TNT-SHOW or [email protected], or watch
recorded shows on our website at twit.tv/tnt.\n'}, 'This Week in Google':
{'show_url': 'http://twit.tv/show/this-week-in-google', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/twig1400.jpg', 'description': u'Leo
Laporte, Gina Trapani, Jeff Jarvis and their guests talk about the
latest Google and cloud computing news. \nRecords live every Wednesday at
1:00pm PT/4:00pm ET.\n'}, 'MacBreak Weekly': {'show_url':
'http://twit.tv/show/macbreak-weekly', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/mbw1400.jpg', 'description': u'Get the
latest Apple news and views from the top names in Mac, iPhone, iPod, and iPad
journalism.\nRecords live every Tuesday at 11:00am PT/2:00pm ET.\n'}, 'All
About Android': {'show_url': 'http://twit.tv/show/all-about-android', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/aaa1400.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.\nViewers have a voice by sending emails to [email protected]
or calling 347-SHOW-AAA.\nRecords live every Tuesday at 5:00pm PT/8:00pm
ET.\nAll About Android on Google+\nAll Ab
out Android on Twitter\n"}, 'iFive for the iPhone': {'show_url':
'http://twit.tv/show/ifive-iphone', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/ifive1400.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.\nRecords live every Wednesday at 3:00pm PT / 6:00pm ET.\n'},
'Know How...': {'show_url': 'http://twit.tv/show/know-how', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/kh1400.jpg', 'description': u'Get the
know how to make technology work for you. Fr. Robert Ballecer shows you tech
projects that you can do yourself and explain everything from tech basics to
advanced techniques.\nSend your questions and suggestions to [email protected] or
leave a voicemail at 408-800-KNOW.\nRecords live at http://live.twit.tv/ every
Thursday at 12:30pm PT/3:30pm ET.\n'},
'The Social Hour': {'show_url': 'http://twit.tv/show/social-hour', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/tsh1400.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.\nContact The Social Hour at
[email protected] or 2626-SOCIAL (262-676-2425).\nRecords live every
Thursday at 11:00am PT / 2:00pm ET.\n'}, 'Windows Weekly': {'show_url':
'http://twit.tv/show/windows-weekly', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/ww1400.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 the Super Site for Windows and Mary Jo Foley of All About Microsoft.
\nRecords live every Wednesday at 11:00am PT/2:00pm ET.\n'}, 'OMGcraft':
{'show_url': 'http://twit.tv/show/omgc
raft', 'thumb': u'http://feeds.twit.tv/podcasts/coverart/omgcraft1400.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.\n'}, 'Coding 101': {'show_url': 'http://twit.tv/show/coding-101',
'thumb': 'http://feeds.twit.tv/coverart/code1400.jpg', 'description': u'Coding
101 introduces you to the world of computer programming. Fr. Robert Ballecer
and Shannon Morse demonstrate coding techniques, concepts, and a variety of
programming languages.\nRecords live every Thursday at 1:30pm PT / 4:30pm
ET.\n'}, 'The Tech Guy': {'show_url': 'http://twit.tv/show/the-tech-guy',
'thumb': u'http://feeds.twit.tv/podcasts/coverart/ttg1400.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.\nFor
show notes and more visit techguylabs.com.\nRecords live weekends at 11:00am
PT/2:00pm ET.\n'}, 'Home Theater Geeks': {'show_url':
'http://twit.tv/show/home-theater-geeks', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/htg1400.jpg', 'description': u"Scott
Wilkinson, online editor of UltimateAVmag.com and HomeTheaterMag.com,
interviews the leaders, pioneers behind today's Home Theater technology. A
regular on The Tech Guy with Leo Laporte, each week Scott explores the
technologies behind your screen.\nRecords live every Thursday at 2:30pm
PT/5:30pm ET.\n"}}, 'retired': {"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-To\nHangout with great photographers and
Lightroom 4 demo.\n'}, 'Tech History Today': {'show_url':
'http://twit.tv/show/tech-history-to
day', 'thumb': 'http://twit-xbmc.googlecode.com/svn/images/tht600.jpg',
'description': u'#123: January 31\nThree of the most important events in tech
history that happened on January 31st.\n'}, '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 Episode\nCES, Augmented Reality, Makerbot, DC Universe, and the
slow-death of Smallville.\n'}, 'MacBreak': {'show_url':
'http://twit.tv/show/macbreak', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/macbreak.jpg', 'description':
u'#64: Apple TV\nLeo and Merlin discuss the new Apple TV at the Pixel Corps
Gear Media Tech conference.'}, '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 sun\nVenus moves, we hit dinosaurs with lasers, and spies give
space a present.\n'}, 'Green Tech To
day': {'show_url': 'http://twit.tv/show/green-tech-today', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/gtt600.jpg', 'description': u'#26:
First Wind\nFirst 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).\n'}, 'FourCast': {'show_url': 'http://twit.tv/show/fourcast',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/fc600.jpg', 'description':
u'#122: Lastcast\nScott and Tom share their predictions in this the triumphant
finale of FourCast.\n'}, '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 Zlotys\nDating sight ban, Weight Watchers floor collapses, sex doll
stops suicide, street-walking taxes, and more.\n'}, 'Game On!': {'show_url':
'http://twit.tv/show/game-on', 'thumb': 'http://t
wit-xbmc.googlecode.com/svn/images/go600.jpg', 'description': u'#13: Game Over
& Would You Like To Continue?\nLeisure Suit Larry\u2019s Al Lowe, arcade
documentary 100 Yen, we say goodbye, insert coins\n'}, '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 Horn\nThis week we talk about nanotechnology, tiny
capacitors, skin effect, and bees in the feed horn.\n'}, '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 Line\nRoz receives a phenomenal welcome as she completes her
solo row across the Pacific Ocean with a triumphant landing at Madang, Papua
New Guinea.\n'}, 'Jumping Monkeys': {'show_url':
'http://twit.tv/show/jumping-monkeys', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/jummok.jpg', 'description'
: u"#72: RattleMe\nRattleMe, Smart Girls and Smart Boys, Ze Frank's Flickr
memory game, school tech, and more.\n"}, '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 Summary\nBlackberry outage, Vista SP-1,
and another blow to HD-DVD...\n'}, 'net@night with Amber and Leo': {'show_url':
'http://twit.tv/show/netnight-amber-and-leo', 'thumb':
'http://twit-xbmc.googlecode.com/svn/images/natn600.jpg', 'description':
u'#230: SXSWasted\nTrends and news from SXSW 2011, How social media and the
internet helped Japan in time of crisis, and more.\n'}, 'Frame Rate':
{'show_url': 'http://twit.tv/show/frame-rate', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/fr1400.jpg', 'description': u'#153:
The Final Frame\nNimbleTV brings TV everywhere to New York, big plans for
Chromecast in 2014, Breaking Bad spinoff coming to Netflix, and the final fr
ame is rated.\n'}, 'Munchcast': {'show_url': 'http://twit.tv/show/munchcast',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/munchcast.jpg',
'description': u'#85: Frozen Concoctions\nFrom Slurpees to frappaccinos, we
look at the most popular summertime brain freezers.\n'}, 'This Week in
YouTube': {'show_url': 'http://twit.tv/show/this-week-in-youtube', 'thumb':
u'http://feeds.twit.tv/podcasts/coverart/yt1400.jpg', 'description': u"#35:
This Video is no Longer Available\nYouTube's changed Content ID system, Chad's
goal for the year, and the news that will affect this show, and more.\n"},
"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 Hanson\nAuthor Lori Hanson discusses her
personal battle with bulimia and shares five key strategies to recovery.\n'},
'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
Elevendy\nElevendy.com returns with amazing creative tips.\n'}, "Dr. Kiki's
Science Hour": {'show_url': 'http://twit.tv/show/dr-kikis-science-hour',
'thumb': 'http://twit-xbmc.googlecode.com/svn/images/drkiki600.jpg',
'description': u"#149: Tear Down the Wall\nWe're talking open access publishing
with Peter Binfield and Jason Hoyt from PeerJ\n"}, "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 Aircraft\nLarge remotely piloted vehicles and small radio
controlled aircraft, aviation news, answers to your questions, and more.\n'},
'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 FiBs\nWe bring back all
the co-hosts, panelists, and subject matter experts for
a touchy feeling - warm and fuzzy feel good farewell.\n'}}}
\ No newline at end of file
+{'active': {'This Week in Computer Hardware': {'show_url':
'http://twit.tv/show/this-week-in-computer-hardware', 'thumb':
'http://feeds.twit.tv/coverart/twich1400.jpg', '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.\nContact TWiCH at [email protected].\nRecords live
every Thursday at 6:00pm PT/9:00pm ET.\n"}, 'Tech News 2Night': {'show_url':
'http://twit.tv/show/tech-news-2night', 'thumb':
'http://feeds.twit.tv/coverart/tn2n1400.jpg', 'description': u"Get your tech
news and get on your way. Tech News 2Night brings you the evening's top tech
news plus a deep dive into the big stories of the day. Hosted by Sarah Lane,
Tech News 2Night records live, weeknights at 4pm PT
/7pm ET.\n"}, 'Ham Nation': {'show_url': 'http://twit.tv/show/ham-nation',
'thumb': 'http://feeds.twit.tv/podcasts/coverart/hn1400.jpg', 'description':
u'Bob Heil, Gordon West, George Thomas, Don Wilbanks and Cheryl Lasik 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 to
[email protected].\nRecords live every Wednesday at 6:00pm PT/9:00pm
ET.\n'}, 'The Giz Wiz': {'show_url':
'http://twit.tv/show/weekly-daily-giz-wiz', 'thumb':
'http://feeds.twit.tv/coverart/dgw1400.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 Chad Johnson.\nRecords
live every Wednesday at 5:00pm PT/8:00pm ET.\n"}, 'This Week in Tech': {'s
how_url': 'http://twit.tv/show/this-week-in-tech', 'thumb':
'http://feeds.twit.tv/coverart/twit1400.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.\nRecords live every
Sunday at 3:00pm PT/6:00pm ET.\n'}, 'Android App Arena': {'show_url':
'http://twit.tv/show/android-app-arena', 'thumb':
'http://feeds.twit.tv/coverart/arena1400.jpg', 'description': u"Android App
Arena is your weekly source for some of the latest and greatest apps and games
available on the Android mobile platform. Hands-on demos, category shoot-outs,
a closer look at the biggest new app of the week, and in-depth interviews with
some of Android's best developers.\nSend in your app tips to [email protected].
Vote for your favorite apps on our subreddit at
androidapparena.reddit.com.\nAirs live every Friday at 4:00pm ET / 1:00pm PT /
8:00pm UTC."}, 'Security Now': {'show_url': 'http://twit.tv/show/security
-now', 'thumb': 'http://feeds.twit.tv/coverart/sn1400.jpg', 'description':
u'Steve Gibson, the man who coined the term spyware and created the first
anti-spyware program, creator of Spinrite and ShieldsUP, discusses the hot
topics in security today with Leo Laporte. \nRecords live every Tuesday at
1:00pm PT/4:00pm ET.\n'}, 'Marketing Mavericks': {'show_url':
'http://twit.tv/show/marketing-mavericks', 'thumb':
'http://feeds.twit.tv/podcasts/coverart/mm1400.jpg', 'description': u'Marketing
Mavericks covers the intersection of marketing and tech. Each week, Tonya Hall
interviews top marketing professionals to discuss case studies, communication
strategies, and brand insights on social media, trends, and analytics.\nRecords
live at http://live.twit.tv/ every Monday at 4:30pm PT/7:30pm ET.\n'}, 'This
Week in Enterprise Tech': {'show_url':
'http://twit.tv/show/this-week-in-enterprise-tech', 'thumb':
'http://feeds.twit.tv/coverart/twiet1400.jpg', 'description': u'This Week in
Enterprise Te
ch 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.\nRecords live every Monday
at 2:30pm PT/5:30pm ET.\n'}, 'TWiT Live Specials': {'show_url':
'http://twit.tv/show/twit-live-specials', 'thumb':
'http://feeds.twit.tv/podcasts/coverart/specials1400.jpg', 'description': u'Leo
Laporte and the TWiTs go off the beaten path to bring you non-standard shows
from the network, including breaking news, live-on-location events, special
interviews, and geek conference expeditions. Broadcast live at
http://live.twit.tv/\n'}, "Padre's Corner": {'show_url':
'http://twit.tv/show/padres-corner', 'thumb':
'http://feeds.twit.tv/coverart/padre1400.jpg', 'description': u'18% science,
27% irreverence, 22% current events, 56% geek life, 13% non-sequiturs and $19
of ranting. That\'s the formula for "Padre\'s Corner" \u2013 A show that\'s not
necessarily abou
t tech news, but created by those who love news about tech. Join Padre each
week as he picks up the stories that fall through the cracks and geeks out with
your favorite folks from around the Interwebz.\nRecords live every Tuesday at
10:30pm ET / 7:30pm PT at http://live.twit.tv/\n'}, 'iPad Today': {'show_url':
'http://twit.tv/show/ipad-today', 'thumb':
'http://feeds.twit.tv/coverart/ipad1400.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.\nContact iPad Today at
[email protected] or 757-504-IPAD (4723).\nRecorded live on Mondays at 12:30pm
PT / 3:30pm ET.\n'}, 'Before You Buy': {'show_url':
'http://twit.tv/show/before-you-buy', 'thumb':
'http://feeds.twit.tv/coverart/byb1400.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!\nSend feedback to
[email protected] and subscribe to @bybreviews on Twitter for the latest updates.
For individual reviews on YouTube, please go to youtube.com/beforeyoubuy.\n'},
'Triangulation': {'show_url': 'http://twit.tv/show/triangulation', 'thumb':
'http://feeds.twit.tv/coverart/tri1400.jpg', 'description': u'Every week Leo
talks to the smartest people in the world about the most important topics in
technology. \nRecords live every Monday at 11:00am PT/2:00pm ET.\n'}, 'This
Week in Law': {'show_url': 'http://twit.tv/show/this-week-in-law', 'thumb':
'http://feeds.twit.tv/coverart/twil1400.jpg', 'description': u'Join legal
bloggers (and trained attorneys) Denise Howell and Evan Brown as they discuss
breaking issues in technology law, including patents, copyrights, and
more.\nRecords live every Friday at 11:00am PT/2:00pm ET.\n'}, 'FLOSS Weekly':
{'show_url': 'http://twit.tv/show/floss-weekly', 'thumb':
'http://feeds.twit.tv/coverart/floss1400.jpg', 'description': u"We're not
talking dentistry here; FLOSS all about Free Libre Open Source Software. Join
host Randal Schwartz and 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 the upcoming guests.\nRecords live every
Wednesday at 8:30am PT/11:30am ET.\n"}, 'Tech News Today': {'show_url':
'http://twit.tv/show/tech-news-today', 'thumb':
'http://feeds.twit.tv/coverart/tnt1400.jpg', 'description': u"Tech News Today
explores the most important stories of the day in conversation with the world's
leading journalists live each weekday at 10:00am Pacific, 1:00pm Eastern.\nGive
us your news and views at 260-TNT-SHOW or [email protected], or watch recorded shows
on our website at twit.tv/tnt.\n"},
'iFive for the iPhone': {'show_url': 'http://twit.tv/show/ifive-iphone',
'thumb': 'http://feeds.twit.tv/coverart/ifive1400.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.\nRecords live every Wednesday at 3:00pm PT / 6:00pm ET.\n'},
'MacBreak Weekly': {'show_url': 'http://twit.tv/show/macbreak-weekly', 'thumb':
'http://feeds.twit.tv/podcasts/coverart/mbw1400.jpg', 'description': u'Get the
latest Apple news and views from the top names in Mac, iPhone, iPod, and iPad
journalism.\nRecords live every Tuesday at 11:00am PT/2:00pm ET.\n'}, 'This
Week in Google': {'show_url': 'http://twit.tv/show/this-week-in-google',
'thumb': 'http://feeds.twit.tv/coverart/twig1400.jpg', 'description': u'Leo
Laporte, Gina Trapani, Jeff Jarvis and their guests talk about the latest
Google and cloud computing news. \nRecords live every Wednesday at 1:00pm
PT/4:00pm ET.\n'}, 'All About Android': {'show_url':
'http://twit.tv/show/all-about-android', 'thumb':
'http://feeds.twit.tv/coverart/aaa1400.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.\nViewers have a voice by sending emails to [email protected] or calling
347-SHOW-AAA.\nRecords live every Tuesday at 5:00pm PT/8:00pm ET.\nAll About
Android on Google+\nAll About Android on Twitter\n"}, 'redditUP': {'show_url':
'http://twit.tv/show/redditup', 'thumb':
'http://feeds.twit.tv/coverart/ru1400.jpg', 'description': u'redditUP features
the best that "the front page of the internet" has to offer. Hosted by Sarah
Lane and Chad "OMGchad" Johnson, each episode recaps the week\'s best stori
es, memes, AMAs (Ask Me Anythings), and more from the popular social news
community.\nRecords live every Wednesday at 7:30pm ET / 4:30pm PT at
http://live.twit.tv/\n'}, 'Know How...': {'show_url':
'http://twit.tv/show/know-how', 'thumb':
'http://feeds.twit.tv/coverart/kh1400.jpg', 'description': u'Get the know how
to make technology work for you. Fr. Robert Ballecer shows you tech projects
that you can do yourself and explain everything from tech basics to advanced
techniques.\nSend your questions and suggestions to [email protected] or leave a
voicemail at 408-800-KNOW.\nRecords live at http://live.twit.tv/ every Thursday
at 11:00am PT/2:00pm ET.\n'}, 'The Social Hour': {'show_url':
'http://twit.tv/show/social-hour', 'thumb':
'http://feeds.twit.tv/coverart/tsh1400.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 Int
ernet.\nContact The Social Hour at [email protected] or 2626-SOCIAL
(262-676-2425).\nRecords live every Thursday at 12:00pm PT / 3:00pm ET.\n'},
'Windows Weekly': {'show_url': 'http://twit.tv/show/windows-weekly', 'thumb':
'http://feeds.twit.tv/coverart/ww1400.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 the
Super Site for Windows and Mary Jo Foley of All About Microsoft. \nRecords live
every Wednesday at 11:00am PT/2:00pm ET.\n'}, 'OMGcraft': {'show_url':
'http://twit.tv/show/omgcraft', 'thumb':
'http://feeds.twit.tv/coverart/omgcraft1400.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.\n'}, 'Coding 101': {'show_url':
'http://twit.tv/show/coding-10
1', 'thumb': 'http://feeds.twit.tv/coverart/code1400.jpg', 'description':
u'Join Father Robert Ballecer and Shannon Morse on Coding 101, a weekly
instructional, project-oriented programming show with appeal for beginning to
intermediate programmers. Using a combination of classroom-style teaching,
guest programmers, and special interest segments, Coding 101 will offer
beginner, intermediate and "applied" programming topics within several
interchangeable modules. Learn programming languages such as Java, C++, Visual
Basic, and more!\nRecords live every Thursday at 1:30pm PT / 4:30pm ET.\n'},
'The Tech Guy': {'show_url': 'http://twit.tv/show/the-tech-guy', 'thumb':
'http://feeds.twit.tv/coverart/ttg1400.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.\nFor show
notes and more vi
sit techguylabs.com.\nRecords live weekends at 11:00am PT/2:00pm ET.\n'},
'Home Theater Geeks': {'show_url': 'http://twit.tv/show/home-theater-geeks',
'thumb': 'http://feeds.twit.tv/coverart/htg1400.jpg', 'description': u"Scott
Wilkinson, online editor of UltimateAVmag.com and HomeTheaterMag.com,
interviews the leaders, pioneers behind today's Home Theater technology. A
regular on The Tech Guy with Leo Laporte, each week Scott explores the
technologies behind your screen.\nRecords live every Thursday at 2:30pm
PT/5:30pm ET.\n"}, 'TWiT Bits': {'show_url': 'http://twit.tv/show/twit-bits',
'thumb': 'http://feeds.twit.tv/coverart/bits1400.jpg', 'description': u'TWiT
Bits are highlights from shows on TWiT.tv. You can find more information about
TWiT and subscribe to our full shows at http://twit.tv/\n'}}, 'retired':
{"Trey's Variety Hour": {'show_url': 'http://twit.tv/show/treys-variety-hour',
'thumb': 'http://feeds.twit.tv/coverart/tvh600.jpg', 'description': u'#44:
General Hangout Over
drive + Live How-To\nHangout with great photographers and Lightroom 4
demo.\n'}, 'Tech History Today': {'show_url':
'http://twit.tv/show/tech-history-today', 'thumb':
'http://feeds.twit.tv/coverart/tht600.jpg', 'description': u'#123: January
31\nThree of the most important events in tech history that happened on January
31st.\n'}, 'NSFW': {'show_url': 'http://twit.tv/show/nsfw', 'thumb':
'http://feeds.twit.tv/coverart/nsfw1400.jpg', 'description': u"#219: Pretend
We're Not Here\nThe last episode.\n"}, 'Current Geek Weekly': {'show_url':
'http://twit.tv/show/current-geek-weekly', 'thumb':
'http://feeds.twit.tv/coverart/cgw600.jpg', 'description': u'#36: The Last
Weekly Episode\nCES, Augmented Reality, Makerbot, DC Universe, and the
slow-death of Smallville.\n'}, 'MacBreak': {'show_url':
'http://twit.tv/show/macbreak', 'thumb': 'None', 'description': u'#64: Apple
TV\nLeo and Merlin discuss the new Apple TV at the Pixel Corps Gear Media Tech
conference.'}, 'Science News Weekly': {'show
_url': 'http://twit.tv/show/science-news-weekly', 'thumb': 'None',
'description': u'#16: Transit the sun\nVenus moves, we hit dinosaurs with
lasers, and spies give space a present.\n'}, 'Green Tech Today': {'show_url':
'http://twit.tv/show/green-tech-today', 'thumb':
'http://feeds.twit.tv/coverart/gtt600.jpg', 'description': u'#26: First
Wind\nFirst 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).\n'},
'FourCast': {'show_url': 'http://twit.tv/show/fourcast', 'thumb':
'http://feeds.twit.tv/coverart/fc600.jpg', 'description': u'#122:
Lastcast\nScott and Tom share their predictions in this the triumphant finale
of FourCast.\n'}, 'this WEEK in FUN': {'show_url':
'http://twit.tv/show/this-week-in-fun', 'thumb': 'None', 'description': u'#49:
Hotties And Zlotys\nDating sight ban, Weight Watchers floor collapses, sex doll
st
ops suicide, street-walking taxes, and more.\n'}, 'Game On!': {'show_url':
'http://twit.tv/show/game-on', 'thumb':
'http://feeds.twit.tv/coverart/go600.jpg', 'description': u'#13: Game Over &
Would You Like To Continue?\nLeisure Suit Larry\u2019s Al Lowe, arcade
documentary 100 Yen, we say goodbye, insert coins\n'}, 'This Week in Radio
Tech': {'show_url': 'http://twit.tv/show/this-week-in-radio-tech', 'thumb':
'http://feeds.twit.tv/coverart/twirt600.jpg', 'description': u'#134: Bees in
the Feed Horn\nThis week we talk about nanotechnology, tiny capacitors, skin
effect, and bees in the feed horn.\n'}, 'Roz Rows The Pacific': {'show_url':
'http://twit.tv/show/roz-rows-the-pacific', 'thumb': 'None', 'description':
u'#68: The End Of The Line\nRoz receives a phenomenal welcome as she completes
her solo row across the Pacific Ocean with a triumphant landing at Madang,
Papua New Guinea.\n'}, 'Jumping Monkeys': {'show_url':
'http://twit.tv/show/jumping-monkeys', 'thumb': 'http://feeds.twit.
tv/coverart/jm300.jpg', 'description': u"#72: RattleMe\nRattleMe, Smart Girls
and Smart Boys, Ze Frank's Flickr memory game, school tech, and more.\n"}, 'The
Laporte Report': {'show_url': 'http://twit.tv/show/the-laporte-report',
'thumb': 'http://feeds.twit.tv/coverart/tlr300.jpg', 'description': u'#16: Leo
on CFRB with John Donabie - Tech News Summary\nBlackberry outage, Vista SP-1,
and another blow to HD-DVD...\n'}, 'net@night with Amber and Leo': {'show_url':
'http://twit.tv/show/netnight-amber-and-leo', 'thumb': 'None', 'description':
u'#230: SXSWasted\nTrends and news from SXSW 2011, How social media and the
internet helped Japan in time of crisis, and more.\n'}, 'Frame Rate':
{'show_url': 'http://twit.tv/show/frame-rate', 'thumb':
'http://feeds.twit.tv/coverart/fr1400.jpg', 'description': u'#153: The Final
Frame\nNimbleTV brings TV everywhere to New York, big plans for Chromecast in
2014, Breaking Bad spinoff coming to Netflix, and the final frame is
rated.\n'}, 'Munchcast': {
'show_url': 'http://twit.tv/show/munchcast', 'thumb':
'http://feeds.twit.tv/coverart/mc300.jpg', 'description': u'#85: Frozen
Concoctions\nFrom Slurpees to frappaccinos, we look at the most popular
summertime brain freezers.\n'}, 'This Week in YouTube': {'show_url':
'http://twit.tv/show/this-week-in-youtube', 'thumb':
'http://feeds.twit.tv/coverart/yt1400.jpg', 'description': u"#35: This Video is
no Longer Available\nYouTube's changed Content ID system, Chad's goal for the
year, and the news that will affect this show, and more.\n"}, "Abby's Road":
{'show_url': 'http://twit.tv/show/abbys-road', 'thumb':
'http://feeds.twit.tv/coverart/abby600.jpg', 'description': u'#12: Eating
Disorders with Lori Hanson\nAuthor Lori Hanson discusses her personal battle
with bulimia and shares five key strategies to recovery.\n'}, 'TWiT Photo':
{'show_url': 'http://twit.tv/show/twit-photo', 'thumb':
'http://feeds.twit.tv/coverart/photo600.jpg', 'description': u'#66: Pixel
Perfect Elevendy\nElevendy.co
m returns with amazing creative tips.\n'}, "Dr. Kiki's Science Hour":
{'show_url': 'http://twit.tv/show/dr-kikis-science-hour', 'thumb':
'http://feeds.twit.tv/coverart/dksh600.jpg', 'description': u"#149: Tear Down
the Wall\nWe're talking open access publishing with Peter Binfield and Jason
Hoyt from PeerJ\n"}, "Maxwell's House": {'show_url':
'http://twit.tv/show/maxwells-house', 'thumb':
'http://feeds.twit.tv/coverart/mh600.jpg', 'description': u'#78: RPVs and R/C
Aircraft\nLarge remotely piloted vehicles and small radio controlled aircraft,
aviation news, answers to your questions, and more.\n'}, 'Futures in Biotech':
{'show_url': 'http://twit.tv/show/futures-in-biotech', 'thumb':
'http://feeds.twit.tv/coverart/fib600.jpg', 'description': u'#95: So Long and
Thanks for all the FiBs\nWe bring back all the co-hosts, panelists, and subject
matter experts for a touchy feeling - warm and fuzzy feel good farewell.\n'}}}
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f267f3b61eaec7ba3284b26253e53d27ae5d2493
commit f267f3b61eaec7ba3284b26253e53d27ae5d2493
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 13 19:08:15 2014 +0200
[plugin.video.greenpeace] 1.1.7
diff --git a/plugin.video.greenpeace/addon.xml
b/plugin.video.greenpeace/addon.xml
index 51f64d2..b0c2d37 100644
--- a/plugin.video.greenpeace/addon.xml
+++ b/plugin.video.greenpeace/addon.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.greenpeace" name="Greenpeace videos" version="1.1.6"
provider-name="Jose Antonio Montes (jamontes)">
+<addon id="plugin.video.greenpeace" name="Greenpeace videos" version="1.1.7"
provider-name="Jose Antonio Montes (jamontes)">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="plugin.video.youtube" version="3.4.4"/>
- <import addon="plugin.video.vimeo" version="2.5.1"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
<provides>video</provides>
@@ -55,5 +54,6 @@
<forum>http://forum.xbmc.org/showthread.php?tid=167903</forum>
<website>http://www.greenpeace.org/international/en/</website>
<source>https://github.com/jamontes/plugin.video.greenpeace</source>
+ <mail></mail>
</extension>
</addon>
diff --git a/plugin.video.greenpeace/changelog.txt
b/plugin.video.greenpeace/changelog.txt
index 51799bd..6123e2c 100644
--- a/plugin.video.greenpeace/changelog.txt
+++ b/plugin.video.greenpeace/changelog.txt
@@ -1,3 +1,7 @@
+1.1.7 (2014.08.11)
+- Removed the Vimeo add-on dependency due to a problem found running on Gotham.
+- Added custom Vimeo scraper to support the Vimeo videos again.
+- Added mail tag to addon.xml
1.1.6
- Updated language files from Transifex.
1.1.5
diff --git a/plugin.video.greenpeace/default.py
b/plugin.video.greenpeace/default.py
index 2eb631d..aa0383f 100644
--- a/plugin.video.greenpeace/default.py
+++ b/plugin.video.greenpeace/default.py
@@ -408,14 +408,17 @@ def get_playable_youtube_url(html):
# This funtion search into the URL link to get the video URL for Vimeo.
def get_playable_vimeo_url(html):
- pattern_vimeo = '<input type="text" id="linkvideo"
value="http://vimeo.com/([0-9]+)'
- video_id = lutil.find_first(html, pattern_vimeo)
+ video_pattern_sd = '"sd":{.*?,"url":"([^"]*?)"'
+ pattern_vimeo = '<input type="text" id="linkvideo"
value="http://vimeo.com/([0-9]+)'
+ video_id = lutil.find_first(html, pattern_vimeo)
if video_id:
lutil.log("greenpeace.play: We have found this Vimeo video with
video_id: %s and let's going to play it!" % video_id)
- video_url =
"plugin://plugin.video.vimeo/?path=/root/video&action=play_video&videoid=" +
video_id
- return video_url
+ video_info_url = 'https://player.vimeo.com/video/' + video_id
+ buffer_link = lutil.carga_web(video_info_url)
+ return lutil.find_first(buffer_link, video_pattern_sd)
return ""
+
run()
-----------------------------------------------------------------------
Summary of changes:
plugin.video.greenpeace/addon.xml | 4 +-
plugin.video.greenpeace/changelog.txt | 4 +
plugin.video.greenpeace/default.py | 11 +-
plugin.video.twit/addon.xml | 6 +-
plugin.video.twit/changelog.txt | 4 +
plugin.video.twit/default.py | 32 +++++-
plugin.video.twit/resources/generate_shows_file.py | 128 ++++++++++++++++++++
plugin.video.twit/resources/settings.xml | 1 -
plugin.video.twit/resources/shows | 2 +-
9 files changed, 177 insertions(+), 15 deletions(-)
create mode 100644 plugin.video.twit/resources/generate_shows_file.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
