The branch, dharma has been updated
via 1d34078e3f27838e9f1763ec61668974541326da (commit)
from ed23a9aa65f7ca309912b55b728badacbbe4a835 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1d34078e3f27838e9f1763ec61668974541326da
commit 1d34078e3f27838e9f1763ec61668974541326da
Author: spiff <[email protected]>
Date: Tue Mar 1 19:36:00 2011 +0100
[plugin.video.nederland24] updated to version 1.2.3
diff --git a/plugin.video.nederland24/addon.xml
b/plugin.video.nederland24/addon.xml
index 7267b7a..6d6e087 100644
--- a/plugin.video.nederland24/addon.xml
+++ b/plugin.video.nederland24/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nederland24"
name="Nederland 24"
- version="1.2.2"
+ version="1.2.3"
provider-name="bosel">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.nederland24/changelog.txt
b/plugin.video.nederland24/changelog.txt
index 53ce23d..c814265 100644
--- a/plugin.video.nederland24/changelog.txt
+++ b/plugin.video.nederland24/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 1.2.3[/B]
+-quickfix website change
+
[B]Version 1.2.2[/B]
-fix double link
diff --git a/plugin.video.nederland24/default.py
b/plugin.video.nederland24/default.py
index 509c54b..e7533dc 100644
--- a/plugin.video.nederland24/default.py
+++ b/plugin.video.nederland24/default.py
@@ -27,16 +27,26 @@ def addLink(name,url,iconimage,description,channelId):
nextTime=(re.search(r'<p
id="nextTime">Aanvang:([^*]*?)</p>',HTML)).group(1).strip()
channelEPG = "Nu: %s\n%s\n\nStraks: %s\n%s\n%s" % (nowTitle,
nowPlot, nextTime, nextTitle, nextPlot)
+
+## quickfix - VPRO Website has changed -
+# elif channelId!="0" and channelId!="29":
+# HTML=urllib2.urlopen("http://geschiedenis.vpro.nl/").read()
+# nowTitle=((re.search(r'class="nu"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4>',HTML)).group(2)).strip()
+# #nowTime=((re.search(r'class="nu"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4>',HTML)).group(1)).strip()
+# nowPlot=((re.search(r'class="nu"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(3)).strip()
+# nextTime=((re.search(r'straks" style="display: none;"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(1)).strip()
+# nextTitle=((re.search(r'straks" style="display: none;"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(2)).strip()
+# nextPlot=((re.search(r'straks" style="display: none;"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(3)).strip()
+# channelEPG = "Nu: %s\n%s\n\nStraks: %s\n%s\n%s" % (nowTitle,
nowPlot, nextTime, nextTitle, nextPlot)
+
elif channelId!="0" and channelId!="29":
- HTML=urllib2.urlopen("http://geschiedenis.vpro.nl/").read()
- nowTitle=((re.search(r'class="nu"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4>',HTML)).group(2)).strip()
+ nowTitle="Geschiedenis 24"
#nowTime=((re.search(r'class="nu"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4>',HTML)).group(1)).strip()
- nowPlot=((re.search(r'class="nu"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(3)).strip()
- nextTime=((re.search(r'straks" style="display: none;"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(1)).strip()
- nextTitle=((re.search(r'straks" style="display: none;"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(2)).strip()
- nextPlot=((re.search(r'straks" style="display: none;"><p
class="date">([^*]*?)</p><h4>([^*]*?)</h4><p
class="text">([^*]*?)</p>',HTML)).group(3)).strip()
- channelEPG = "Nu: %s\n%s\n\nStraks: %s\n%s\n%s" % (nowTitle,
nowPlot, nextTime, nextTitle, nextPlot)
-
+ nowPlot="Geschiedenis 24"
+ nextTime="Geschiedenis 24"
+ nextTitle="Geschiedenis 24"
+ nextPlot="Geschiedenis 24"
+ channelEPG = "Geschiedenis 24 biedt een actuele, duidende en
verdiepende blik op de historie, maar ook een historische blik op de
actualiteit."
elif channelId!="0":
channelEPG = time
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nederland24/addon.xml | 2 +-
plugin.video.nederland24/changelog.txt | 3 +++
plugin.video.nederland24/default.py | 26 ++++++++++++++++++--------
3 files changed, 22 insertions(+), 9 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons