The branch, frodo has been updated
via feb911ea1a5a4416f84da8855724033ee1a0e40a (commit)
from 40a517e64ca8b609ff66599e235e3a05be130121 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=feb911ea1a5a4416f84da8855724033ee1a0e40a
commit feb911ea1a5a4416f84da8855724033ee1a0e40a
Author: sphere <[email protected]>
Date: Sat Mar 15 13:39:58 2014 +0100
[weather.ozweather] updated to version 0.7.1
diff --git a/weather.ozweather/addon.xml b/weather.ozweather/addon.xml
index 9cefc14..b0ded5a 100644
--- a/weather.ozweather/addon.xml
+++ b/weather.ozweather/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.ozweather" name="Oz Weather" version="0.7.0"
provider-name="Bossanova808">
+<addon id="weather.ozweather" name="Oz Weather" version="0.7.1"
provider-name="Bossanova808">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.parsedom" version="1.2.0"/>
diff --git a/weather.ozweather/changelog.txt b/weather.ozweather/changelog.txt
index 7dbce87..e9bf726 100644
--- a/weather.ozweather/changelog.txt
+++ b/weather.ozweather/changelog.txt
@@ -1,3 +1,6 @@
+V0.7.1
+- Fixed ABC weather video link again - apparently they use multiple servers
+
V0.7.0
- Fixed ABC weather video link
- Added setting for weather video qualtiy level
diff --git a/weather.ozweather/default.py b/weather.ozweather/default.py
index 03081a0..cb8cfab 100644
--- a/weather.ozweather/default.py
+++ b/weather.ozweather/default.py
@@ -22,6 +22,7 @@ import ftplib
import shutil
import time
import datetime
+from datetime import date
# Minimal code to import bossanova808 common code
ADDON = xbmcaddon.Addon()
@@ -592,13 +593,18 @@ def propertiesPDOM(page, extendedFeatures):
req = urllib2.Request(abcURL)
response = urllib2.urlopen(req)
htmlSource = str(response.read())
- pattern_video =
"http://mpegmedia.abc.net.au/news/news24/weather/video/(.+?)/WINs_Weather1_(.+?)_512k.mp4"
+ #log(htmlSource)
+ #yearmonth = str(date.today().year) + str(date.today().month).zfill(2)
+ #daymonth = str(date.today().day).zfill(2) +
str(date.today().month).zfill(2)
+ pattern_video =
"http://mpegmedia.abc.net.au/news/news24/weather/video/(.+?)/WINs_Weather(.*?)_(.+?)_512k.mp4"
video = re.findall( pattern_video, htmlSource )
+ log("Video url parts: " + str(video))
try:
qual = ADDON.getSetting("ABCQuality")
if qual=="Best":
qual="trw"
- url = "http://mpegmedia.abc.net.au/news/news24/weather/video/"+
video[0][0] + "/WINs_Weather1_" + video[0][1] + "_" + qual + ".mp4"
+ url = "http://mpegmedia.abc.net.au/news/news24/weather/video/"+
video[0][0] + "/WINs_Weather" + video[0][1] + "_" + video[0][2] + "_" + qual +
".mp4"
+ log("Built url " + url)
setProperty(WEATHER_WINDOW, 'Video.1',url)
except Exception as inst:
log("Couldn't get ABC video URL from page", inst)
-----------------------------------------------------------------------
Summary of changes:
weather.ozweather/addon.xml | 2 +-
weather.ozweather/changelog.txt | 3 +++
weather.ozweather/default.py | 10 ++++++++--
weather.ozweather/resources/lib/.gitignore | 2 --
4 files changed, 12 insertions(+), 5 deletions(-)
delete mode 100644 weather.ozweather/resources/lib/.gitignore
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
