The branch, frodo has been updated
via 0f5d76508723c4fd319990843b7a8aacd58fc636 (commit)
from bff83678356f5eb83e5b2ea9ea8e4b20a8f04d75 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=0f5d76508723c4fd319990843b7a8aacd58fc636
commit 0f5d76508723c4fd319990843b7a8aacd58fc636
Author: Martijn Kaijser <[email protected]>
Date: Fri Mar 7 12:23:39 2014 +0100
[weather.ozweather] 0.7.0
diff --git a/weather.ozweather/addon.xml b/weather.ozweather/addon.xml
index 0d461c7..9cefc14 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.6.8"
provider-name="Bossanova808">
+<addon id="weather.ozweather" name="Oz Weather" version="0.7.0"
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 579b5fc..7dbce87 100644
--- a/weather.ozweather/changelog.txt
+++ b/weather.ozweather/changelog.txt
@@ -1,3 +1,10 @@
+V0.7.0
+- Fixed ABC weather video link
+- Added setting for weather video qualtiy level
+
+V0.6.9
+- Unreleased, repo moved to github
+
V0.6.8
- Deal with blank radar codes in user settings
- Better tidying up old radar images
diff --git a/weather.ozweather/default.py b/weather.ozweather/default.py
index fbe3fe6..03081a0 100644
--- a/weather.ozweather/default.py
+++ b/weather.ozweather/default.py
@@ -378,12 +378,13 @@ def prepareBackgrounds(radarCode):
def buildImages(radarCode):
- log("Called buildImages with radarCode: " + radarCode + " and loop path "
+ LOOP_IMAGES_PATH)
+ log("Called buildImages with radarCode: " + radarCode + " and loop path "
+ LOOP_IMAGES_PATH + " and radar path " + RADAR_BACKGROUNDS_PATH)
#remove the temporary files - we only want fresh radar files
#this results in maybe ~60k used per update.
+
if os.path.exists( LOOP_IMAGES_PATH ):
- log("Removing previous radar files")
+ log("os.path Removing previous radar files")
shutil.rmtree( LOOP_IMAGES_PATH , ignore_errors=True)
#we need make the directories to store stuff if they don't exist
@@ -579,16 +580,25 @@ def propertiesPDOM(page, extendedFeatures):
#END FORECAST DATA
#ABC VIDEO URL
+ # note date and quality level variables...
+ # {'url':
'http://mpegmedia.abc.net.au/news/news24/weather/video/201403/WINs_Weather1_0703_1000k.mp4',
'contentType': 'video/mp4', 'codec': 'AVC', 'bitrate': '928', 'width': '1024',
'height': '576', 'filesize': '11657344'}
+ # {'url':
'http://mpegmedia.abc.net.au/news/news24/weather/video/201403/WINs_Weather1_0703_256k.mp4',
'contentType': 'video/mp4', 'codec': 'AVC', 'bitrate': '170', 'width': '320',
'height': '180', 'filesize': '2472086'}
+ # {'url':
'http://mpegmedia.abc.net.au/news/news24/weather/video/201403/WINs_Weather1_0703_512k.mp4',
'contentType': 'video/mp4', 'codec': 'AVC', 'bitrate': '400', 'width': '512',
'height': '288', 'filesize': '5328218'}
+ # {'url':
'http://mpegmedia.abc.net.au/news/news24/weather/video/201403/WINs_Weather1_0703_trw.mp4',
'contentType': 'video/mp4', 'codec': 'AVC', 'bitrate': '1780', 'width':
'1280', 'height': '720', 'filesize': '21599356'}
+
try:
log("Trying to get ABC weather video URL")
abcURL = "http://www.abc.net.au/news/abcnews24/weather-in-90-seconds/";
req = urllib2.Request(abcURL)
response = urllib2.urlopen(req)
htmlSource = str(response.read())
- pattern_video =
"http://mpegmedia.abc.net.au/news/weather/video/(.+?)video3.flv"
+ pattern_video =
"http://mpegmedia.abc.net.au/news/news24/weather/video/(.+?)/WINs_Weather1_(.+?)_512k.mp4"
video = re.findall( pattern_video, htmlSource )
try:
- url = "http://mpegmedia.abc.net.au/news/weather/video/"; + video[0]
+ "video3.flv"
+ 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"
setProperty(WEATHER_WINDOW, 'Video.1',url)
except Exception as inst:
log("Couldn't get ABC video URL from page", inst)
diff --git a/weather.ozweather/resources/language/English/strings.xml
b/weather.ozweather/resources/language/English/strings.xml
index e7e1a04..9dba57a 100644
--- a/weather.ozweather/resources/language/English/strings.xml
+++ b/weather.ozweather/resources/language/English/strings.xml
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30101">OzWeather Settings</string>
-
<string id="30111">Change Suburb 1</string>
<string id="30112">Change Suburb 2</string>
<string id="30113">Change Suburb 3</string>
-
<string id="30155">Change Radar ID for Suburb 1 (e.g. IDR022)</string>
<string id="30156">Change Radar ID for Suburb 2</string>
<string id="30157">Change Radar ID for Suburb 3</string>
-
<string id="30194">Use extended features (long forecast, radar
loop)</string>
-
<string id="30195">Enter suburb name, or your 4 digit postcode e.g.
3051</string>
+ <string id="30196">ABC Weather Video Quality Level</string>
</strings>
diff --git a/weather.ozweather/resources/settings.xml
b/weather.ozweather/resources/settings.xml
index ceb04ef..ca9091c 100644
--- a/weather.ozweather/resources/settings.xml
+++ b/weather.ozweather/resources/settings.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<category label="Enter Settings">
+ <!-- Best is mapped to trw in default.py -->
+ <setting id="ABCQuality" label ="30196" type ="labelenum"
values="256k|512K|1000k|Best" default="1000k"/>
<setting id="Location1" label="30111" type="action"
action="RunScript($ID,Location1)" default=""/>
<setting id="Location2" label="30112" type="action"
action="RunScript($ID,Location2)" enable="!eq( -1,)" default=""/>
<setting id="Location3" label="30113" type="action"
action="RunScript($ID,Location3)" enable="!eq( -1,)" default=""/>
-----------------------------------------------------------------------
Summary of changes:
weather.ozweather/README.md | 8 ++++++++
weather.ozweather/addon.xml | 2 +-
weather.ozweather/changelog.txt | 7 +++++++
weather.ozweather/default.py | 18 ++++++++++++++----
.../resources/language/English/strings.xml | 5 +----
weather.ozweather/resources/lib/.gitignore | 2 ++
weather.ozweather/resources/settings.xml | 2 ++
7 files changed, 35 insertions(+), 9 deletions(-)
create mode 100644 weather.ozweather/README.md
create mode 100644 weather.ozweather/resources/lib/.gitignore
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
