The branch, eden-pre has been updated
via d044d2c511c46fa13c854d51654c9b9491a50bcd (commit)
via 607b3572637ec407d00c4dba0b99ee6be1b393bd (commit)
via 28b63198a4ac620c5a28710a504688eb1cf76662 (commit)
from 788b1e7be1444c7f2f3ed89566bc28bee1a092d4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d044d2c511c46fa13c854d51654c9b9491a50bcd
commit d044d2c511c46fa13c854d51654c9b9491a50bcd
Author: spiff <[email protected]>
Date: Wed Sep 21 09:48:06 2011 +0200
[plugin.video.dr.dk.live] updated to version 2.0.1
diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index 53a3d3b..c79b839 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -11,7 +11,7 @@ import xbmcplugin
# Low : 300 kb/s
CHANNELS = [
- # From:
http://dr.dk/TV/Live/UPlayer?banner=false&deepLinking=true&useStartControls=false&width=830&height=467&disableWmode=true
+ # From: http://dr.dk/nu/embed/live?height=467&width=830
{'name' : 'DR1', 'urls' : {
'high' : 'rtmp://rtmplive.dr.dk/live/livedr01astream3',
'medium' : 'rtmp://rtmplive.dr.dk/live/livedr01astream2',
@@ -42,20 +42,28 @@ CHANNELS = [
'low' : 'rtmp://rtmplive.dr.dk/live/livedr05astream1'
}
},
-
+ {'name' : 'DR HD', 'urls' : {
+ 'high' : 'rtmp://livetv.gss.dr.dk/live/livedr06astream3',
+ 'medium' : 'rtmp://livetv.gss.dr.dk/live/livedr06astream2',
+ 'low' : 'rtmp://livetv.gss.dr.dk/live/livedr06astream1'
+ }
+ },
# From: http://www.24nordjyske.dk/webtv_high.asp
{'name' : '24 Nordjyske', 'urls' : {
'high' : 'mms://stream.nordjyske.dk/24nordjyske - Full Broadcast
Quality',
'medium' : 'mms://stream.nordjyske.dk/24nordjyske'
}
- }]
+ }
+ ]
def showChannels():
+ fanart = ADDON.getAddonInfo('path') + '/fanart.jpg'
for idx, c in enumerate(CHANNELS):
icon = ADDON.getAddonInfo('path') + "/resources/logos/" +
c['name'].replace(" ", "_") + ".png"
if c['urls'].has_key(getQuality()):
item = xbmcgui.ListItem(c['name'], iconImage = icon)
+ item.setProperty('Fanart_Image', fanart)
url = PATH + '?idx=' + str(idx)
xbmcplugin.addDirectoryItem(HANDLE, url, item, True)
diff --git a/plugin.video.dr.dk.live/addon.xml
b/plugin.video.dr.dk.live/addon.xml
index ab44e60..1105a3f 100644
--- a/plugin.video.dr.dk.live/addon.xml
+++ b/plugin.video.dr.dk.live/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.dr.dk.live"
- version="2.0.0"
+ version="2.0.1"
name="Danish Live TV"
provider-name="twinther [[email protected]]">
<requires>
diff --git a/plugin.video.dr.dk.live/changelog.txt
b/plugin.video.dr.dk.live/changelog.txt
index 757885f..11f8a84 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.0.1 - 2011-09-20[/B]
+- Added DR HD
+- New graphics
+
[B]Version 2.0.0 - 2011-08-12[/B]
- Added support for XBMC Eden
- otherwise same features as 1.3.0 below.
diff --git a/plugin.video.dr.dk.live/icon.png b/plugin.video.dr.dk.live/icon.png
index 5d87d4f..1444212 100644
Binary files a/plugin.video.dr.dk.live/icon.png and
b/plugin.video.dr.dk.live/icon.png differ
diff --git a/plugin.video.dr.dk.live/resources/logos/24_Nordjyske.png
b/plugin.video.dr.dk.live/resources/logos/24_Nordjyske.png
index c2ff0df..25e1fd6 100644
Binary files a/plugin.video.dr.dk.live/resources/logos/24_Nordjyske.png and
b/plugin.video.dr.dk.live/resources/logos/24_Nordjyske.png differ
diff --git a/plugin.video.dr.dk.live/resources/logos/DR1.png
b/plugin.video.dr.dk.live/resources/logos/DR1.png
index 16f8cc5..ce78d83 100644
Binary files a/plugin.video.dr.dk.live/resources/logos/DR1.png and
b/plugin.video.dr.dk.live/resources/logos/DR1.png differ
diff --git a/plugin.video.dr.dk.live/resources/logos/DR2.png
b/plugin.video.dr.dk.live/resources/logos/DR2.png
index 79a2fcc..524f30a 100644
Binary files a/plugin.video.dr.dk.live/resources/logos/DR2.png and
b/plugin.video.dr.dk.live/resources/logos/DR2.png differ
diff --git a/plugin.video.dr.dk.live/resources/logos/DR_K.png
b/plugin.video.dr.dk.live/resources/logos/DR_K.png
index 3b858fc..b45c921 100644
Binary files a/plugin.video.dr.dk.live/resources/logos/DR_K.png and
b/plugin.video.dr.dk.live/resources/logos/DR_K.png differ
diff --git a/plugin.video.dr.dk.live/resources/logos/DR_Ramasjang.png
b/plugin.video.dr.dk.live/resources/logos/DR_Ramasjang.png
index 0fe7100..4f91b26 100644
Binary files a/plugin.video.dr.dk.live/resources/logos/DR_Ramasjang.png and
b/plugin.video.dr.dk.live/resources/logos/DR_Ramasjang.png differ
diff --git a/plugin.video.dr.dk.live/resources/logos/DR_Update.png
b/plugin.video.dr.dk.live/resources/logos/DR_Update.png
index 7eb0be1..e99f3ce 100644
Binary files a/plugin.video.dr.dk.live/resources/logos/DR_Update.png and
b/plugin.video.dr.dk.live/resources/logos/DR_Update.png differ
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=607b3572637ec407d00c4dba0b99ee6be1b393bd
commit 607b3572637ec407d00c4dba0b99ee6be1b393bd
Author: spiff <[email protected]>
Date: Wed Sep 21 09:46:29 2011 +0200
[plugin.video.mediathek] updated to version 0.3.4
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index 7e56281..7568dea 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.mediathek"
- version="0.3.3"
+ version="0.3.4"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 4013a6f..da782d8 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.3.4 - FIX: ARTE
0.3.3 - ADD: BR-Alpha
0.3.2 - Version bump for eden pre
0.2.2 - ADD: WDR Mediathek
diff --git a/plugin.video.mediathek/mediathek/arte.py
b/plugin.video.mediathek/mediathek/arte.py
index a2e632e..77c6e75 100644
--- a/plugin.video.mediathek/mediathek/arte.py
+++ b/plugin.video.mediathek/mediathek/arte.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import re
+import re, traceback
from mediathek import *
from xml.dom import minidom
regex_dateString = re.compile("\\d{1,2} ((\\w{3})|(\\d{2})) \\d{4}");
@@ -53,7 +53,7 @@ class ARTEMediathek(Mediathek):
self.regex_Clips = re.compile("/de/videos/[^/]*-(\\d*).html")
self.regex_ExtractVideoConfig =
re.compile("http://videos\\.arte\\.tv/de/do_delegate/videos/.*-\\d*,view,asPlayerXml\\.xml";);
- self.regex_ExtractRtmpLink = re.compile("<url
quality=\"(sd)\">(rtmp://.*MP4:.*)</url>")
+ self.regex_ExtractRtmpLink = re.compile("<url
quality=\"(sd|hd)\">(rtmp://.*mp4:.*)</url>")
self.regex_ExtractTopicPages = re.compile("<a
href=\"([^\"]*)\"[^<]*>([^<]*)</a> \((\\d+)\)");
self.regex_DescriptionLink =
re.compile("http://videos\\.arte\\.tv/de/videos/.*?\\.html";);
self.regex_Description = re.compile("<div
class=\"recentTracksCont\">\\s*<div>\\s*<p>.*?</p>");
@@ -131,16 +131,20 @@ class ARTEMediathek(Mediathek):
urlString = touple[1];
self.gui.log(urlString);
- stringArray = urlString.split("MP4:");
+ stringArray = urlString.split("mp4:");
links[quality] = SimpleLink("%s playpath=MP4:%s
swfUrl=http://videos.arte.tv/blob/web/i18n/view/player_11-3188338-data-4836231.swf
swfVfy=1"%(stringArray[0],stringArray[1]),0);
- if(len(links) > 0):
- self.gui.log("Picture: "+picture);
-
self.gui.buildVideoLink(DisplayObject(title,"",picture,desc,links,True,date),self,elementCount);
+ if(len(links) > 0):
+ self.gui.log("Picture: "+picture);
+
self.gui.buildVideoLink(DisplayObject(title,"",picture,desc,links,True,date),self,elementCount);
configXml.unlink();
except:
self.gui.log("something goes wrong while processing "+link);
- self.gui.log(xmlPage);
+ print xmlPage;
+ self.gui.log("Exception: ");
+ traceback.print_exc();
+ self.gui.log("Stacktrace: ");
+ traceback.print_stack();
def extractTopicObjects(self,mainPage,initCount):
touples = self.regex_ExtractTopicPages.findall(mainPage)
diff --git a/plugin.video.mediathek/simplexbmc.py
b/plugin.video.mediathek/simplexbmc.py
index 3c5075f..e67b1d2 100644
--- a/plugin.video.mediathek/simplexbmc.py
+++ b/plugin.video.mediathek/simplexbmc.py
@@ -36,9 +36,9 @@ class SimpleXbmcGui(object):
def log(self, msg):
if type(msg) not in (str, unicode):
- xbmc.output("[%s]: %s" % (__plugin__, type(msg)))
+ xbmc.log("[%s]: %s" % (__plugin__, type(msg)))
else:
- xbmc.output("[%s]: %s" % (__plugin__, msg.encode('utf8')))
+ xbmc.log("[%s]: %s" % (__plugin__, msg.encode('utf8')))
def buildVideoLink(self, displayObject, mediathek, objectCount):
if(displayObject.subTitle == "" or displayObject.subTitle ==
displayObject.title):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=28b63198a4ac620c5a28710a504688eb1cf76662
commit 28b63198a4ac620c5a28710a504688eb1cf76662
Author: spiff <[email protected]>
Date: Wed Sep 21 09:45:29 2011 +0200
[plugin.video.hgtv] updated to version 1.0.3
diff --git a/plugin.video.hgtv/addon.xml b/plugin.video.hgtv/addon.xml
index b50de9a..398f98f 100644
--- a/plugin.video.hgtv/addon.xml
+++ b/plugin.video.hgtv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.hgtv"
name="HGTV"
- version="1.0.2"
+ version="1.0.3"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -13,7 +13,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<summary>Home and Garden TV</summary>
- <description>Full episodes from hgtv.com</description>
+ <description>Full episodes from hgtv.com - These videos seem to be
restricted to the U.S. only.</description>
<disclaimer>Some parts of this addon may not be legal in your country of
residence - please check with your local laws before installing.</disclaimer>
<platform>all</platform>
</extension>
diff --git a/plugin.video.hgtv/changelog.txt b/plugin.video.hgtv/changelog.txt
index 01c5a9f..4df873e 100644
--- a/plugin.video.hgtv/changelog.txt
+++ b/plugin.video.hgtv/changelog.txt
@@ -1,3 +1,6 @@
+Version 1.0.3
+added some new shows
+
Version 1.0.2
fix for extra seasons
diff --git a/plugin.video.hgtv/default.py b/plugin.video.hgtv/default.py
index b699674..d7af09e 100644
--- a/plugin.video.hgtv/default.py
+++ b/plugin.video.hgtv/default.py
@@ -4,67 +4,86 @@ from BeautifulSoup import BeautifulSoup
__settings__ = xbmcaddon.Addon(id='plugin.video.hgtv')
__language__ = __settings__.getLocalizedString
+
def getShows():
- addDir(__language__(30000),
'/hgtv/on_tv/player/0,1000145,HGTV_32663_4621,00.html', 1,
'http://img.hgtv.com/HGTV/2009/04/16/cp60-250k-challenge.jpg')
- addDir(__language__(30001),
'/hgtv-all-american-handyman/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/08/06/spFeature_american-handyman_s234x60.jpg')
- addDir(__language__(30002),
'/hgtv-the-antonio-treatment/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2009/12/03/spFeature_the-antonio-treatment_s234x60.jpg')
- addDir(__language__(30003),
'/hgtv-bang-for-your-buck/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/04/29/spFeature_bang-for-your-buck_s234x60.jpg')
- addDir(__language__(30004), '/hgtv160/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_carolDuvallShow.jpg')
- addDir(__language__(30005), '/hgtv246/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_CarterCan.jpg')
- addDir(__language__(30006), '/hgtv74/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-color-splash.png')
- addDir(__language__(30007), '/hgtv42/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-curb-appeal.png')
- addDir(__language__(30008),
'/hgtv-curb-appeal-the-block2/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2009/12/10/cp60_curb-appeal-the-block_s234x60.jpg')
- addDir(__language__(30009),
'/hgtv/on_tv/player/0,1000145,HGTV_32663_3541,00.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_dearGenevieve.jpg')
- addDir(__language__(30010),
'/hgtv-deserving-design/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/10/31/cp60-deserving-design.jpg')
- addDir(__language__(30011), '/hgtv70/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-designed-to-sell.png')
- addDir(__language__(30012), '/hgtv8/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-gardening-by-the-yard.png')
- addDir(__language__(30013), '/hgtv262/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/11/02/cp60_for-rent_s234x60.jpg')
- addDir(__language__(30014), '/hgtv6/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-ground-breakers.png')
- addDir(__language__(30015), '/hgtv-hammerheads/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_hammerHeads.jpg')
- addDir(__language__(30016),
'/dream-home/dream-home-videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/programguide_dreamhome2010.jpg')
- addDir(__language__(30017), '/hgtv176/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/programguide_greenhome2010.jpg')
- addDir(__language__(30018), '/hgtv-showdown/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2009/01/06/cp60-hgtv-showdown.jpg')
- addDir(__language__(30019),
'/hgtv/on_tv/player/0,1000145,HGTV_32663_3381,00.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_HiddenPotential.jpg')
- addDir(__language__(30020), '/hgtv-holmes-on-homes/videos/index.html',
1, 'http://img.hgtv.com/HGTV/2010/04/07/cp60_holmes-on-homes_s234x60.jpg')
- addDir(__language__(30021), '/hgtv-house-crashers/videos/index.html',
1,
'http://img.hgtv.com/HGTV/2010/03/24/spFeature_house-crashers-hgtv_s234x60.jpg')
- addDir(__language__(30022), '/house-of-bryan/show/index.html', 1,
'http://img.hgtv.com/HGTV/2010/08/30/spFeature_house-of-bryan_s234x60.jpg')
- addDir(__language__(30023), '/hgtv-home-rules2/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/02/15/spFeature_home-rules_s234x60.jpg')
- addDir(__language__(30024), '/hgtv40/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-house-hunters.png')
- addDir(__language__(30025), '/hgtv56/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-house-hunters-int.png')
- addDir(__language__(30026), '/hgtv-income-property/videos/index.html',
1, ' http://img.hgtv.com/HGTV/2010/11/02/cp60_income-property_s234x60.jpg')
- addDir(__language__(30027),
'/hgtv-keys-to-the-castle/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/10/31/cp60-keys-to-castle.jpg')
- addDir(__language__(30028), '/hgtv58/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-my-first-place.png')
- addDir(__language__(30029), '/hgtv-my-first-sale/videos/index.html',
1, 'http://img.hgtv.com/HGTV/2010/10/27/spFeature_my-first-sale_s234x60.jpg')
- addDir(__language__(30030), '/hgtv32/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/11/07/cp60-my-house-is-worth-what.jpg')
- addDir(__language__(30031), '/hgtv18/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-myles-of-style.png')
- addDir(__language__(30032), '/hgtv60/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-national-open-house.png')
- addDir(__language__(30033),
'/hgtv-the-outdoor-room/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2009/11/23/spFeature_the-outdoor-room-with-jamie-durie_s234x60.jpg')
- addDir(__language__(30034),
'/hgtv/on_tv/player/0,1000145,HGTV_32663_3581,00.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_overYourHead.jpg')
- addDir(__language__(30035), '/paint-over/show/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/programguide_paint-over-with-jennifer-bertrand.jpg')
- addDir(__language__(30036),
'/hgtv-professional-grade/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/09/17/spFeature_professional-grade_s234x60.jpg')
- addDir(__language__(30037), '/hgtv48/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/10/27/spFeature_property-virgins_s234x60.jpg')
- addDir(__language__(30038), '/hgtv176/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/10/27/spFeature_real-estate-intervention_s234x60.jpg')
- addDir(__language__(30039), '/hgtv46/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-red-hot-and-green.png')
- addDir(__language__(30040), '/hgtv2/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-rate-my-space.png')
- addDir(__language__(30041), '/hgtv-sarahs-house/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/01/06/cp60-sarahs-house_s234x60.jpg')
- addDir(__language__(30042),
'/hgtv-selling-new-york/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/01/11/spFeature_selling-new-york_s234x60.jpg')
- addDir(__language__(30043), '/hgtv148/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2008/10/23/programguide_SimplyQuilts.jpg')
- addDir(__language__(30044), '/hgtv50/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-sleep-on-it.png')
- addDir(__language__(30045), '/hgtv24/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-spice-up-my-kitchen.png')
- addDir(__language__(30046), '/hgtv54/videos/index.html', 1,
'http://web.hgtv.com/webhgtv/hg20/imgs/full-epi/fe-the-stagers.png')
- addDir(__language__(30047), '/hgtv-tough-as-nails/videos/index.html',
1, 'http://img.hgtv.com/HGTV/2010/04/01/spFeature_tough-as-nails_s234x60.jpg')
- addDir(__language__(30048), '/hgtv154/videos/index.html', 1,
'http://img.hgtv.com/HGTV/2010/11/02/cp60_yard-crashers_s234x60.jpg')
-
-
+
addDir(__language__(30000),'/hgtv-15-fresh-handmade-gift-ideas/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/11/09/sp100_15-fresh-homemade-gift-ideas_s994x100.jpg')
+
addDir(__language__(30001),'/hgtv-all-american-handyman/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/08/06/spShow_american-handyman_s994x100.jpg')
+
addDir(__language__(30002),'/hgtv-bang-for-your-buck/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/03/04/sp100-bang-for-the-buck.jpg')
+
addDir(__language__(30003),'/hgtv-battle-on-the-block/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/03/10/spShow_battle-on-the-block_s994x100.jpg')
+
addDir(__language__(30004),'/hgtv-behind-the-magic-disney-holidays/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/10/09/spShow_disney-holiday-special_s994x100.jpg')
+
addDir(__language__(30005),'/candice-tells-all-full-episodes/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/12/14/spShow_candice-tells-all-v2_s994x100.jpg')
+
addDir(__language__(30006),'/hgtv246/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_carterCan.jpg')
+
addDir(__language__(30007),'/hgtv-celebrity-holiday-homes/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/11/03/sp100_celebrity-holiday-homes_s994x100.jpg')
+
addDir(__language__(30008),'/hgtv258/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/10/13/spShow_ctw-american-heroes_s994x200.jpg')
+
addDir(__language__(30009),'/hgtv74/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2011/05/13/spShow_color-splash-2011_s994x100.jpg')
+
addDir(__language__(30010),'/hgtv42/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_curbAppeal.jpg')
+
addDir(__language__(30011),'/hgtv-curb-appeal-the-block2/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/12/10/sp100_curb-appeal-the-block_s994x100.jpg')
+
addDir(__language__(30012),'/hgtv156/videos/index.html',1,'http://img.hgtv.com/HGTV/2008/10/17/showheader_dearGenevieve.jpg')
+
addDir(__language__(30013),'/hgtv-deserving-design/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/31/sp200-deserving-design.jpg')
+
addDir(__language__(30014),'/hgtv70/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_designedToSell.jpg')
+
addDir(__language__(30015),'/hgtv-dinas-party/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2011/07/25/spShow_dinas-party_s994x100.jpg')
+
addDir(__language__(30016),'/hgtv-first-time-design/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/12/10/spShow_first-time-design_s994x100.jpg')
+
addDir(__language__(30017),'/hgtv262/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/03/13/sp100-for-rent.jpg')
+
addDir(__language__(30018),'/hgtv8/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_gardeningByTheYard.jpg')
+
addDir(__language__(30019),'/hgtv6/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_groundBreakers.jpg')
+
addDir(__language__(30020),'/hgtv-showdown/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/01/06/sp200-hgtv-showdown.jpg')
+
addDir(__language__(30021),'/hgtv146/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_summerShowdown_v2.jpg')
+
addDir(__language__(30022),'/hgtv-hgtvd/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/12/15/spShow_hgtvd_s994x100.jpg')
+
addDir(__language__(30023),'/hgtv236/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/04/16/sp200-250k-challenge-4.jpg')
+
addDir(__language__(30024),'/hgtv-home-for-the-holidays/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/31/sp100-home-for-the-holidays.jpg')
+
addDir(__language__(30025),'/hgtv-hammerheads/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_hammerHeads.jpg')
+
addDir(__language__(30026),'/hgtv144/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_hiddenPotential_v2.jpg')
+
addDir(__language__(30027),'/hgtv-holmes-inspection/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/02/18/sp200_holmes-inspection_s994x200.jpg')
+
addDir(__language__(30028),'/hgtv-holmes-on-homes/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/04/17/sp200-holmes-on-homes.jpg')
+
addDir(__language__(30029),'/hgtv-home-rules2/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/02/15/spShow_home-rules_s994x100.jpg')
+
addDir(__language__(30030),'/hgtv-house-crashers/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/03/24/spShow_house-crashers-hgtv_s994x100.jpg')
+
addDir(__language__(30031),'/hgtv40/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/02/01/spShow_house-hunters_s994x100.jpg')
+
addDir(__language__(30032),'/hgtv56/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_houseHuntersInternational.jpg')
+
addDir(__language__(30033),'/hgtv-house-hunters-on-vacation/videos/index.html',1,'http://img.hgtv.com/HGTV/2011/03/25/spShow_house-hunters-on-vacation_s994x100.jpg')
+
addDir(__language__(30034),'/hgtv-house-of-bryan/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/08/30/spShow_house-of-bryan_s994x100.jpg')
+
addDir(__language__(30035),'/hgtv-income-property/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/31/sp100-income-property.jpg')
+
addDir(__language__(30036),'/hgtv-keys-to-the-castle/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/11/19/sp100-keys-to-the-castle-france.jpg')
+
addDir(__language__(30037),'/hgtv58/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_myFirstPlace.jpg')
+
addDir(__language__(30038),'/hgtv-my-first-sale/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/06/09/spShow_my-first-sale_s994x100.jpg')
+
addDir(__language__(30039),'/hgtv32/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_myHouseIsWorthWhat_v2.jpg')
+
addDir(__language__(30040),'/hgtv-my-yard-goes-disney/videos/index.html',1,'http://img.hgtv.com/HGTV/2011/05/06/spShow_my-yard-goes-disney_s994x100.jpg')
+
addDir(__language__(30041),'/hgtv18/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/31/sp200-myles-of-style.jpg')
+
addDir(__language__(30042),'/hgtv60/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_nationalOpenHouse.jpg')
+
addDir(__language__(30043),'/hgtv162/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_overYourHead.jpg')
+
addDir(__language__(30044),'/hgtv-professional-grade/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/09/17/spShow_professional-grade_s994x100.jpg')
+
addDir(__language__(30045),'/hgtv48/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_propertyVirgins.jpg')
+
addDir(__language__(30046),'/hgtv-rv-2010/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/12/01/spShow_rv-2011_s994x100.jpg')
+
addDir(__language__(30047),'/hgtv2/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_RateMySpace.jpg')
+
addDir(__language__(30048),'/hgtv176/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/06/10/sp100-real-estate-intervention.jpg')
+
addDir(__language__(30049),'/hgtv46/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_redHotandGreen_v2.jpg')
+
addDir(__language__(30050),'/hgtv-room-crashers/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2011/05/10/spShow_room-crashers_s994x100.jpg')
+
addDir(__language__(30051),'/hgtv-sandra-lee-celebrates/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/10/09/sp100_sandra-lee-celebrates-holiday-homecoming_s994x100.jpg')
+
addDir(__language__(30052),'/hgtv-sarah-101/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2011/06/03/spShow_sarah-101_s994x100.jpg')
+
addDir(__language__(30053),'/hgtv-sarahs-holiday-party/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/10/20/spShow_sarahs-holiday-party_s994x100.jpg')
+
addDir(__language__(30054),'/hgtv-sarahs-house/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/01/06/sp100-sarahs-house_s994x100.jpg')
+
addDir(__language__(30055),'/hgtv-sarahs-summer-house/videos/index.html',1,'http://img.hgtv.com/HGTV/2011/02/10/spShow_sarahs-summer-house_s994x100.jpg')
+
addDir(__language__(30056),'/hgtv-secrets-from-a-stylist2/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/08/23/spShow_secrets-from-a-stylist_s994x200.jpg')
+
addDir(__language__(30057),'/hgtv-selling-new-york/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/01/11/spShow_selling-new-york_s994x100.jpg')
+
addDir(__language__(30058),'/hgtv50/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/31/sp200-sleep-on-it.jpg')
+
addDir(__language__(30059),'/hgtv24/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_spiceUpMyKitchen.jpg')
+
addDir(__language__(30060),'/hgtv-the-antonio-treatment/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/01/12/spShow_the-antonio-treatment_s994x200.jpg')
+
addDir(__language__(30061),'/hgtv-the-duchess/videos/index.html',1,'http://img.hgtv.com/HGTV/2009/10/07/spShow_the-duchess_s994x100.jpg')
+
addDir(__language__(30062),'/hgtv-the-outdoor-room/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2009/11/23/spShow_the-outdoor-room-with-jamie-durie_s994x200.jpg')
+
addDir(__language__(30063),'/hgtv54/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/10/17/showheader_theStagers.jpg')
+
addDir(__language__(30064),'/hgtv-tough-as-nails/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2010/01/26/spShow_tough-as-nails_s994x100.jpg')
+
addDir(__language__(30065),'/hgtv-white-house-christmas/videos/index.html',1,'http://img.hgtv.com/HGTV/2010/11/24/sp200_white-house-xmas-2010_s994x200.jpg')
+
addDir(__language__(30066),'/hgtv154/videos/index.html',1,'http://hgtv.sndimg.com/HGTV/2008/12/09/sp200-yard-crashers.jpg')
+
+
def INDEX(url):
url='http://www.hgtv.com'+url
- req = urllib2.Request(url)
- req.addheaders = [('Referer', 'http://www.hgtv.com'),
- ('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3)
Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)')]
+ headers = {'User-agent' : 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:6.0)
Gecko/20100101 Firefox/6.0',
+ 'Referer' : 'http://www.hgtv.com'}
+ req = urllib2.Request(url,None,headers)
response = urllib2.urlopen(req)
link=response.read()
response.close()
- soup = BeautifulSoup(link)
+ soup = BeautifulSoup(link, convertEntities=BeautifulSoup.HTML_ENTITIES)
try:
if soup.find('ul', attrs={'class' : "channel-list"}):
name = soup.find('ul', attrs={'class' :
"channel-list"})('h4')[0]('em')[0].next
@@ -83,15 +102,12 @@ def INDEX(url):
showID=re.compile("var snap = new
SNI.HGTV.Player.FullSize\(\\'.+?\\',\\'(.+?)\\', \\'\\'\);").findall(link)
if len(showID)<1:
showID=re.compile("var snap = new
SNI.HGTV.Player.FullSize\(\'.+?','(.+?)', '.+?'\);").findall(link)
- print'--------> '+showID[0]
url='http://www.hgtv.com/hgtv/channel/xml/0,,'+showID[0]+',00.xml'
- req = urllib2.Request(url)
- req.addheaders = [('Referer', 'http://www.hgtv.com'),
- ('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3)
Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)')]
+ req = urllib2.Request(url,None,headers)
response = urllib2.urlopen(req)
link=response.read()
response.close()
- soup = BeautifulSoup(link)
+ soup = BeautifulSoup(link, convertEntities=BeautifulSoup.HTML_ENTITIES)
videos = soup('video')
for video in videos:
name = video('clipname')[0].string
@@ -119,7 +135,7 @@ def get_params():
splitparams=pairsofparams[i].split('=')
if (len(splitparams))==2:
param[splitparams[0]]=splitparams[1]
-
+
return param
@@ -138,8 +154,8 @@ def addDir(name,url,mode,iconimage):
liz.setInfo( type="Video", infoLabels={ "Title": name } )
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
return ok
-
-
+
+
params=get_params()
url=None
name=None
@@ -165,7 +181,7 @@ print "Name: "+str(name)
if mode==None or url==None or len(url)<1:
print ""
getShows()
-
+
elif mode==1:
print ""+url
INDEX(url)
diff --git a/plugin.video.hgtv/resources/language/English/strings.xml
b/plugin.video.hgtv/resources/language/English/strings.xml
index a0c8acc..4193b01 100644
--- a/plugin.video.hgtv/resources/language/English/strings.xml
+++ b/plugin.video.hgtv/resources/language/English/strings.xml
@@ -1,53 +1,70 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30000">$250k Challenge</string>
+ <string id="30000">15 Fresh Handmade Gift Ideas</string>
<string id="30001">All American Handyman</string>
- <string id="30002">The Antonio Treatment</string>
- <string id="30003">Bang for your Buck</string>
- <string id="30004">The Carol Duvall Show</string>
- <string id="30005">Carter Can</string>
- <string id="30006">Color Splash with David Bromstad</string>
- <string id="30007">Curb Appeal</string>
- <string id="30008">Curb Appeal: The Block</string>
- <string id="30009">Dear Genevieve</string>
- <string id="30010">Deserving Design</string>
- <string id="30011">Designed to Sell</string>
- <string id="30012">Gardening by the Yard</string>
- <string id="30013">For Rent</string>
- <string id="30014">Ground Breakers</string>
- <string id="30015">Hammer Heads</string>
- <string id="30016">Dream Home</string>
- <string id='30017'>Green Home</string>
- <string id='30018'>HGTV Showdown</string>
- <string id='30019'>Hidden Potential</string>
- <string id='30020'>Holmes on Homes</string>
- <string id='30021'>House Crashers</string>
- <string id='30022'>House Of Bryan</string>
- <string id='30023'>Home Rules</string>
- <string id='30024'>House Hunters</string>
- <string id='30025'>House Hunters International</string>
- <string id='30026'>Income Property</string>
- <string id='30027'>Keys to the Castle</string>
- <string id='30028'>My First Place</string>
- <string id='30029'>My First Sale</string>
- <string id='30030'>My House is Worth What?</string>
- <string id='30031'>Myles of Style</string>
- <string id='30032'>National Open House</string>
- <string id='30033'>The Outdoor Room with Jamie Durie</string>
- <string id='30034'>Over Your Head</string>
- <string id='30035'>Paint Over</string>
- <string id='30036'>Professional Grade</string>
- <string id='30037'>Property Virgins</string>
- <string id='30038'>Real Estate Intervention</string>
- <string id='30039'>Red Hot and Green</string>
- <string id='30040'>Rate My Space - From Cyberspace to your Space</string>
- <string id='30041'>Sarah's House</string>
- <string id='30042'>Selling New York</string>
- <string id='30043'>Simply Quilts</string>
- <string id='30044'>Sleep On It</string>
- <string id='30045'>Spice Up My Kitchen</string>
- <string id='30046'>The Stagers</string>
- <string id='30047'>Tough as Nails</string>
- <string id='30048'>Yard Crashers</string>
-
+ <string id="30002">Bang for Your Buck</string>
+ <string id="30003">Battle On the Block</string>
+ <string id="30004">Behind the Magic: Disney Holidays</string>
+ <string id="30005">Candice Tells All</string>
+ <string id="30006">Carter Can</string>
+ <string id="30007">Celebrity Holiday Homes 2009</string>
+ <string id="30008">Change the World: American Heroes</string>
+ <string id="30009">Color Splash</string>
+ <string id="30010">Curb Appeal</string>
+ <string id="30011">Curb Appeal: The Block</string>
+ <string id="30012">Dear Genevieve</string>
+ <string id="30013">Deserving Design</string>
+ <string id="30014">Designed to Sell</string>
+ <string id="30015">'Dina's Party</string>
+ <string id="30016">First Time Design</string>
+ <string id='30017'>For Rent</string>
+ <string id='30018'>Gardening by the Yard</string>
+ <string id='30019'>Ground Breakers</string>
+ <string id='30020'>HGTV Showdown</string>
+ <string id='30021'>HGTV Summer Showdown</string>
+ <string id='30022'>HGTV'd</string>
+ <string id='30023'>HGTV's $250,000 Challenge</string>
+ <string id='30024'>HGTV's Home for the Holidays</string>
+ <string id='30025'>Hammer Heads</string>
+ <string id='30026'>Hidden Potential</string>
+ <string id='30027'>Holmes Inspection</string>
+ <string id='30028'>Holmes on Homes</string>
+ <string id='30029'>Home Rules</string>
+ <string id='30030'>House Crashers</string>
+ <string id='30031'>House Hunters</string>
+ <string id='30032'>House Hunters International</string>
+ <string id='30033'>House Hunters on Vacation</string>
+ <string id='30034'>House of Bryan</string>
+ <string id='30035'>Income Property</string>
+ <string id='30036'>Keys to the Castle, France</string>
+ <string id='30037'>My First Place</string>
+ <string id='30038'>My First Sale</string>
+ <string id='30039'>My House Is Worth What?</string>
+ <string id='30040'>My Yard Goes Disney</string>
+ <string id='30041'>Myles of Style</string>
+ <string id='30042'>National Open House</string>
+ <string id='30043'>Over Your Head</string>
+ <string id='30044'>Professional Grade</string>
+ <string id='30045'>Property Virgins</string>
+ <string id='30046'>RV 2011</string>
+ <string id='30047'>Rate My Space</string>
+ <string id='30048'>Real Estate Intervention</string>
+ <string id='30049'>Red Hot & Green</string>
+ <string id='30050'>Room Crashers</string>
+ <string id='30051'>Sandra Lee Celebrates: Holiday Homecoming</string>
+ <string id='30052'>Sarah 101</string>
+ <string id='30053'>Sarah's Holiday Party</string>
+ <string id='30054'>Sarah's House</string>
+ <string id='30055'>Sarah's Summer House</string>
+ <string id='30056'>Secrets From a Stylist</string>
+ <string id='30057'>Selling New York</string>
+ <string id='30058'>Sleep On It</string>
+ <string id='30059'>Spice Up My Kitchen</string>
+ <string id='30060'>The Antonio Treatment</string>
+ <string id='30061'>The Duchess</string>
+ <string id='30062'>The Outdoor Room With Jamie Durie</string>
+ <string id='30063'>The Stagers</string>
+ <string id='30064'>Tough as Nails</string>
+ <string id='30065'>White House Christmas 2010</string>
+ <string id='30066'>Yard Crashers</string>
</strings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.dr.dk.live/addon.py | 14 ++-
plugin.video.dr.dk.live/addon.xml | 2 +-
plugin.video.dr.dk.live/changelog.txt | 4 +
plugin.video.dr.dk.live/fanart.jpg | Bin 0 -> 549684 bytes
plugin.video.dr.dk.live/icon.png | Bin 72129 -> 38972 bytes
.../resources/logos/24_Nordjyske.png | Bin 13912 -> 50001 bytes
plugin.video.dr.dk.live/resources/logos/DR1.png | Bin 4106 -> 37033 bytes
plugin.video.dr.dk.live/resources/logos/DR2.png | Bin 5726 -> 37751 bytes
plugin.video.dr.dk.live/resources/logos/DR_HD.png | Bin 0 -> 39540 bytes
plugin.video.dr.dk.live/resources/logos/DR_K.png | Bin 13622 -> 41048 bytes
.../resources/logos/DR_Ramasjang.png | Bin 51578 -> 56121 bytes
.../resources/logos/DR_Update.png | Bin 11266 -> 39762 bytes
plugin.video.hgtv/addon.xml | 4 +-
plugin.video.hgtv/changelog.txt | 3 +
plugin.video.hgtv/default.py | 144 +++++++++++---------
.../resources/language/English/strings.xml | 115 +++++++++-------
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/arte.py | 18 ++-
plugin.video.mediathek/simplexbmc.py | 4 +-
20 files changed, 182 insertions(+), 129 deletions(-)
create mode 100644 plugin.video.dr.dk.live/fanart.jpg
create mode 100644 plugin.video.dr.dk.live/resources/logos/DR_HD.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
